From 1edd645dd50fdbacd287af489ba0a4ad912bbd1c Mon Sep 17 00:00:00 2001
From: Svetoslav <svetoslavganov@google.com>
Date: Tue, 24 Nov 2015 11:31:13 -0800
Subject: DO NOT MERGE Modify system settings: incorrect UI state

The privilege for an app to write to the system settings is protected
by an app-op signature permission. App-op permissions are special: if
the app-op is deny/allow we deny/allow write access; if the app-op is
default holding the permission determies write access. The settings
code assumes that CHANGE_NETWORK_STATE is an app op permission
(system|appop) while it is a normal permission which any app gets by
declaring it used in the manifest.

The side effect is that the state of the toggle in the UI for write
system settings will initially be in the wrong state if the app uses
both WRITE_SETTINGS and CHANGE_NETWORK_STATE. However, the code in
the public API an app uses to check write settings access would return
the opposite since it checks the WRITE_SETTINGS permission and its
app op. Hence, if an app requires write settings to start the user
will see in the settings UI it has access but the app will not have
access, so the app would prompt the user to allow write settings.
The non-obvious fix is for the user to toggle the setting off and on
to get the app op in the right state and be able to launch the app.

bug:25843134

Change-Id: I3d726a66c7f9857bc7dbd5946fdbb8f340c6eb4d
(cherry picked from commit 356fb2d10d9f4c236b0f10d0e2facb93028b9f3c)
(cherry picked from commit 119d589ea5aa9c2ccc5164279d718a20d0865f20)
---
 .../android/settings/applications/AppStateWriteSettingsBridge.java  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
index 7cdf7ea..ef743fa 100644
--- a/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
+++ b/src/com/android/settings/applications/AppStateWriteSettingsBridge.java
@@ -34,11 +34,9 @@ public class AppStateWriteSettingsBridge extends AppStateAppOpsBridge {
     private static final String TAG = "AppStateWriteSettingsBridge";
     private static final int APP_OPS_OP_CODE = AppOpsManager.OP_WRITE_SETTINGS;
     private static final String PM_WRITE_SETTINGS = Manifest.permission.WRITE_SETTINGS;
-    private static final String PM_CHANGE_NETWORK_STATE = Manifest.permission.CHANGE_NETWORK_STATE;
-    // CHANGE_NETWORK_STATE is now merged with WRITE_SETTINGS
+
     private static final String[] PM_PERMISSIONS = {
-            PM_WRITE_SETTINGS,
-            PM_CHANGE_NETWORK_STATE
+            PM_WRITE_SETTINGS
     };
 
     public AppStateWriteSettingsBridge(Context context, ApplicationsState appState, Callback
-- 
cgit v1.1


From 91edbdd479350d260aae1052d6b1959e1338719e Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Thu, 17 Mar 2016 21:59:44 +0200
Subject: Automatic translation import

Change-Id: Ide7fdb04e25ae1d25205a835b37ff8a004660ad4
---
 res/values-af/cm_strings.xml      |  10 +
 res/values-am/cm_strings.xml      |   5 +
 res/values-ar/cm_strings.xml      |  10 +
 res/values-as-rIN/cm_plurals.xml  |  27 ++
 res/values-as-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-ast-rES/cm_strings.xml |   5 +
 res/values-ast-rES/strings.xml    |  11 +
 res/values-az-rAZ/cm_strings.xml  |   5 +
 res/values-be/cm_strings.xml      |  10 +
 res/values-be/strings.xml         |  11 +
 res/values-bg/cm_strings.xml      |  30 +-
 res/values-bn-rBD/cm_strings.xml  |   5 +
 res/values-br-rFR/cm_strings.xml  |   5 +
 res/values-br-rFR/strings.xml     |  11 +
 res/values-ca/cm_strings.xml      |  10 +
 res/values-cs/cm_strings.xml      |  12 +-
 res/values-cy/cm_strings.xml      |   5 +
 res/values-cy/strings.xml         |  11 +
 res/values-da/cm_strings.xml      |  39 ++
 res/values-de/cm_strings.xml      |  10 +
 res/values-el/cm_strings.xml      |  11 +
 res/values-en-rAU/cm_strings.xml  |   5 +
 res/values-en-rGB/cm_strings.xml  |   5 +
 res/values-en-rIN/cm_strings.xml  |  10 +
 res/values-en-rPT/cm_strings.xml  |   5 +
 res/values-en-rPT/strings.xml     |  11 +
 res/values-eo/cm_strings.xml      |   5 +
 res/values-eo/strings.xml         |  11 +
 res/values-es-rMX/cm_strings.xml  | 121 ++++++
 res/values-es-rMX/strings.xml     |  11 +
 res/values-es-rUS/cm_plurals.xml  |  27 ++
 res/values-es-rUS/cm_strings.xml  | 677 +++++++++++++++++++++++++++++++
 res/values-es/cm_strings.xml      | 119 +++++-
 res/values-et-rEE/cm_strings.xml  |  10 +
 res/values-eu-rES/cm_strings.xml  |  10 +
 res/values-fa/cm_strings.xml      |  10 +
 res/values-fi/cm_strings.xml      |  10 +
 res/values-fil-rPH/cm_strings.xml |   5 +
 res/values-fr-rCA/cm_strings.xml  |   5 +
 res/values-fr/cm_strings.xml      |  30 ++
 res/values-fy-rNL/cm_strings.xml  |   5 +
 res/values-fy-rNL/strings.xml     |  11 +
 res/values-gd-rGB/cm_strings.xml  |   5 +
 res/values-gd-rGB/strings.xml     |  11 +
 res/values-gl-rES/cm_strings.xml  |   5 +
 res/values-gu-rIN/cm_plurals.xml  |  27 ++
 res/values-gu-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-hi/cm_strings.xml      |  10 +
 res/values-hr/cm_strings.xml      |  10 +
 res/values-hu/cm_strings.xml      |  10 +
 res/values-hy-rAM/cm_strings.xml  |   5 +
 res/values-in/cm_strings.xml      |  10 +
 res/values-is-rIS/cm_strings.xml  |   5 +
 res/values-it/cm_strings.xml      |  10 +
 res/values-iw/cm_strings.xml      | 142 ++++---
 res/values-ja/cm_strings.xml      |  14 +-
 res/values-ka-rGE/cm_strings.xml  |   5 +
 res/values-kk-rKZ/cm_strings.xml  |   5 +
 res/values-km-rKH/cm_strings.xml  |   5 +
 res/values-kn-rIN/cm_strings.xml  | 124 ++++++
 res/values-ko/cm_strings.xml      |  10 +
 res/values-ku/cm_strings.xml      |   5 +
 res/values-ku/strings.xml         |  11 +
 res/values-ky-rKG/cm_strings.xml  |   5 +
 res/values-lb/cm_strings.xml      |  10 +
 res/values-lb/strings.xml         |  15 +
 res/values-lo-rLA/cm_strings.xml  |   5 +
 res/values-lt/cm_strings.xml      |  10 +
 res/values-lv/cm_strings.xml      |   5 +
 res/values-mk-rMK/cm_strings.xml  |   5 +
 res/values-ml-rIN/cm_plurals.xml  |  27 ++
 res/values-ml-rIN/cm_strings.xml  | 820 ++++++++++++++++++++++++++++++++++++++
 res/values-mn-rMN/cm_strings.xml  |   5 +
 res/values-mr-rIN/cm_plurals.xml  |  27 ++
 res/values-mr-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-ms-rMY/cm_strings.xml  |   5 +
 res/values-my-rMM/cm_strings.xml  |   5 +
 res/values-nb/cm_strings.xml      |  10 +
 res/values-ne-rNP/cm_strings.xml  |   5 +
 res/values-nl/cm_strings.xml      |  14 +-
 res/values-oc-rFR/cm_strings.xml  |   5 +
 res/values-oc-rFR/strings.xml     |  11 +
 res/values-or-rIN/cm_plurals.xml  |  27 ++
 res/values-or-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-pa-rIN/cm_strings.xml  |   5 +
 res/values-pl/cm_strings.xml      |  10 +
 res/values-pt-rBR/cm_strings.xml  |  10 +
 res/values-pt-rPT/cm_strings.xml  |  24 +-
 res/values-rm/cm_strings.xml      |   5 +
 res/values-ro/cm_strings.xml      |  14 +
 res/values-ru/cm_strings.xml      |  13 +-
 res/values-si-rLK/cm_strings.xml  |   5 +
 res/values-sk/cm_strings.xml      |  10 +
 res/values-sl/cm_strings.xml      |  28 +-
 res/values-sq-rAL/cm_strings.xml  |   5 +
 res/values-sr/cm_strings.xml      |  10 +
 res/values-sv/cm_strings.xml      |  10 +
 res/values-sw/cm_strings.xml      |   5 +
 res/values-ta-rIN/cm_plurals.xml  |   4 +
 res/values-ta-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-te-rIN/cm_plurals.xml  |  27 ++
 res/values-te-rIN/cm_strings.xml  | 819 +++++++++++++++++++++++++++++++++++++
 res/values-th/cm_strings.xml      |  63 +++
 res/values-tr/cm_strings.xml      |  10 +
 res/values-ug/cm_strings.xml      | 243 ++++++++++-
 res/values-ug/strings.xml         |  11 +
 res/values-uk/cm_strings.xml      |  10 +
 res/values-ur-rPK/cm_strings.xml  |   5 +
 res/values-uz-rUZ/cm_strings.xml  |   5 +
 res/values-vi/cm_strings.xml      | 124 ++++++
 res/values-zh-rCN/cm_strings.xml  |  10 +
 res/values-zh-rHK/cm_strings.xml  |  10 +
 res/values-zh-rTW/cm_strings.xml  |   5 +
 res/values-zu/cm_strings.xml      |   5 +
 114 files changed, 8288 insertions(+), 103 deletions(-)
 create mode 100644 res/values-as-rIN/cm_plurals.xml
 create mode 100644 res/values-es-rUS/cm_plurals.xml
 create mode 100644 res/values-gu-rIN/cm_plurals.xml
 create mode 100644 res/values-ml-rIN/cm_plurals.xml
 create mode 100644 res/values-mr-rIN/cm_plurals.xml
 create mode 100644 res/values-or-rIN/cm_plurals.xml
 create mode 100644 res/values-te-rIN/cm_plurals.xml

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 8f226ef..97b98da 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Moet nie media terugspeel volume verminder wanneer \'n kennisgewing arriveer</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod Regs</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Herstel stats</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Battery geskiedenis stats gaan herstel word</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dok battery nie teenwoordig nie</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Laai op dok krag AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Laai oor dok USB</string>
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 06abdd9..2916397 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -874,4 +874,14 @@
   <string name="interruptions_ignore_while_media_summary">لا يخفض صوت تشغيل الوسائط عند وصول إشعار</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">قانون CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">إعادة تعيين الإحصائيات</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">إحصائيات تاريخ البطارية سيُعاد تعيينها</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">بطارية الإرساء غير موجودة</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">شحن على الإرساء بالتيار المتناوب</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">شحن على الإرساء عبر USB</string>
 </resources>
diff --git a/res/values-as-rIN/cm_plurals.xml b/res/values-as-rIN/cm_plurals.xml
new file mode 100644
index 0000000..e070c42
--- /dev/null
+++ b/res/values-as-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> ছেকেণ্ড</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> ছেকেণ্ড</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">এবাৰ</item>
+    <item quantity="other">%d বাৰ</item>
+  </plurals>
+</resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 5fd19c8..5b36914 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">আপুনি এতিয়া ডেভেলপমেণ্ট ছেটিংচ সক্ষম কৰাৰ পৰা <xliff:g id="step_count">%1$d</xliff:g>টা পদক্ষেপ দূৰত আছে।</item>
+    <item quantity="other">আপুনি এতিয়া ডেভেলপমেণ্ট ছেটিংচ সক্ষম কৰাৰ পৰা <xliff:g id="step_count">%1$d</xliff:g>টা পদক্ষেপ দূৰত আছে।</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">আপুনি ডেভেলপমেণ্ট ছেটিংচ সক্ষম কৰিলে!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">আৱশ্যক নাই, আপুনি ইতিমধ্যে ডেভেলপমেণ্ট ছেটিংচ সক্ষম কৰিলে।</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">ডেভলপমেন্ট টুলচ</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">ডেভেলপমেণ্ট চমুপথ</string>
+  <string name="development_shortcut_summary">সাম্প্ৰতিক এপ্প্‌ সূচীত এপ্প্‌ প্ৰবন্ধন চমুপথবোৰ সক্ষম কৰক</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">ৰুট প্ৰৱেশ কৰক</string>
+  <string name="root_access_warning_title">ৰুট এক্সেছৰ অনুমতি দিব নে?</string>
+  <string name="root_access_warning_message">ৰুট এক্সেছ অনুৰোধ কৰিবলৈ এপ্প্‌বোৰক অনুমতি দিয়াটো খুব বিপদজনক আৰু আপোনাৰ ছিষ্টেমৰ নিৰাপত্তাৰ সৈতে আপোচ কৰা হ\'ব পাৰে।</string>
+  <string name="root_access_none">নিস্ক্ৰিয় কৰা হল</string>
+  <string name="root_access_apps">কেৱল এপ্প্‌চ</string>
+  <string name="root_access_adb">কেৱল ADB</string>
+  <string name="root_access_all">এপ্প্‌চ আৰু ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">CyanogenMod সংস্কৰণ</string>
+  <string name="mod_version_default">অজ্ঞাত</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">ডিভাইচৰ মডেল</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">ডিভাইচ নাম</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API স্তৰ</string>
+  <string name="mod_api_level_default">অজ্ঞাত</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">নিৰ্মাণৰ তাৰিখ</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">CyanogenMod আপডেটসমূহ</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Cyanogen পুনৰুদ্ধাৰ আপডেট কৰক</string>
+  <string name="update_recovery_summary">আপডেট পুনৰুদ্ধাৰ তথা ছিষ্টেম আপডেট</string>
+  <string name="update_recovery_on_warning">জাননী: এই বৈশিষ্ট্যটো সক্ষম কৰিলে, আপোনাৰ ইনষ্টল থকা পুনৰুদ্ধাৰ এই চলি থকা OS-ৰ সাম্প্ৰতিক সংস্কৰণত অন্তৰ্ভুক্ত এটাৰ দ্বাৰা পৰিবৰ্তিত হ\'ব।\n\nআপোনাৰ পুনৰুদ্ধাৰ আপোনাৰ ছিষ্টেমৰ সৈতে আপগ্ৰেডৰ সৈতে আপডেট কৰা হ\'ব, যাতে ভৱিষ্যৎ সংস্কৰণসমূহৰ সৈতে সুসমতা নিশ্চিত কৰাত সহায় হয়।\n\nআপুনি এই বৈশিষ্ট্যটো সক্ষম কৰিব বিচাৰে নে?</string>
+  <string name="update_recovery_off_warning">সকীয়নি: যেতিয়া বৈশিষ্ট্যটো অক্ষম কৰা হয়, আপোনাৰ ইনষ্টল কৰা পুনৰুদ্ধাৰ OS আপগ্ৰেডৰ সৈতে আপডেট কৰা নহ\'ব।\n\nভৱিষ্যৎ OS আপডেটবোৰ পুৰণি বা কাষ্টম পুনৰুদ্ধাৰ সংস্কৰণৰ সৈতে ইনষ্টল নহ\'ব পাৰে।\n\nআপুনি সঁচাই এই বৈশিষ্ট্যটো অক্ষম কৰিব বিচাৰে নে?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">বিষয়বস্তুসমূহ</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">ৰিং মোড</string>
+  <string name="ring_mode_normal">সাধাৰণ</string>
+  <string name="ring_mode_vibrate">ভাইব্ৰেট</string>
+  <string name="ring_mode_mute">নিমাত</string>
+  <string name="settings_reset_button">ৰিছেট</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">ছিষ্টেম প্ৰ\'ফাইল</string>
+  <string name="profiles_add">যোগ দিয়ক</string>
+  <string name="profile_menu_delete">মচি দিয়া</string>
+  <string name="profile_settings_title">প্ৰ\'ফাইল</string>
+  <string name="profile_empty_list_profiles_off">কনফিগাৰ কৰিবলৈ আৰু ছিষ্টেম প্ৰ\'ফাইল ব্যৱহাৰ কৰিবলৈ, প্ৰ\'ফাইল অন কৰক।</string>
+  <string name="profile_trigger_configure">ট্ৰিগাৰ কনফিগাৰ কৰক</string>
+  <string name="profile_write_nfc_tag">NFC টেগলৈ লিখক</string>
+  <string name="profile_write_touch_tag">লিখিবলৈ টেগ স্পৰ্শ কৰক</string>
+  <string name="profile_write_success">টেগ সফলতাৰে লিখা হ\'ল</string>
+  <string name="profile_write_failed">টেগ লিখাটো ব্যৰ্থ হ\'ল!</string>
+  <string name="profile_selected">প্ৰ\'ফাইল চয়ন কৰা হৈছে: %1$s</string>
+  <string name="profile_nfc_text">NFC টেগলৈ এটা প্ৰ\'ফাইল লিখাটোৱে প্ৰ\'ফাইলটো চয়ন কৰাৰ বাবে টেগটো টেপিং কৰাৰ অনুমতি দিয়ে। দ্বিতীয়বাৰ টেপিং কৰিলে পূৰ্বতে চয়ন কৰা প্ৰ\'ফাইল চয়ন কৰা হ\'ব।</string>
+  <string name="profile_unknown_nfc_tag">অজ্ঞাত প্ৰ\'ফাইল</string>
+  <string name="profile_add_nfc_text">এই NFC টেগে এটা অজ্ঞাত প্ৰ\'ফাইল সূচায়। এটা বিদ্যমান প্ৰ\'ফাইলৰ সৈতে এই NFC টেগটো সংলগ্ন কৰিলে প্ৰ\'ফাইলটো ভৱিষ্যতে চয়ন কৰাৰ অনুমতি দিব।</string>
+  <string name="profile_select">প্ৰ\'ফাইল চয়ন কৰক</string>
+  <string name="profile_remove_dialog_message">প্ৰ\'ফাইল %1$s টো আঁতৰাব?</string>
+  <string name="profile_populate_profile_from_state">চলিত ডিভাইচ ছেটিংচ ব্যৱহাৰ কৰি প্ৰ\'ফাইল কনফিগাৰ কৰিব?</string>
+  <string name="profile_menu_fill_from_state">চলিত ডিভাইচ ছেটিংচ আমদানি কৰক</string>
+  <string name="profile_remove_current_profile">চলিত প্ৰ\'ফাইল বিলোপ কৰিব নোৱাৰি!</string>
+  <string name="profile_app_group_category_title">অধিসূচনা অগ্ৰাহ্য কৰা</string>
+  <string name="profile_app_group_item_instructions">গ্ৰুপ যোগ কৰক বা আঁতৰাওক</string>
+  <string name="profile_app_group_item_instructions_summary">অধিসূচনা অগ্ৰাহ্য এপ্প গ্ৰুপবোৰ এই প্ৰ\'ফাইলত যোগ কৰক বা আঁতৰাওক</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">অন কৰক</string>
+  <string name="profile_entries_off">অফ</string>
+  <string name="profile_entries_no_override">অগ্ৰাহ্য নকৰিব</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">নাম</string>
+  <string name="new_profile_name">&lt;নতুন প্ৰ\'ফাইল&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">পুনঃনামাকৰণ</string>
+  <string name="rename_dialog_message">এটা নতুন নাম প্ৰৱেশ কৰক</string>
+  <string name="duplicate_appgroup_name">এপ্প্‌ গ্ৰুপৰ নাম নকল কৰক!</string>
+  <string name="rename_dialog_hint">প্ৰ\'ফাইল নাম প্ৰৱেশ কৰক</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">ৰিছেট</string>
+  <string name="profile_reset_message">ব্যৱহাৰকৰ্তাৰদ্বাৰা সৃষ্টি কৰা সকলো প্ৰ\'ফাইল বিলোপ কৰিব আৰু সেইবোৰ ডিফ\'ল্টৰ পৰা পুনঃস্থাপন কৰিব?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">এই এপ্প্‌টো আঁতৰাব?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">ভলিউম অগ্ৰাহ্য</string>
+  <string name="connection_state_enabled">সক্ৰিয় কৰা</string>
+  <string name="volume_override_summary">%1$s/%2$s লৈ ছেট কৰক</string>
+  <string name="profile_volume_override_checkbox_label">ভলিউম অগ্ৰাহ্য কৰক</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">প্ৰ\'ফাইল্চ</string>
+  <string name="profile_profile_manage">প্ৰ\'ফাইল প্ৰবন্ধন কৰক</string>
+  <string name="profile_appgroups_manage">এপ্প্ গ্ৰুপ</string>
+  <string name="profile_appgroup_manage">এপ্প্ গ্ৰুপ প্ৰবন্ধন কৰক</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">প্ৰ’ফাইল ছেটিংছ</string>
+  <string name="profile_trigger_connect">সংযোগ অন কৰক</string>
+  <string name="profile_trigger_disconnect">ডিচকানেক্ট অন কৰক</string>
+  <string name="profile_trigger_notrigger">ট্ৰিগাৰ নাই</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">অধিসূচনা মোড</string>
+  <string name="ringer_mode">ৰিং মোড</string>
+  <string name="lights_mode">লাইট মোড</string>
+  <string name="vibrate_mode">ভাইব্ৰেট মোড</string>
+  <string name="choose_soundtone">অধিসূচনা টোন পচন্দ কৰক</string>
+  <string name="choose_ringtone">ৰিংটোন বাচনি কৰক</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">অধিসূচনা টোন</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">এপ্প্ গ্ৰুপ</string>
+  <string name="profile_applist_title">এপ্পসমূহ</string>
+  <string name="profile_new_appgroup">নতুন এপ্প্ গ্ৰুপ</string>
+  <string name="profile_delete_appgroup">এই এপ্প্‌ গ্ৰুপটো বিলোপ কৰিব?</string>
+  <string name="profile_appgroup_name_prompt">নতুন এপ্প্‌ গ্ৰুপটোৰ বাবে এটা নাম প্ৰৱেশ কৰক</string>
+  <string name="profile_appgroup_name_title">নাম</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">এপ্প বাচনি কৰক</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">ছিষ্টেম ছেটিংছ</string>
+  <string name="profile_lockmode_title">লক স্ক্ৰীণ মোড</string>
+  <string name="profile_lockmode_policy_disabled_summary">এই প্ৰ\'ফাইল বিকল্প এটা ডিভাইচ ব্যৱস্থাপক নীতিৰ দ্বাৰা অক্ষম কৰা হৈছে</string>
+  <string name="profile_lockmode_insecure_summary">অনুগ্ৰহ কৰি PIN বা পাছৱৰ্ড নুসুধিব</string>
+  <string name="profile_lockmode_disabled_summary">লক স্ক্ৰীণ অক্ষম কৰক</string>
+  <string name="profile_airplanemode_title">এয়াৰপ্লেন মোড</string>
+  <string name="profile_brightness_title">স্ক্ৰীণৰ উজ্জ্বলতা</string>
+  <string name="profile_brightness_override_summary">%1$d%% লৈ ছেট কৰক</string>
+  <string name="profile_brightness_override_checkbox_label">উজ্জ্বলতা অগ্ৰাহ্য</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">ৱাই \u2011ফাই</string>
+  <string name="toggleWifiAp">প’ৰ্টেবল ৱাই\u2011ফাই হটস্পট</string>
+  <string name="toggleBluetooth">ব্লুটুথ</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">ডাটা সংযোগ</string>
+  <string name="toggleSync">স্বয়ং-ছিনক্ৰ’নাইজেশ্যন ডাটা</string>
+  <string name="toggle2g3g4g">অগ্ৰাধিকাৰযুক্ত  নেটৱৰ্কৰ ধৰণ</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">ৱাই\u2011ফাই অঞ্চল কোড</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">ৱাই\u2011ফাই ৰ বাবে অঞ্চল কোড নিৰ্দিষ্ট কৰক</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">অঞ্চল কোড ছেটিং কৰাত এটা সমস্যা হৈছিল</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">মচি দিয়া</string>
+  <string name="profile_action_none">অপৰিবৰ্তিত ৰাখক</string>
+  <string name="profile_action_system">ছিষ্টেম ডিফল্ট</string>
+  <string name="profile_action_disable">অফ কৰক</string>
+  <string name="profile_action_enable">সক্ৰিয় কৰক</string>
+  <string name="profile_trigger_a2dp_connect">A2DPত সংযোগ কৰক</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DPত সংযোগহীন কৰক</string>
+  <string name="profile_tabs_wifi">ৱাই \u2011ফাই</string>
+  <string name="profile_tabs_bluetooth">ব্লুটুথ</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">এই প্ৰ\'ফাইল সক্ৰিয় কৰা ট্ৰিগাৰ</string>
+  <string name="profile_setup_setup_triggers_title">পদক্ষেপ 1: ট্ৰিগাৰ যোগ কৰক</string>
+  <string name="profile_setup_setup_triggers_title_config">ট্ৰিগাৰ সংশোধন কৰক: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">পদক্ষেপ 2: ক্ৰিয়া ছেটআপ কৰক</string>
+  <string name="profile_setup_actions_title_config">ক্ৰিয়া ৰিকনফিগাৰ কৰক</string>
+  <string name="profile_appgroups_manage">এপ্প্ গ্ৰুপ</string>
+  <string name="profile_appgroup_manage">এপ্প্ গ্ৰুপ প্ৰবন্ধন কৰক</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">এপ্প্ গ্ৰুপ</string>
+  <string name="profile_new_appgroup">নতুন এপ্প্ গ্ৰুপ</string>
+  <string name="profile_delete_appgroup">এই এপ্প্‌ গ্ৰুপটো বিলোপ কৰিব?</string>
+  <string name="profile_appgroup_name_prompt">নতুন এপ্প্‌ গ্ৰুপটোৰ বাবে এটা নাম প্ৰৱেশ কৰক</string>
+  <string name="profile_appgroup_name_title">নাম</string>
+  <string name="duplicate_appgroup_name">এপ্প্‌ গ্ৰুপৰ নাম নকল কৰক!</string>
+  <string name="profile_app_delete_confirm">এই এপ্প্‌টো আঁতৰাব?</string>
+  <string name="no_bluetooth_triggers">কোনো Bluetooth ডিভাইচ যুগল কৰা নাই।\nট্ৰিগাৰ কনফিগাৰ কৰাৰ আগতে Bluetooth ডিভাইচ যুগল কৰিবলৈ টেপ কৰক।</string>
+  <string name="no_wifi_triggers">কোনো Wi\u2011Fi একছেচ পইণ্ট কনফিগাৰ কৰা নাই।\nট্ৰিগাৰ কনফিগাৰ কৰাৰ আগতে Wi\u2011Fi ডিভাইচ যোৰা কৰিবলৈ টেপ কৰক।</string>
+  <string name="no_triggers_configured">কোনো ট্ৰিগাৰ কনফিগাৰ কৰা নাই। অধিক যোগ কৰিবলৈ টেপ কৰক।</string>
+  <string name="no_triggers_configured_nfc">নতুন NFC ট্ৰিগাৰ ছেটআপ কৰিবলৈ টেপ কৰক।</string>
+  <string name="profile_setup_setup_triggers_description">অনুগ্ৰহ এই প্ৰ\'ফাইল সক্ৰিয় কৰা ট্ৰিগাৰ চয়ন কৰক</string>
+  <string name="profile_setup_actions_description">এতিয়া প্ৰ\'ফাইল সক্ৰিয় কৰিলে কি ঘটিব কনফিগাৰ কৰক</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">নেভিগেশ্যন দণ্ডিকা</string>
+  <string name="navigation_bar_left_title">বাওঁ-হতীয়া মোড</string>
+  <string name="navigation_bar_left_summary">লেণ্ডস্কেপ মোডত স্ক্ৰীণৰ বাওঁফালে নেভিগেশ্যন দণ্ডিকা ৰাখক</string>
+  <string name="navigation_bar_title">বুটাম আৰু লেআউট</string>
+  <string name="navigation_bar_help_text">আৰম্ভ কৰিবলৈ সম্পাদনা কৰাৰ বাবে নেভিগেশ্যন দণ্ডিকা আনলক কৰিবলৈ সম্পাদনা আইকনটো টেপ কৰক\n\nআপুনি এই চমুপথটো পৰিৱৰ্তন কৰিবলৈ টেপ কৰিব পাৰে বা লেআউট পুনঃসজ্জিত কৰিবলৈ এটা আইকনত দীঘলকৈ টিপিব পাৰে।\n\nআপোনাৰ পৰিবৰ্তনবোৰ ন্যস্ত কৰিবলৈ \'Save\' বা লেআউট ডিফ\'ল্ট ছেটিঙলৈ ৰিছেট কৰিবলৈ টেপ কৰক।</string>
+  <string name="navigation_restore_button_text">পুনঃস্থাপন কৰক\nডিফ\'ল্ট</string>
+  <string name="navigation_edit_button_text">সম্পাদনা</string>
+  <string name="navigation_save_button_text">ছেভ কৰা</string>
+  <string name="navigation_bar_reset_message">চলিত ছেটিং বিলোপ কৰিব আৰু ডিফ\'ল্ট লেআউটলৈ পুনঃস্থাপন কৰিব?</string>
+  <string name="navigation_bar_arrow_keys_title">টাইপ কৰি থাকোতে কাড় কীবোৰ প্ৰদৰ্শন কৰক</string>
+  <string name="navigation_bar_arrow_keys_summary">টাইপ কৰি থাকোতে বাওঁ আৰু সোঁ কাৰ্ছৰ বুটামবোৰ প্ৰদৰ্শন কৰক। IME চুইচাৰ অগ্ৰাহ্য কৰক</string>
+  <string name="navigation_bar_recents_title">সাম্প্ৰতিক দীঘলকৈ টিপাৰ কাৰ্য</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">লাইট ছেটিং সম্পাদনা কৰক</string>
+  <string name="pulse_speed_title">পালচ দৈৰ্ঘ আৰু গতি</string>
+  <string name="default_time">সাধাৰণ</string>
+  <string name="custom_time">কাষ্টম</string>
+  <string name="dialog_delete_title">মচি দিয়া</string>
+  <string name="dialog_delete_message">চয়নিত আইটেম আঁতৰাব নে?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">সদায়েই অন</string>
+  <string name="pulse_length_very_short">খুব চুটি</string>
+  <string name="pulse_length_short">চুটি</string>
+  <string name="pulse_length_normal">সাধাৰণ</string>
+  <string name="pulse_length_long">দীঘল</string>
+  <string name="pulse_length_very_long">খুব দীঘল</string>
+  <string name="pulse_speed_very_fast">খুব তীব্ৰ</string>
+  <string name="pulse_speed_fast">ফাষ্ট</string>
+  <string name="pulse_speed_normal">সাধাৰণ</string>
+  <string name="pulse_speed_slow">ধীৰ</string>
+  <string name="pulse_speed_very_slow">খুব ধীৰ গতি</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">বেটাৰী লাইট</string>
+  <string name="battery_low_pulse_title">যদি বেটাৰী নিম্ন হয় পালচ কৰক</string>
+  <string name="battery_light_list_title">ৰংসমূহ</string>
+  <string name="battery_light_low_color_title">বেটাৰী নিম্ন</string>
+  <string name="battery_light_medium_color_title">চাৰ্জ হৈ আছে</string>
+  <string name="battery_light_full_color_title">সম্পূৰ্ণ চাৰ্জ হৈছে</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">অধিসূচনা লাইট</string>
+  <string name="notification_light_general_title">সাধাৰণ</string>
+  <string name="notification_light_applist_title">এপ্পসমূহ</string>
+  <string name="notification_light_phonelist_title">ফোন</string>
+  <string name="notification_light_use_custom">কাষ্টম মান ব্যৱহাৰ কৰক</string>
+  <string name="notification_light_default_value">ডিফল্ট</string>
+  <string name="notification_light_missed_call_title">মিছড কল</string>
+  <string name="notification_light_voicemail_title">ভইচমেইল</string>
+  <string name="notification_light_screen_on">স্ক্ৰীণ অনৰ সৈতে লাইট</string>
+  <string name="notification_light_zen_mode">লাইট্স ইন ডু নট ডিস্টৰ্ব মোড</string>
+  <string name="notification_light_use_multiple_leds">একাধিক LED</string>
+  <string name="keywords_lights_brightness_level">অনুজ্জ্বল ledৰ উজ্জ্বলতা</string>
+  <string name="notification_light_automagic">স্বয়ংক্ৰিয়ভাৱে ৰংসমূহ বাচনি কৰক</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">লাইট ছেটিং</string>
+  <string name="led_notification_text">ছেটিংছৰ দ্বাৰা সক্ষমিত LED লাইট</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Android ডিবাগিং</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">Android ডিবাগ ব্ৰিজ (adb) ইণ্টাৰফেচ সক্ষম কৰক</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB অভাৰ নেটৱৰ্ক</string>
+  <string name="adb_over_network_summary">নেটৱৰ্ক ইণ্টাৰফেচৰ ওপৰত TCP/IP ডিবাগিং সক্ষম কৰক (ৱাই\u2011ফাই, USB নেটৱৰ্ক) এই ছেটিংটো ৰিবুট কৰিলে ৰিছেট হয়</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">সকীয়নি: যেতিয়া ADB অভাৰ নেটৱৰ্ক সক্ষম কৰা হয়, আপোনাৰ ফোনটো সকলো সংযোগিত নেটৱৰ্কৰ দ্বাৰা অনাধিকাৰ প্ৰৱেশৰ বাবে মুকলি হয়!\n\nকেৱল আপুনি বিশ্বাসী নেটৱৰ্কৰ সৈতে সংযোগিত হ\'লেহে এই বৈশিষ্ট্যটো ব্যৱহাৰ কৰক।\n\n আপুনি সঁচাকৈ এই ফাংচনটো সক্ষম কৰিব বিচাৰে নে?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">ডিবাগিং অধিসূচনা</string>
+  <string name="adb_notify_summary">যেতিয়া USB বা নেটৱৰ্ক ডিবাগিং সক্ষম কৰা হয় তেতিয়া এটা অধিসূচনা প্ৰদৰ্শন কৰক</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">স্থান</string>
+  <string name="app_ops_categories_personal">ব্যক্তিগত</string>
+  <string name="app_ops_categories_messaging">মেছেজিং</string>
+  <string name="app_ops_categories_media">মিডিয়া</string>
+  <string name="app_ops_categories_device">ডিভাইচ</string>
+  <string name="app_ops_categories_bootup">বুটআপ</string>
+  <string name="app_ops_categories_su">ৰুট প্ৰৱেশ কৰক</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">কোআৰ্চ অৱস্থান</string>
+  <string name="app_ops_summaries_fine_location">ফাইন অৱস্থান</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">কম্পন</string>
+  <string name="app_ops_summaries_read_contacts">যোগাযোগসমূহ পঢ়ক</string>
+  <string name="app_ops_summaries_modify_contacts">যোগাযোগসমূহ সংশোধন কৰক</string>
+  <string name="app_ops_summaries_read_call_log">কল লগ পঢ়ক</string>
+  <string name="app_ops_summaries_modify_call_log">কল লগ সংশোধন কৰক</string>
+  <string name="app_ops_summaries_read_calendar">কেলেণ্ডাৰ পঢ়ক</string>
+  <string name="app_ops_summaries_modify_calendar">কেলেণ্ডাৰ সংশোধন কৰক</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi স্কেন</string>
+  <string name="app_ops_summaries_notification">অধিসূচনা/টোষ্ট</string>
+  <string name="app_ops_summaries_cell_scan">চেল স্ক্ৰীণ</string>
+  <string name="app_ops_summaries_call_phone">ফোনলৈ কলক</string>
+  <string name="app_ops_summaries_read_sms">SMS পঢ়ক</string>
+  <string name="app_ops_summaries_write_sms">SMS লিখক</string>
+  <string name="app_ops_summaries_receive_sms">SMS গ্ৰহণ</string>
+  <string name="app_ops_summaries_receive_emergency_sms">জৰুৰীকালীন SMS লাভ</string>
+  <string name="app_ops_summaries_receive_mms">MMS গ্ৰহণ কৰা</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP পুশ্ব গ্ৰহণ</string>
+  <string name="app_ops_summaries_send_sms">SMS প্ৰেৰণ কৰক</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS পঢ়ক</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS লিখক</string>
+  <string name="app_ops_summaries_modify_settings">ছেটিংছ সংশোধন কৰক</string>
+  <string name="app_ops_summaries_draw_on_top">শীৰ্ষত আঁকক</string>
+  <string name="app_ops_summaries_access_notifications">ন’টিফিকেশ্যনসমূহ আহৰণ কৰক</string>
+  <string name="app_ops_summaries_camera">কেমেৰা</string>
+  <string name="app_ops_summaries_record_audio">অডিঅ’ ৰেকৰ্ড</string>
+  <string name="app_ops_summaries_play_audio">অডিঅ’ প্লে কৰক</string>
+  <string name="app_ops_summaries_read_clipboard">ক্লিপব’ৰ্ড পঢ়ক</string>
+  <string name="app_ops_summaries_modify_clipboard">ক্লিপব’ৰ্ড সংশোধন কৰক</string>
+  <string name="app_ops_summaries_media_buttons">মিডিয়া বুটামসমূহ</string>
+  <string name="app_ops_summaries_audio_focus">অডিঅ ফ\'কাচ</string>
+  <string name="app_ops_summaries_master_volume">মাষ্টাৰ ভলিউম</string>
+  <string name="app_ops_summaries_voice_volume">ভইচ ভলিউম</string>
+  <string name="app_ops_summaries_ring_volume">ৰিং ভলিউম</string>
+  <string name="app_ops_summaries_media_volume">মিডিয়া ভলিউম</string>
+  <string name="app_ops_summaries_alarm_volume">এলাৰ্ম ভলিউম</string>
+  <string name="app_ops_summaries_notification_volume">অধিসূচনা ভলিউম</string>
+  <string name="app_ops_summaries_bluetooth_volume">Bluetooth ভলিউম</string>
+  <string name="app_ops_summaries_keep_awake">জাগ্ৰত ৰাখক</string>
+  <string name="app_ops_summaries_monitor_location">নিৰীক্ষণ স্থান</string>
+  <string name="app_ops_summaries_monitor_high_power_location">উচ্চ শক্তিৰ স্থান নিৰীক্ষণ কৰক</string>
+  <string name="app_ops_summaries_get_usage_stats">ইউজেজ অৱস্থা প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">মাইক্ৰ\'ফোন মিউট/আনমিউট কৰক</string>
+  <string name="app_ops_summaries_toast_window">টোষ্ট প্ৰদৰ্শন কৰক</string>
+  <string name="app_ops_summaries_project_media">প্ৰজেক্ট মিডিয়া</string>
+  <string name="app_ops_summaries_activate_vpn">VPN সক্ৰিয় কৰক</string>
+  <string name="app_ops_summaries_write_wallpaper">ৱালপেপাৰ লিখক</string>
+  <string name="app_ops_summaries_assist_structure">গঠন সহায়তা কৰক</string>
+  <string name="app_ops_summaries_assist_screenshot">স্ক্ৰীণশ্বট সহায়তা কৰক</string>
+  <string name="app_ops_summaries_read_phone_state">ফোন অৱস্থা পঢ়ক</string>
+  <string name="app_ops_summaries_add_voicemail">ভইচমেইল যোগ দিয়ক</string>
+  <string name="app_ops_summaries_use_sip">SIP ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_summaries_make_call">কল কৰক</string>
+  <string name="app_ops_summaries_use_fingerprint">আঙুলিৰছাপ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_summaries_use_body_sensors">দেহ চেনচৰ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">চেল ব্ৰডকাষ্ট পঢ়ক</string>
+  <string name="app_ops_summaries_mock_location">ম\'ক অৱস্থান</string>
+  <string name="app_ops_summaries_read_external_storage">বাহ্যিক ষ্ট\'ৰেজ পঢ়ক</string>
+  <string name="app_ops_summaries_write_external_storage">বাহ্যিক ষ্ট\'ৰেজলৈ লিখক</string>
+  <string name="app_ops_summaries_turn_screen_on">স্ক্ৰীণ অন কৰক</string>
+  <string name="app_ops_summaries_get_accounts">একাউণ্ট প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi টগল কৰক</string>
+  <string name="app_ops_summaries_toggle_bluetooth">Bluetooth টগল কৰক</string>
+  <string name="app_ops_summaries_start_at_boot">এটা বুট আৰম্ভ কৰক</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC টগল কৰা</string>
+  <string name="app_ops_summaries_toggle_mobile_data">ম\'বাইল ডাটা টগল কৰা</string>
+  <string name="app_ops_summaries_superuser">ৰুট প্ৰৱেশ কৰক</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">কোআৰ্চ অৱস্থান</string>
+  <string name="app_ops_labels_fine_location">ফাইন অৱস্থান</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">ভাইব্ৰেট</string>
+  <string name="app_ops_labels_read_contacts">কনটেক্ট পঢ়ক</string>
+  <string name="app_ops_labels_modify_contacts">কনটেক্টসমূহ উন্নীতকৰণ কৰক</string>
+  <string name="app_ops_labels_read_call_log">কল লগ পঢ়ক</string>
+  <string name="app_ops_labels_modify_call_log">কল লগ উন্নীতকৰণ কৰক</string>
+  <string name="app_ops_labels_read_calendar">কেলেণ্ডাৰ পঢ়ক</string>
+  <string name="app_ops_labels_modify_calendar">কেলেণ্ডাৰ উন্নীতকৰণ কৰক</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi স্কেন</string>
+  <string name="app_ops_labels_notification">অধিসূচনা/টোষ্ট</string>
+  <string name="app_ops_labels_cell_scan">চেল স্কেন</string>
+  <string name="app_ops_labels_call_phone">ফোনলৈ কল কৰা</string>
+  <string name="app_ops_labels_read_sms">SMS পঢ়ক</string>
+  <string name="app_ops_labels_write_sms">SMS লিখক</string>
+  <string name="app_ops_labels_receive_sms">SMS প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_labels_receive_emergency_sms">জৰুৰীকালীন SMS প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_labels_receive_mms">MMS গ্ৰহণ কৰা</string>
+  <string name="app_ops_labels_receive_wap_push">WAP পুশ্ব প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_labels_send_sms">SMS প্ৰেৰণ কৰক</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS পঢ়ক</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS লিখক</string>
+  <string name="app_ops_labels_modify_settings">ছেটিংছ উন্নীতকৰণ কৰক</string>
+  <string name="app_ops_labels_draw_on_top">ওপৰত আঁকক</string>
+  <string name="app_ops_labels_access_notifications">জাননীসমূহ আহৰণ কৰক</string>
+  <string name="app_ops_labels_camera">কেমেৰা</string>
+  <string name="app_ops_labels_record_audio">অডিঅ’ ৰেকৰ্ড</string>
+  <string name="app_ops_labels_play_audio">অডিঅ’ প্লে’ কৰক</string>
+  <string name="app_ops_labels_read_clipboard">ক্লিপব’ৰ্ড পঢ়ক</string>
+  <string name="app_ops_labels_modify_clipboard">ক্লিপব’ৰ্ড উন্নীতকৰণ কৰক</string>
+  <string name="app_ops_labels_media_buttons">মিডিয়া বুটামসমূহ</string>
+  <string name="app_ops_labels_audio_focus">অডিঅ ফকাচ</string>
+  <string name="app_ops_labels_master_volume">মাষ্টাৰ ভলিউম</string>
+  <string name="app_ops_labels_voice_volume">ভইট ভলিউম</string>
+  <string name="app_ops_labels_ring_volume">ৰিং ভলিউম</string>
+  <string name="app_ops_labels_media_volume">মিডিয়া ভলিউম</string>
+  <string name="app_ops_labels_alarm_volume">এলাৰ্ম ভলিউম</string>
+  <string name="app_ops_labels_notification_volume">ন’টিফিকেশ্যন ভলিউম</string>
+  <string name="app_ops_labels_bluetooth_volume">ব্লুটুথ ভলিউম</string>
+  <string name="app_ops_labels_keep_awake">জাগ্ৰত ৰাখক</string>
+  <string name="app_ops_labels_monitor_location">অৱস্থান নিৰীক্ষণ কৰক</string>
+  <string name="app_ops_labels_monitor_high_power_location">উচ্চ শক্তিৰ অৱস্থান নিৰীক্ষণ কৰক</string>
+  <string name="app_ops_labels_get_usage_stats">ইউজেজ ষ্টেট</string>
+  <string name="app_ops_labels_mute_unmute_microphone">শব্দহীন/অনা-শব্দহীন মাইক্ৰ’ফোন</string>
+  <string name="app_ops_labels_toast_window">টোষ্ট প্ৰদৰ্শন কৰক</string>
+  <string name="app_ops_labels_project_media">প্ৰজেক্ট মিডিয়া</string>
+  <string name="app_ops_labels_activate_vpn">VPN সক্ৰিয় কৰা</string>
+  <string name="app_ops_labels_write_wallpaper">ৱালপেপাৰ লিখক</string>
+  <string name="app_ops_labels_assist_structure">গঠন সহায়তা কৰক</string>
+  <string name="app_ops_labels_assist_screenshot">স্ক্ৰীণশ্বট সহায়তা কৰক</string>
+  <string name="app_ops_labels_read_phone_state">ফোন অৱস্থা পঢ়ক</string>
+  <string name="app_ops_labels_add_voicemail">ভইচমেইল যোগ দিয়ক</string>
+  <string name="app_ops_labels_use_sip">SIP ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_labels_make_call">কল কৰক</string>
+  <string name="app_ops_labels_use_fingerprint">আঙুলিৰছাপ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_labels_use_body_sensors">দেহ চেনচৰ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_labels_read_cell_broadcasts">চেল ব্ৰডকাষ্ট পঢ়ক</string>
+  <string name="app_ops_labels_mock_location">ম\'ক অৱস্থান</string>
+  <string name="app_ops_labels_read_external_storage">বাহ্যিক ষ্ট\'ৰেজ পঢ়ক</string>
+  <string name="app_ops_labels_write_external_storage">বাহ্যিক ষ্ট\'ৰেজলৈ লিখক</string>
+  <string name="app_ops_labels_turn_screen_on">স্ক্ৰীণ অন কৰক</string>
+  <string name="app_ops_labels_get_accounts">একাউণ্ট প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi টগল কৰক</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bluetooth টগল কৰক</string>
+  <string name="app_ops_labels_start_at_boot">এটা বুট আৰম্ভ কৰক</string>
+  <string name="app_ops_labels_toggle_nfc">NFC টগল কৰক</string>
+  <string name="app_ops_labels_toggle_mobile_data">ম\'বাইল ডাটা টগল কৰক</string>
+  <string name="app_ops_labels_superuser">ৰুট প্ৰৱেশ কৰক</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">অনুমতি দিয়া হল।</string>
+  <string name="app_ops_permissions_ignored">প্ৰত্যাখ্যান কৰা হ\'ল</string>
+  <string name="app_ops_permissions_always_ask">সদায়েই সুধিব</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (ব্যৱহৃত <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">অনুমতি দিয়া হৈছে <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">অস্বীকাৰ কৰা হৈছে <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">অনুমতি দিয়া হৈছে <xliff:g id="count">%1$s</xliff:g>, অস্বীকাৰ কৰা হৈছে <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">ব্যৱহাৰকৰ্তা এপ্প্‌ প্ৰদৰ্শন কৰক</string>
+  <string name="app_ops_show_system_apps">পূৰ্ব-নিৰ্মিত এপ্প্‌ প্ৰদৰ্শন কৰক</string>
+  <string name="app_ops_reset_counters">অনুমতি/অস্বীকাৰ কাউণ্টাৰ ৰিছেট কৰক</string>
+  <string name="app_ops_reset_confirm_title">কাউণ্টাৰ ৰিছেট নিশ্চিত কৰক</string>
+  <string name="app_ops_reset_confirm_mesg">কাউণ্টাৰ ৰিছেট কৰিবলৈ আপুনি নিশ্চিত নে?</string>
+  <string name="ok">ঠিক</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">ডিভাইচৰ হোষ্টনেম</string>
+  <string name="unlock_scramble_pin_layout_title">স্ক্ৰেম্বল লেআউট</string>
+  <string name="unlock_scramble_pin_layout_summary">ডিভাইচ আনলকিং কৰোতে PIN লেআউট স্ক্ৰেম্বল কৰক</string>
+  <string name="button_pref_title">বুটামসমূহ</string>
+  <string name="hardware_keys_power_key_title">পাৱাৰ বুটাম</string>
+  <string name="hardware_keys_home_key_title">হোম বুটাম</string>
+  <string name="hardware_keys_back_key_title">বেক বুটাম</string>
+  <string name="hardware_keys_menu_key_title">মেন্যু বুটাম</string>
+  <string name="hardware_keys_assist_key_title">অন্বেষণ বুটাম</string>
+  <string name="hardware_keys_appswitch_key_title">শেহতীয়া বুটাম</string>
+  <string name="hardware_keys_camera_key_title">কেমেৰা বুটাম</string>
+  <string name="hardware_keys_volume_keys_title">ভলিউম বুটাম</string>
+  <string name="hardware_keys_short_press_title">চমুকৈ টিপা কাৰ্য</string>
+  <string name="hardware_keys_long_press_title">দীঘলকৈ টিপা কাৰ্য</string>
+  <string name="hardware_keys_double_tap_title">দুবাৰ টেপ কাৰ্য</string>
+  <string name="hardware_keys_action_nothing">কোনো কাৰ্য নাই</string>
+  <string name="hardware_keys_action_menu">খোলা/বন্ধ মেনু</string>
+  <string name="hardware_keys_action_app_switch">সাম্প্ৰতিক এপ্প্‌ চুইচাৰ</string>
+  <string name="hardware_keys_action_search">সন্ধান সহায়ক</string>
+  <string name="hardware_keys_action_voice_search">ভইচ সন্ধান</string>
+  <string name="hardware_keys_action_in_app_search">ইন-এপ্প সন্ধান</string>
+  <string name="hardware_keys_action_launch_camera">কেমেৰা লান্চ্চ কৰক</string>
+  <string name="hardware_keys_action_sleep">স্ক্ৰীণ অফ কৰক</string>
+  <string name="hardware_keys_action_last_app">অন্তিম এপ্প্</string>
+  <string name="camera_sleep_on_release_title">স্ক্ৰীণ পিক</string>
+  <string name="camera_sleep_on_release_summary">এটা হাফ প্ৰেছে বুটামটো টিপি থকা সময়তহে স্ক্ৰীণ অন ৰাখিব</string>
+  <string name="camera_launch_title">কেমেৰা লান্চ্চ কৰক</string>
+  <string name="camera_launch_summary">এবাৰ দীঘলকৈ টিপিলে আৰু এৰি দিলে কেমেৰা লান্চ্চ হ\'ব</string>
+  <string name="volbtn_music_controls_title">প্লেবেক কন্ট্ৰোল</string>
+  <string name="volbtn_music_controls_summary">যেতিয়া স্ক্ৰীণ অফ থাকিব, ভলিউম কী দীঘলকৈ টিপিলে সংগীত ট্ৰেকসমূহ বিচাৰিব</string>
+  <string name="volbtn_cursor_control_title">কীবোৰ্ড কাৰ্ছৰ নিয়ন্ত্ৰণ</string>
+  <string name="volbtn_cursor_control_off">নিস্ক্ৰিয় কৰা হল</string>
+  <string name="volbtn_cursor_control_on">ভলিউম ওপৰলৈ/তললৈ নিলে কাৰ্ছৰ কাৰ্ছৰ বাওঁ/সোঁ ফালে নিব</string>
+  <string name="volbtn_cursor_control_on_reverse">ভলিউম ওপৰলৈ/তললৈ নিলে কাৰ্ছৰ সোঁ/বাওঁ ফালে নিব</string>
+  <string name="power_end_call_title">কল সমাপ্ত কৰক</string>
+  <string name="power_end_call_summary">পাৱাৰ বুটাম টিপিলে চলি থকা কলটো সমাপ্ত কৰিব</string>
+  <string name="swap_volume_buttons_title">ৰিঅ\'ৰিয়েণ্ট</string>
+  <string name="swap_volume_buttons_summary">স্ক্ৰীণখন ঘূৰোৱাৰ সময়ত ভলিউম বুটামবোৰ বিনিময় কৰক</string>
+  <string name="button_wake_title">ৱেক আপ ডিভাইচ</string>
+  <string name="home_answer_call_title">কলৰ উত্তৰ দিয়ক</string>
+  <string name="home_answer_call_summary">হোম বুটাম টিপিলে ইনকামিং কলটোৰ উত্তৰ দিব</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">এডাপ্টিভ বেকলাইট</string>
+  <string name="adaptive_backlight_summary">ব্যৱহাৰযোগ্যতা বজাই ৰখাৰ লগতে বেটাৰীৰ জীৱন সৰ্বাধিক কৰিবলৈ প্রদর্শন বেকলাইটৰ উজ্জ্বলতা গতিশীলভাবে মিলাওক</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">সূৰ্যৰ পোহৰ উন্নীতকৰণ</string>
+  <string name="sunlight_enhancement_summary">উজ্জ্বল সূৰ্যৰ পোহৰৰ তলত প্রদর্শন উজ্জ্বলতা আৰু পঠনযোগ্যতা উন্নীত কৰক</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">ৰং উন্নীতকৰণ</string>
+  <string name="color_enhancement_summary">প্রদর্শনৰ ৰং গতিশীলভাবে উন্নত কৰক</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">বেকলাইট</string>
+  <string name="button_backlight_enabled">বুটামবোৰ উদ্ভাসিত কৰক</string>
+  <string name="keyboard_backlight_enabled">কীবোৰ্ড</string>
+  <string name="button_backlight_seekbar_title">বুটামৰ উজ্জ্বলতা</string>
+  <string name="keyboard_backlight_seekbar_title">কীবোৰ্ডৰ উজ্জ্বলতা</string>
+  <string name="backlight_timeout_title">উদ্ভাসিতৰ টাইম আউট</string>
+  <string name="backlight_timeout_unlimited">অফ নকৰিব</string>
+  <string name="backlight_summary_disabled">নিস্ক্ৰিয় কৰা হল</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g> ৰ বাবে সক্ষম কৰা হ\'ল</string>
+  <string name="backlight_summary_enabled">সক্ৰিয় কৰা হল</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">ভঙ্গিমা</string>
   <!-- Power menu -->
+  <string name="power_menu_title">পাৱাৰ মেনু</string>
+  <string name="power_menu_reboot_title">ৰিবুট মেনু</string>
+  <string name="power_menu_screenshot_title">স্ক্ৰীণস্বট</string>
+  <string name="power_menu_airplane_title">এয়াৰপ্লেন মোড</string>
+  <string name="power_menu_users_title">ব্যৱহাৰকৰ্তা চুইচাৰ</string>
+  <string name="power_menu_settings_title">ছেটিংছ শ্বৰ্টকাট</string>
+  <string name="power_menu_lockdown_title">ডিভাইচ লকডাউন</string>
+  <string name="power_menu_bug_report_title">বাগ প্ৰতিবেদন</string>
+  <string name="power_menu_sound_title">ধ্বনি পেনেল</string>
+  <string name="power_menu_bug_report_disabled">ডেভেলপমেণ্ট ছেটিংচত বাগ ৰিপোৰ্টিং অক্ষম কৰা হৈছে</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">অন-স্ক্ৰীণ নেভ বাৰ সক্ষম কৰক</string>
+  <string name="disable_navkeys_summary">অন-স্ক্ৰীণ নেভিগেশ্যন বাৰ সক্ষম কৰক আৰু হাৰ্ডৱেৰ বুটামবোৰ অক্ষম কৰক</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">সুপ্ত কৰিবলৈ দুবাৰ টেপ কৰক</string>
+  <string name="double_tap_to_sleep_summary">প্রদর্শন অফ কৰিবলৈ ষ্টেটাছ বাৰত দুবাৰ ক্লিক কৰক</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">দুৰ্ঘটনাক্ৰমে ৱেক-আপ হোৱাটো প্ৰতিৰোধ কৰক</string>
+  <string name="proximity_wake_summary">স্ক্ৰীণ ৱেক আপ কৰাৰ আগতে প্ৰ\'ক্সিমিটী চেনচৰ পৰীক্ষা কৰক</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">প্লাগ কৰিলে ৱেক কৰক</string>
+  <string name="wake_when_plugged_or_unplugged_summary">পাৱাৰ উৎসৰ সৈতে সংযোগ কৰিলে বা সংযোগহীন কৰিলে স্ক্ৰীণ অন কৰক</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">নমুনা</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">ভলিউম মিলোৱাৰ ধ্বনি</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">ভাইব্ৰেটৰৰ তীব্ৰতা</string>
+  <string name="vibrator_warning">%1$d তকৈ ডাঙৰ মান অনুমোদিত নহয়</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">ৰং কেলিব্ৰেচন</string>
+  <string name="color_calibration_summary">অন স্ক্ৰীণ ৰং কেলিব্ৰেট কৰক</string>
+  <string name="color_red_title">ৰঙা</string>
+  <string name="color_green_title">সেউজীয়া</string>
+  <string name="color_blue_title">নীলা</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">গামা কেলিব্ৰেচন</string>
+  <string name="gamma_tuning_summary_head">টুইক গামাৰ মানবোৰ</string>
+  <string name="gamma_tuning_control_set_header">গ্ৰুপ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">কনট্ৰাষ্ট</string>
+  <string name="gamma_tuning_brightness">উজ্বলতা</string>
+  <string name="gamma_tuning_saturation">পৰিপূৰ্ণ কৰা</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">সংগীত এপ্প্ লান্চ্চ কৰক</string>
+  <string name="headset_connect_player_summary">হেডছেট সংযোগ কৰিলে ডিফ\'ল্ট সংগীত এপ্প লান্চ্চ কৰক</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">স্বয়ংক্ৰিয় অগ্ৰাধিকাৰ</string>
+  <string name="auto_brightness_reset_button">ৰিছেট</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">ঘূৰণ</string>
+  <string name="display_rotation_disabled">নিস্ক্ৰিয় কৰা হল</string>
+  <string name="display_rotation_unit">ডিগ্ৰী</string>
+  <string name="display_lockscreen_rotation_title">লক স্ক্ৰীণ ঘূৰাওক</string>
+  <string name="display_rotation_category_title">মোডবোৰ ঘূৰাওক</string>
+  <string name="display_rotation_0_title">0 ডিগ্ৰী</string>
+  <string name="display_rotation_90_title">90 ডিগ্ৰী</string>
+  <string name="display_rotation_180_title">180 ডিগ্ৰী</string>
+  <string name="display_rotation_270_title">270 ডিগ্ৰী</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">স্ক্ৰীণৰ ৰং</string>
+  <string name="screencolor_summary">স্ক্ৰীণৰ হিউ, সংপৃক্ততা, বিষমতা আৰু তীব্ৰতা টিউন কৰক</string>
+  <string name="custom_screencolor">কাষ্টম স্ক্ৰীণ ৰং</string>
+  <string name="screencolor_save">ছেভ কৰা</string>
+  <string name="screencolor_cancel">নাকচ</string>
+  <string name="restore_preview">ডিফ\'ল্ট ছবি চাওক</string>
+  <string name="selectnewfile_menu">গেলাৰীৰ পৰা নতুন ছবি চাওক</string>
+  <string name="selectfile_menu">গেলাৰীৰ পৰা ছবি চাওক</string>
+  <string name="restore_default_str">ৰিছেট</string>
+  <string name="hue_str">হিউ: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">ৰঙৰ গাঢ়তা: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">বিষমতা: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">তীব্ৰতা: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">পঠনযোগ্যতা আৰু চকুৰ ওপৰত চাপ হ্ৰাস কৰিবলৈ দিনৰ সময়ৰ আধাৰত আপোনাৰ স্ক্ৰীণ আৰু পাৰিপাৰ্শ্বিক অৱস্থা অপ্টিমাইজ কৰক</string>
+  <string name="live_display_mode">প্রদর্শন মোড</string>
+  <string name="live_display_color_temperature_title">ৰং তাপমাত্ৰা</string>
+  <string name="live_display_color_temperature_summary">দিন: <xliff:g id="day_temperature">%1$d</xliff:g>K ৰাতি: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">দিন</string>
+  <string name="live_display_night">নাইট</string>
+  <string name="live_display_outdoor_mode_title">স্বয়ংক্ৰিয় আউটডোৰ মোড</string>
+  <string name="live_display_outdoor_mode_summary">উজ্জ্বল সূৰ্যৰ পোহৰৰ তলত উজ্জ্বলতা আৰু সংপৃক্ততা স্বয়ংক্ৰিয়ভাবে বৃদ্ধি কৰক</string>
+  <string name="live_display_low_power_title">শক্তি ব্যয় হ্ৰাস কৰক</string>
+  <string name="live_display_low_power_summary">অৱনতি নোহোৱাকৈ শক্তি ব্যয় সৰ্বনিম্ন কৰিবলৈ প্রদর্শন মিলাওক</string>
+  <string name="live_display_enhance_color_title">ৰং উন্নত কৰক</string>
+  <string name="live_display_enhance_color_summary">ফ্লেশ্ব টোন, দৃশ্যপট আৰু অন্যান্য প্ৰতিচ্ছবিৰ ৰঙৰ তীব্ৰতা উন্নত কৰক</string>
+  <string name="live_display_color_profile_title">ৰং প্ৰ\'ফাইল</string>
+  <string name="live_display_color_profile_standard_title">ষ্টেণ্ডাৰ্ড</string>
+  <string name="live_display_color_profile_standard_summary">নিঁখুত ৰং আৰু উজ্জ্বল বগা</string>
+  <string name="live_display_color_profile_natural_title">প্ৰাকৃতিক</string>
+  <string name="live_display_color_profile_natural_summary">প্ৰকৃত ৰং আৰু ফ্লেশ্ব টোন</string>
+  <string name="live_display_color_profile_dynamic_title">ডায়নামিক</string>
+  <string name="live_display_color_profile_dynamic_summary">উন্নত ৰং আৰু উজ্জ্বল বগা</string>
+  <string name="live_display_color_profile_cinema_title">চিনেমা</string>
+  <string name="live_display_color_profile_cinema_summary">ভিডিঅ\'ৰ বাবে নিৰ্ভুল ৰং উৎপাদন</string>
+  <string name="live_display_color_profile_astronomy_title">এষ্ট্ৰন\'মি</string>
+  <string name="live_display_color_profile_astronomy_summary">ৰাতিৰ ভিচন সংৰক্ষণ কৰাৰ বাবে গাঢ় ৰঙা</string>
+  <string name="live_display_color_profile_photography_title">ফটোগ্ৰাফী</string>
+  <string name="live_display_color_profile_photography_summary">ফটোৰ বাবে নিৰ্ভুল ৰং উৎপাদন</string>
+  <string name="live_display_color_profile_basic_title">প্ৰাথমিক</string>
+  <string name="live_display_color_profile_basic_summary">কেলিব্ৰেট নকৰাকৈ প্রদর্শন ব্যৱহাৰ কৰক</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">নিৰ্বাচক আইকন</string>
+  <string name="ime_switcher_notify_summary">নিৰ্বাচক আইকনৰ ইনপুট পদ্ধতি প্ৰদৰ্শন কৰক</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">হেডচ আপ</string>
+  <string name="summary_heads_up_enabled">পপ-আপ অধিসূচনাবোৰ সক্ষম কৰা হৈছে</string>
+  <string name="summary_heads_up_disabled">পপ-আপ অধিসূচনাবোৰ অক্ষম কৰা হৈছে</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">সকলো ধৰণৰ ফাইল গ্ৰহণ কৰক</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">উচ্চ স্পৰ্শ সংবেদনশীলতা</string>
+  <string name="high_touch_sensitivity_summary">টাচ্চস্ক্ৰীণৰ সংবেদনশীলতা বৃদ্ধি কৰক যাতে হাতমোজা পিন্ধি থাকিলেও ইয়াক ব্যৱহাৰ কৰিব পাৰি</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD ঘনত্ব</string>
+  <string name="dialog_title_lcd_density">LCD ঘনত্ব</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (ডিফ\'ল্ট)</string>
+  <string name="restarting_ui">UI\u2026 পুনৰাৰম্ভ হৈ আছে</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">ষ্টাইলাচ ব্যৱহাৰ কৰা সময়ত আইকন প্ৰদৰ্শন কৰক</string>
+  <string name="stylus_icon_enabled_summary">ভাসমান কৰোতে বা ষ্টাইলাছেৰে অঁকাৰ সময়ত পইণ্টাৰ আইকন প্ৰদৰ্শন কৰক</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">ষ্টাইলাছ ভঙ্গিমা</string>
+  <string name="category_spen_title">ষ্টাইলাছ ভঙ্গিমা</string>
+  <string name="enable_subcat_title">ষ্টাইলাছ</string>
+  <string name="enable_spen_title_head">ভঙ্গিমা সক্ষম কৰক</string>
+  <string name="enable_spen_summary_head">ষ্টাইলাছ বুটাম হেঁচি ধৰি ছোৱাইপ ভঙ্গিমা ব্যৱহাৰ কৰক</string>
+  <string name="gestures_subcat_title">ভঙ্গিমা</string>
+  <string name="gestures_left_spen_title_head">বাওঁ ছোৱাইপ</string>
+  <string name="gestures_right_spen_title_head">সোঁ ছোৱাইপ</string>
+  <string name="gestures_up_spen_title_head">ওপৰলৈ ছোৱাইপ</string>
+  <string name="gestures_down_spen_title_head">তললৈ ছোৱাইপ</string>
+  <string name="gestures_long_spen_title_head">দীঘলকৈ টিপা</string>
+  <string name="gestures_double_spen_title_head">দুবাৰ টেপ কৰক</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">কোনো কাৰ্য নাই</string>
+  <string name="gestures_action_home">হোম</string>
+  <string name="gestures_action_back">পিছ</string>
+  <string name="gestures_action_menu">মেন্যু</string>
+  <string name="gestures_action_search">সন্ধান ইনভ\'ক কৰক</string>
+  <string name="gestures_action_recent">শেহতীয়া এপ্পসমূহ</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s ইনষ্টল কৰা নাই</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">টাচ্চস্ক্ৰীণ ভাসমান কৰাৰ</string>
+  <string name="touchscreen_hovering_summary">আপোনাক স্ক্ৰীণৰ ওপৰত ৱেব ব্ৰাউজাৰ, ৰিম\'ট ডেস্কটপ আদিৰ দৰে মাউচ ভাসমান কৰাৰ অনুমতি দিয়ে</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">ৰিং ভলিউম বৃদ্ধি কৰক</string>
+  <string name="increasing_ring_min_volume_title">ৰিং ভলিউম</string>
+  <string name="increasing_ring_ramp_up_time_title">ৰেম্প-আপ সময়</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS সমৰ্থিত ডাটা ডাউনলোড</string>
+  <string name="lto_download_data_wifi_only_on">যিকোনো নেটৱৰ্কৰ ওপৰত</string>
+  <string name="lto_download_data_wifi_only_off">কেৱল ৱাই\u2011ফাই নেটৱৰ্কৰ ওপৰত</string>
+  <string name="volume_keys_control_ring_stream_title">ৰিংটোন ভলিউম নিয়ন্ত্ৰণ কৰক</string>
+  <string name="volume_keys_control_ring_stream_summary_on">ভলিউম কীবোৰে ৰিংটোনৰ ভলিউম নিয়ন্ত্ৰণ কৰে</string>
+  <string name="volume_keys_control_ring_stream_summary_off">ভলিউম কীবোৰে মিডিয়াৰ ভলিউম নিয়ন্ত্ৰণ কৰে</string>
+  <string name="category_calibration">কেলিবাৰেচন</string>
+  <string name="display_and_lights">প্রদর্শন আৰু লাইটবোৰ</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">চাৰ্জিং শব্দ</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">সক্ৰিয় কৰা</string>
+  <string name="power_notifications_enable_summary">পাৱাৰ উৎসৰ সৈতে সংযোগ কৰিলে বা সংযোগহীন কৰিলে এটা ধ্বনি বজাওক</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">ভাইব্ৰেট</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">অধিসূচনা ধ্বনি</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">ছাইলেণ্ট</string>
   <!-- Status bar -->
+  <string name="status_bar_title">স্থিতি দণ্ডিকা</string>
+  <string name="status_bar_toggle_brightness">উজ্জ্বলতা নিয়ন্ত্ৰণ</string>
+  <string name="status_bar_toggle_brightness_summary">ষ্টেটাছ বাৰৰ মাজেৰে স্লাইড কৰি উজ্জ্বলতা মিলাওক</string>
+  <string name="status_bar_notif_count_title">অধিসূচনা গণনা প্ৰদৰ্শন কৰক</string>
+  <string name="status_bar_notif_count_summary">অমীমাংসিত অধিসূচনাৰ সংখ্যা প্ৰদৰ্শন কৰক</string>
+  <string name="status_bar_quick_qs_pulldown_title">দ্ৰুত নমাই অনা</string>
+  <string name="status_bar_quick_qs_pulldown_summary">স্থিতি দণ্ডিকাৰ %1$s কাষে দ্ৰুত ছেটিংছ নমাই আনে</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">ৰৈ যোৱা</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">সোঁফাল</string>
+  <string name="status_bar_quick_qs_pulldown_off">অফ</string>
+  <string name="status_bar_quick_qs_pulldown_left">ৰৈ যোৱা</string>
+  <string name="status_bar_quick_qs_pulldown_right">সোঁফাল</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">ঘড়ীৰ ষ্টাইল</string>
+  <string name="status_bar_clock_style_right">সোঁফাল</string>
+  <string name="status_bar_clock_style_left">ৰৈ যোৱা</string>
+  <string name="status_bar_clock_style_center">কেন্দ্ৰ</string>
+  <string name="status_bar_clock_style_hidden">হিডেৱ</string>
+  <string name="status_bar_am_pm_title">AM/PM ষ্টাইল</string>
+  <string name="status_bar_am_pm_info">24-ঘণ্টীয়া ঘড়ি সক্ষম কৰা হৈছে</string>
+  <string name="status_bar_am_pm_normal">সাধাৰণ</string>
+  <string name="status_bar_am_pm_small">সৰু</string>
+  <string name="status_bar_am_pm_hidden">হিডেৱ</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">বেটাৰীৰ স্থিতিৰ ষ্টাইল</string>
+  <string name="status_bar_battery_style_icon_portrait">আইকন প’ৰ্ট্ৰেইট</string>
+  <string name="status_bar_battery_style_icon_landscape">আইকন লেণ্ডস্কেপ</string>
+  <string name="status_bar_battery_style_circle">বৃত্ত</string>
+  <string name="status_bar_battery_style_text">টেক্সট</string>
+  <string name="status_bar_battery_style_hidden">হিডেৱ</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">বেটাৰী শতাংশ</string>
+  <string name="status_bar_battery_percentage_default">হিডেৱ</string>
+  <string name="status_bar_battery_percentage_text_inside">আইকনৰ ভিতৰত</string>
+  <string name="status_bar_battery_percentage_text_next">আইকনৰ পৰৱৰ্তী</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">ষ্টেটাচ বাৰৰ আইকন</string>
+  <string name="status_bar_icons_summary">কোন ষ্টেটাচ বাৰৰ আইকন দেখুওৱা হ\'ব নিয়ন্ত্ৰণ কৰক</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">ভঙ্গিমা স্পৰ্শ ইভেণ্ট অৱৰুদ্ধ কৰক</string>
+  <string name="edge_gesture_service_summary">নেভিগেশ্যনৰ বাবে স্পৰ্শ ইভেণ্টবোৰ আৰু ষ্টেটাচ বাৰৰ ভঙ্গিমাবোৰ এ‌প্প্‌লৈ নপঠাব</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">কেতিয়াও নকৰিব</string>
+  <string name="keep_screen_on_debugging">USB ডিবাগিং হৈ থাকোতে</string>
+  <string name="keep_screen_on_charging">চাৰ্জিং হৈ থাকোঁতে</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">গোপনীয়তা</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">ডিফ\'ল্ট হিচাপে সক্ষম কৰক</string>
+  <string name="privacy_guard_default_summary">নতুনকৈ ইনষ্টল কৰা এপ্প্‌ৰ বাবে ডিফ\'ল্ট হিচাপে সক্ষম কৰক</string>
+  <string name="privacy_guard_manager_title">গোপনীয়তা ৰক্ষক</string>
+  <string name="privacy_guard_manager_summary">কোন এপ্প্‌এ আপোনাৰ ব্যক্তিগত তথ্যত প্ৰৱেশ কৰিব সেইটো প্ৰবন্ধন কৰক</string>
+  <string name="privacy_guard_no_user_apps">কোনো এপ্প্ ইনষ্টল কৰা নাই</string>
+  <string name="privacy_guard_help_title">হেল্প</string>
+  <string name="privacy_guard_reset_title">ৰিছেট</string>
+  <string name="privacy_guard_reset_text">অনুমতি ৰিছেট কৰিব?</string>
+  <string name="privacy_guard_help_text">এই স্ক্ৰীণত আপুনি কোন এপ্প্এ গোপনীয়তা ৰক্ষক সক্ৰিয় কৰা উচিত সেইটো সেইবোৰত টেপ কৰি পচন্দ কৰিব পাৰে। নিৰ্বাচিত এপ্প্‌বোৰে যোগাযোগ, বাৰ্তা বা কল লগৰ দৰে ব্যক্তিগত ডাটাবোৰ ব্যৱহাৰ কৰিবলৈ সক্ষম নহ\'ব। এটা এপ্প এণ্ট্ৰি দীঘলকৈ টিপিলে ইয়াৰ এপ্প বিৱৰণ স্ক্ৰীণ খোলা খায়।\n\nপূৰ্বনিৰ্মিত এপ্প্‌বোৰ ডিফ\'ল্ট হিচাপে নেদেখুৱায়, কিন্তু যথাযথ মেনু বিকল্প নিৰ্বাচন কৰি উন্মুক্ত কৰিব পাৰি।</string>
+  <string name="privacy_guard_manager_show_system_apps">পূৰ্ব-নিৰ্মিত এপ্প্‌ প্ৰদৰ্শন কৰক</string>
+  <string name="privacy_guard_advanced_settings_title">এডভান্সড</string>
+  <string name="privacy_guard_notification_title">অধিসূচনা প্ৰদৰ্শন কৰক</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">পেটাৰ্ণৰ ত্ৰুটি প্ৰদৰ্শন কৰক</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">পেটাৰ্ণৰ ডটবোৰ প্ৰদৰ্শন কৰক</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">পাছৱৰ্ড প্ৰৱেশি প্ৰত্যক্ষভাবে প্ৰদৰ্শন কৰক</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">পেটাৰ্ণ ভিউ প্ৰত্যক্ষভাবে প্ৰদৰ্শন কৰক</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">PIN প্ৰৱেশি প্ৰত্যক্ষভাবে প্ৰদৰ্শন কৰক</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">সংগীত ভিজুৱেলাইজাৰ প্ৰদৰ্শন কৰক</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">দ্ৰুত ছেটিংচ টাইলৰ দ্বাৰা অক্ষমিত</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">লক স্ক্ৰীণ সক্ষম কৰিবলৈ টেপ কৰক</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">লক স্ক্ৰীণ সক্ষম কৰা হৈছে!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">বেটাৰী চেভাৰ ট্ৰেচহোল্ড</string>
+  <string name="battery_saver_summary">কাৰ্যদক্ষতা হ্ৰাস কৰক আৰু পটভূমিৰ ডাটা সীমিত কৰক</string>
+  <string name="battery_saver_summary_unavailable">চাৰ্জিং কৰি থাকোতে উপলব্ধ নহয়</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">পাৰ-এপ্প প্ৰ\'ফাইল সক্ষম কৰক</string>
+  <string name="autoperf_summary">বিভিন্ন এপ্পৰ বাবে স্বয়ংক্ৰিয়ভাবে যথাযথ বেটাৰী মোড চয়ন কৰক</string>
+  <string name="perf_profile_title">বেটাৰী মোড</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">এপ্প্ বুটৰ সময়ত আৰম্ভ হৈছিল</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">অধিসূচনা টোন</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">এডভান্সড ৰিবুট</string>
+  <string name="advanced_reboot_summary">যেতিয়া আনলক কৰা হয়, ৰিকোভাৰীলৈ ৰিবুট কৰা, বুটলোডাৰ বা চফ্ট ৰিবুট সম্পন্ন কৰাৰ বাবে পাৱাৰ মেনুত বিকল্প অন্তৰ্ভুক্ত কৰক</string>
+  <string name="category_interface">ইণ্টাৰফেচ</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">সম্প্ৰসাৰিত ডেস্কটপ</string>
+  <string name="expanded_hide_nothing">একো নুলুকুৱাব</string>
+  <string name="expanded_hide_status">স্থিতি দণ্ডিকা লুকুৱাওক</string>
+  <string name="expanded_hide_navigation">নেভিগেশ্যন বাৰ লুকুৱাওক</string>
+  <string name="expanded_hide_both">দুয়োটাই লুকুৱাওক</string>
+  <string name="expanded_nothing_to_show">সম্প্ৰসাৰিত অৱস্থাৰ বাবে পাৰ-এপ্প্‌ কনফিগাৰেচন যোগ কৰিবলৈ, \'Enabled for all\' অফ অৱস্থানলৈ ছেট কৰক</string>
+  <string name="expanded_enabled_for_all">সকলোৰে বাবে সক্ষম কৰা হৈছে</string>
+  <string name="expanded_desktop_style">সম্প্ৰাসৰিত ডেস্কটপ ষ্টাইল</string>
+  <string name="expanded_desktop_style_description">এটা সম্প্ৰাসৰিত ডেস্কটপ ষ্টাইল পচন্দ কৰক</string>
+  <string name="expanded_desktop_title">সম্প্ৰাসৰিত ডেস্কটপ বিকল্পবোৰ</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">কিল এপ্প্ বেক বুটাম</string>
+  <string name="kill_app_longpress_back_summary">বেক বুটাম দীঘলকৈ টিপি সম্মুখত থকা এপ্প্ আঁতৰাওক</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">সাম্প্ৰতিক মেনুত সন্ধান বাৰ প্ৰদৰ্শন কৰক</string>
+  <string name="keywords_recents_show_searchbar">সাম্প্ৰতিক সাম্প্ৰতিকবোৰ অক্ষম সক্ষম প্ৰদৰ্শন কৰক লুকুৱাওক সন্ধান বাৰ সন্ধানবাৰ</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">ভইচ ৱেকআপ</string>
+  <string name="voice_wakeup_retrain_title">আপোনাৰ ভইচ ৰাখক</string>
+  <string name="voice_wakeup_activity_title">লান্চ্চ কৰিবলৈ কাৰ্যকলাপ</string>
+  <string name="voice_wakeup_default_activity">Google নাউ</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">এটা ডাইৰেক্ট ডায়েল যোগাযোগ চয়ন কৰিবলৈ ভইচ ৱেকআপৰ ফোন কলৰ অনুমতি থকা প্ৰয়োজন।</string>
+  <string name="picker_activities">কাৰ্যাৱলীসমূহ</string>
+  <string name="select_custom_app_title">কাষ্টম এপ্প চয়ন কৰক</string>
+  <string name="select_custom_activity_title">কাষ্টম কাৰ্যকলাপ চয়ন কৰক</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">অৱৰুদ্ধ কৰা কলাৰ সূচী</string>
+  <string name="blacklist_edit_dialog_title">অৱৰুদ্ধ কৰা ফোন নম্বৰ সম্পাদনা কৰক</string>
+  <string name="blacklist_prefs">ছেটিংছ</string>
+  <string name="blacklist_button_delete">মচি দিয়া</string>
+  <string name="blacklist_empty_text">আপোনাৰ কোনো অৱৰুদ্ধ কৰা নম্বৰ নাই এড (+) বুটাম স্পৰ্শ কৰি এটা এণ্ট্ৰি যোগ কৰক</string>
+  <string name="blacklist_disabled_empty_text">আপোনাক কল কৰিবলৈ বা বাৰ্তািং কৰিবলৈ ফোন নম্বৰ প্ৰতিৰোধ কৰাৰ বাবে অৱৰুদ্ধিত কলাৰ সূচী সক্ষম কৰক।</string>
+  <string name="blacklist_summary_disabled">নিস্ক্ৰিয় কৰা হল</string>
+  <string name="blacklist_summary">আপুনি কলাৰ সূচীত থকা ফোন নম্বৰৰ পৰা ইনকামিং কল বা বাৰ্তা প্ৰাপ্ত নকৰিব</string>
+  <string name="blacklist_notify">অধিসূচনা প্ৰদৰ্শন কৰক</string>
+  <string name="blacklist_private_numbers_title">ব্যক্তিগত নম্বৰ</string>
+  <string name="blacklist_private_numbers_summary_disabled">ব্যক্তিগত নম্বৰৰ পৰা কল অৱৰুদ্ধ নকৰিব</string>
+  <string name="blacklist_private_numbers_summary">নিজস্ব নম্বৰৰ পৰা অহা <xliff:g id="type">%s</xliff:g> অৱৰুদ্ধ কৰক</string>
+  <string name="blacklist_unknown_numbers_title">অজ্ঞাত নম্বৰ</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">য়োগায়োগ সূচীত নথকা নম্বৰৰ পৰা অহা কল বা বাৰ্তা অৱৰুদ্ধ নকৰিব</string>
+  <string name="blacklist_unknown_numbers_summary">যোগাযোগ সূচীত নথকা নম্বৰৰ পৰা অহা <xliff:g id="type">%s</xliff:g> অৱৰুদ্ধ কৰক কৰক</string>
+  <string name="blacklist_summary_type_calls_only">কলবোৰ</string>
+  <string name="blacklist_summary_type_messages_only">বাৰ্তাবোৰ</string>
+  <string name="blacklist_summary_type_calls_and_messages">কল আৰু বাৰ্তাবোৰ</string>
+  <string name="blacklist_regex_title">ৱাইল্ডকাৰ্ড ব্যৱহাৰ কৰা</string>
+  <string name="blacklist_regex_summary">পুনৰাবৃত্তিৰ বাবে ৱাইল্ডকাৰ্ড হিচাপে . আৰু * ব্যৱহাৰ কৰক অৰ্থাৎ 123.* য়ে 123 ৰে আৰম্ভ হোৱা নম্বৰবোৰ অৱৰুদ্ধ কৰে আৰু .*123.* য়ে 123 থকা নম্বৰবোৰ অৱৰুদ্ধ কৰে</string>
+  <string name="blacklist_policy_block_calls">ইনকামিং কলসমূহ প্ৰতিবন্ধিত কৰা</string>
+  <string name="blacklist_policy_block_messages">ইনকামিং কলসমূহ অৱৰুদ্ধ কৰক</string>
+  <string name="blacklist_bad_number_add">অৱৰুদ্ধিত কলাৰ সূচীত অবৈধ ফোন নম্বৰ যোগ কৰিবলৈ অক্ষম</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">নম্বৰ আঁতৰাওক</string>
+  <string name="remove_blacklist_entry">আপুনি এই অৱৰুদ্ধ কৰা ফোন নম্বৰটো আঁতৰাবলৈ বিচাৰে নে?</string>
+  <string name="select_contact">সম্পৰ্ক চয়ন কৰক</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">এপ্প্ নিৰাপত্তা</string>
+  <string name="sms_security_check_limit_title">SMS বাৰ্তাৰ সীমাবদ্ধতা</string>
+  <string name="sms_security_check_limit_summary">নিশ্চিতিকৰণৰ আৱশ্যক হোৱাৰ আগতে এপ্প্‌বোৰে 1 মিনিটত %d বাৰ্তা পঠাব পাৰে।</string>
+  <string name="sms_security_check_limit_summary_none">নিশ্চিতিকৰণ নোহোৱাকৈ এপ্পক কোনো বাৰ্তা পঠাবলৈ অনুমতি দিয়া নহয়</string>
+  <string name="sms_security_check_limit_none">হাল্লা</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s যোগ কৰা হৈছে</string>
+  <string name="spam_last_blocked_title">অন্তিম অৱৰুদ্ধ কৰা হৈছে %1$s</string>
+  <string name="block_notifications_title">অধিসূচনাবোৰ ফিল্টাৰ কৰক</string>
+  <string name="block_notifications_summary">উপেক্ষা কৰা অধিসূচনাবোৰ আৰু ফিল্টাৰবোৰ প্ৰবন্ধন কৰক</string>
+  <string name="no_filters_title">কোনো ফিল্টাৰ ছেট কৰা নাই</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod পৰিসংখ্যা</string>
+  <string name="anonymous_statistics_summary">বেনামী পৰিসংখ্যা ৰিপোৰ্টিং চয়ন কৰাৰ দ্বাৰা CyanogenMod উন্নত কৰাত সহায় কৰক</string>
+  <string name="anonymous_statistics_warning_title">বিষয়ে</string>
+  <string name="anonymous_statistics_warning">CyanogenMod পৰিসংখ্যা চয়ন কৰিলে ডিভাইচবোৰৰ মাজত অনন্য স্থাপনকৰণ ট্ৰেক কৰিবলৈ অ-ব্যক্তিগত ডাটা CyanogenMod ডেভেলপাৰসকললৈ দাখিল কৰিবলৈ অনুমতি দিব। দাখিল কৰা তথ্যবোৰত এটা অনন্য চিনাক্তকাৰী অন্তৰ্ভুক্ত থাকে, যিটোৱে আপোনাৰ গোপনীয়তা বা ব্যক্তিগত ডাটাৰ সৈতে আপোচ নকৰে। প্ৰতিবাৰ বুট হোৱা সময়ত ডাটা দাখিল কৰা হয়।\n\nদাখিল কৰা ডাটাৰ উদাহৰণ হিচাপে, প্ৰিভিউ ডাটাত ডেপ কৰক।</string>
+  <string name="enable_reporting_title">ৰিপোৰ্টিং সক্ষম কৰক</string>
+  <string name="preview_data_title">ডাটা প্ৰিভিউ কৰক</string>
+  <string name="view_stats_title">পৰিসংখ্যা চাওক</string>
+  <string name="anonymous_learn_more">বেছিকৈ পঢ়া</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">অনন্য ID</string>
+  <string name="preview_device_title">ডিভাইচ</string>
+  <string name="preview_version_title">সংস্কৰণ</string>
+  <string name="preview_country_title">ৰাষ্ট্ৰ</string>
+  <string name="preview_carrier_title">বাহক</string>
+  <string name="stats_collection_title">পৰিসংখ্যা সংগ্ৰহ</string>
+  <string name="stats_collection_summary">যেতিয়া সক্ষম কৰা হয়, মেট্ৰিক্স সংগ্ৰহৰ অনুমতি দিয়ে</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">পেটাৰ্ণ ৰিছেট কৰক</string>
+  <string name="lockpattern_settings_reset_summary">পেটাৰ্ণ লক ৰিছেট কৰিবলৈ প্ৰাথমিক ই-মেইল একাউণ্ট আৰু সংযুক্ত পাছৱৰ্ড প্ৰৱেশ কৰক</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">ৰিছেট</string>
+  <string name="menu_hidden_apps_reset_lock">পেটাৰ্ণ লক ৰিছেট কৰক</string>
+  <string name="protected_apps">প্ৰতিৰোধী এপ্প্</string>
+  <string name="protected_apps_summary">সুৰক্ষিত লকৰ পাছফালে কোনবোৰ এপ্লিকেচন লুকুওৱা হ\'ব প্ৰবন্ধন কৰক</string>
+  <string name="saving_protected_components">কম্পোনেণ্টৰ অৱস্থা সংৰক্ষণ কৰা\u2026</string>
+  <string name="pa_login_username_hint">ৱ্যবহাৰকাৰীৰ নাম (ইমেইল)</string>
+  <string name="pa_login_password_hint">পাছৱৰ্ড</string>
+  <string name="pa_login_submit_button">চাইন ইন</string>
+  <string name="pa_login_checking_password">একাউণ্ট টেষ্ট কৰি আছে\u2026</string>
+  <string name="pa_login_incorrect_login">লগইন অশুদ্ধ আছিল</string>
+  <string name="pa_pattern_or_fingerprint_header">আনলক কৰিবলৈ পেটাৰ্ণ আঁকিবই লাগিব বা আঙুলিছাপ ব্যৱহাৰ কৰিবই লাগিব</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">অৰিহণা যোগাওঁতাসকল</string>
+  <string name="contributors_cloud_loading_message">অৰিহণা যোগাওঁতাসকলৰ ডাটা লোড কৰি আছে\u2026</string>
+  <string name="contributors_cloud_failed_message">অৰিহণা যোগাওঁতাসকলৰ ডাটা লোড কৰিব নোৱাৰি</string>
+  <string name="contributor_info_menu">অৰিহণা যোগাওঁতাসকলৰ তথ্য</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>নাম:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>উপনাম:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>সম্পন্ন কৰিছে:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">অৰিহণা যোগাওঁতাসকলৰ তথ্য</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>মুঠ অৰিহণা যোগাওঁতা:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>মুঠ সম্পন্ন কৰিছে:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>অন্তিম আপডেট:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ধ্বনি</string>
+  <string name="notification_manager">ন’টিফিকেশ্যনসমূহ</string>
+  <string name="lockscreen_settings">লক স্ক্ৰীণ</string>
+  <string name="category_lights">লাইটসমূহ</string>
+  <string name="category_volume">ভলিউম</string>
+  <string name="category_vibrate">ভাইব্ৰেট</string>
+  <string name="category_misc">সানমিহলি</string>
+  <string name="title_general">সাধাৰণ</string>
+  <string name="advanced">এডভান্সড</string>
+  <string name="link_volume_option_title">ৰিংটোন আৰু অধিসূচনা ভলিউম লিংক কৰক</string>
+  <string name="lcd_density_prompt_message">কিছুমান এপ্পে্‌ নন-ষ্টেণ্ডাৰ্ড DPI ত কাম নকৰিব পাৰে।\n\nই আপোনাৰ ডিভাইচটো পুনৰাৰম্ভ কৰিব।</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ফোন নম্বৰ</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">নকল APN</string>
+  <string name="duplicate_apn_error_message">এই APN ইতিমধ্যে বিদ্যমান।পেৰামিটাৰবোৰ ৰ্আঁতৰাই দিয়ক বা পৰিবৰ্তন কৰক।</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> হ\'ল <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+  <string name="sim_disabled">অক্ষম</string>
+  <string name="sim_missing">হেৰাইছে বা ত্ৰুটিপূৰ্ণ</string>
+  <string name="sim_enabler_need_disable_sim">SIM কাৰ্ড নিষ্ক্ৰিয় কৰা হ\'ব। আপুনি অব্যাহত ৰাখিবলৈ বিচাৰে নেকি?</string>
+  <string name="sim_enabler_will_disable_sim_title">মনোযোগ</string>
+  <string name="sim_enabler_need_switch_data_service">এইখন SIM অক্ষম কৰা হ\'ব আৰু SIM <xliff:g id="slotid">%1$s</xliff:g> খন ডাটা সেৱাৰ বাবে ব্যৱহাৰ কৰা হ\'ব। আপুনি অব্যাহত ৰাখিব বিচাৰে বুলি নিশ্চিতনে?</string>
+  <string name="sim_enabler_airplane_on">এয়াৰপ্লেন মোড অন থাকিলে অপাৰেচনটো সম্পন্ন কৰিবলৈ অক্ষম</string>
+  <string name="sim_enabler_in_call">কল কৰি থাকিলে অপাৰেচনটো সম্পন্ন কৰিবলৈ অক্ষম</string>
+  <string name="sim_enabler_both_inactive">সকলোবোৰ SIM কাৰ্ড অক্ষম কৰিব নোৱাৰি</string>
+  <string name="sim_enabler_enabling">সক্ৰিয়কৰণ\u2026</string>
+  <string name="sim_enabler_disabling">সক্ৰিয়হীন\u2026</string>
+  <string name="sub_activate_success">SIM সক্ৰিয় কৰা হ\'ল।</string>
+  <string name="sub_activate_failed">সক্ৰিয়কৰণ ব্যৰ্থ হ\'ল।</string>
+  <string name="sub_deactivate_success">SIM নিষ্ক্ৰিয় কৰা হ\'ল।</string>
+  <string name="sub_deactivate_failed">নিষ্ক্ৰিয়কৰণ ব্যৰ্থ হ\'ল।</string>
+  <string name="primary_sub_select_title">ডিফ\'ল্ট 3G/LTE সদস্যভুক্তি</string>
+  <string name="select_sim_card">SIM কাৰ্ড বাচনি কৰক</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d স্থিতি</string>
+  <string name="sim_card_lock_settings_title">SIM %d লক ছেটিংছ</string>
+  <string name="sim_card_summary_empty">SIM সন্নবিষ্ট কৰা নাই</string>
+  <string name="sim_mobile_network_settings_category_title">ম\'বাইল নেটৱৰ্ক ছেটিংছ</string>
+  <string name="sim_mobile_network_settings_title">SIM %d ছেটিংছ</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">স্মাৰকবোৰ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ইভেণ্টসমূহ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">নিৰ্বাচিত কলাৰসকল</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">নিৰ্বাচিত বাৰ্তা</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">মূৰ: %1$s W/kg</string>
+  <string name="maximum_body_level">শৰীৰ: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">মডেল: %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">SIM %d ৰিংটোন</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">এপ্প:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">অন্তিমবাৰ ব্যৱহৃত:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">ব্যৱহৃত সময়:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">এইটোৱে আপোনাৰ টেবলেটৰ <b>ইণ্টাৰ্ণেল ষ্টোৰেজ</b>, অন্তৰ্ভুক্ত কৰি  সকলো ডাটা মচি পেলাব:\n\n<li>আপোনাৰ ডিভাইচ একাউণ্ট </li>\n<li>ছিষ্টেম আৰু এপ্প্‌ ডাটা আৰু ছেটিংছ</li>\n<li>ডাউনলোড কৰা এপ্পসমূহ</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">এইটোৱে আপোনাৰ টেবলেটৰ <b>ইণ্টাৰ্ণেল ষ্টোৰেজ</b>, অন্তৰ্ভুক্ত কৰি  সকলো ডাটা মচি পেলাব:\n\n<li>আপোনাৰ ডিভাইচ একাউণ্ট</li>\n<li>ছিষ্টেম আৰু এপ্প্‌ ডাটা আৰু ছেটিংছ</li>\n<li>ডাউনলোড কৰা এপ্পসমূহ</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">ব্যক্তিগত ডাটা আৰু এপ্প্</string>
+  <string name="factory_reset_instructions_summary">ই আপোনাৰ এই ডিভাইচৰ সকলোবোৰ একাউণ্ট, এপ্প্, এপ্প্ ডাটা আৰু ছিষ্টেম ছেটিংছ মচিব</string>
+  <string name="factory_reset_personal_content">ব্যক্তিগত সামগ্ৰী</string>
+  <string name="factory_reset_erase_stored_content">সংৰক্ষণ কৰা সামগ্ৰী</string>
+  <string name="factory_reset_erase_stored_content_summary">এই ডিভাইচত ষ্টোৰ কৰা সংগীত, ফটো, ভিডিঅ\' আৰু অন্যান্য মুচক</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">এই ডিভাইচত ষ্টোৰ কৰা সংগীত, ফটো, ভিডিঅ\' আৰু অন্যান্য মুচক। \n\n<b>ডিভাইচ এনক্ৰিপশ্যনৰ বাবে সামগ্ৰী সংৰক্ষণ কৰিব নোৱাৰি</b></string>
+  <string name="factory_reset_erase_sd_card">SD কাৰ্ড ফৰমেট কৰক</string>
+  <string name="factory_reset_erase_sd_card_summary">সংগীত আৰু ফটোবোৰসহ SD কাৰ্ডৰ সকলোবোৰ ডাটা মচি পেলাওক</string>
+  <string name="factory_reset_warning_text_reset_now">এতিয়া ৰিছেট কৰক</string>
+  <string name="factory_reset_warning_text_message">এই ডিভাইচৰ পৰা আপোনাৰ সকলো একাউণ্ট, এপ্প, এপ্প ডাটা আৰু ছিষ্টেম ছেটিং আঁতৰোৱা হ\'ব। এইটো ওলোটাব নোৱাৰি।</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">অন্যান্য</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi হটস্পট টাইমআউট</string>
+  <string name="hotstpot_inactivity_timeout_never">কেতিয়াও নকৰিব</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 মিনিট</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 মিনিট</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 মিনিট</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">প’ৰ্টেবল ৱাই\u2011ফাই হটস্পট কেতিয়াও টাইমআউট নহয়</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">প’ৰ্টেবল ৱাই\u2011ফাই হটস্পট <xliff:g id="timeout">%1$s</xliff:g> পিছত টাইমআউট হ\'ব</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">লাইভ লক স্ক্ৰীণ</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">লাইভ লক স্ক্ৰীণবোৰ সক্ৰিয় আৰু কনফিগাৰ কৰক</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">ছেটিংছ</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">উপলব্ধ লাইভ লক স্ক্ৰীণ চাবলৈ, লাইভ লক স্ক্ৰীণ অন কৰক।</string>
+  <string name="interruptions_ignore_while_media_title">অডিঅ\' ডাকিং ৰোধ কৰক</string>
+  <string name="interruptions_ignore_while_media_summary">অধিসূচনা আহিলে মিডিয়াৰ প্লেবেক ভলিউম হ্ৰাস নকৰিব</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">CyanogenMod আইনী</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">পৰিসংখ্যা ৰিছেট কৰক</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">বেটাৰী ইতিহাস পৰিসংখ্যা ৰিছেট কৰা হ\'ব</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ডক বেটাৰী উপলব্ধ নহয়</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ডক AC ত চাৰ্জিং কৰি আছে</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">ডক USB ত চাৰ্জিং কৰি আছে</string>
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 09177d6..81da5e9 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -756,4 +756,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="interruptions_ignore_while_media_summary">Nun amenorga\'l volume de reproducción cuando aporten avisos</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Llicencia CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 29d4adf..45bf44d 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -2048,6 +2048,7 @@
   <string name="call_settings_title">Axustes de llamaes</string>
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
   <string name="call_settings_summary">Configurar buzón, llamada n\'espera, esvíu ya identificador</string>
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
   <string name="tether_settings_title_usb">Anclaxe de USB</string>
@@ -2392,6 +2393,7 @@
   <string name="ask_compatibility">Entrugar al aniciar</string>
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <string name="enable_compatibility">Aplicación d\'escala</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <string name="unknown">Desconocíu</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
@@ -2563,6 +2565,7 @@
   <string name="memory">RAM</string>
   <!-- Text to label a process entry with the process name. -->
   <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">Usuariu: <xliff:g id="USER_NAME">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
@@ -3324,6 +3327,7 @@
   <string name="menu_stats_total">Total de consumu</string>
   <!-- Menu label for refreshing with latest usage numbers -->
   <string name="menu_stats_refresh">Anovar</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <string name="process_kernel_label">Android OS</string>
   <!-- Label for mediaserver process in battery usage -->
@@ -4183,8 +4187,10 @@
   <string name="data_usage_sweep_warning"><font size="21"><xliff:g id="NUMBER">^1</xliff:g></font> <font size="9"><xliff:g id="UNIT">^2</xliff:g></font>\n<font size="12">avisu</font></string>
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
   <string name="data_usage_sweep_limit"><font size="21"><xliff:g id="NUMBER">^1</xliff:g></font> <font size="9"><xliff:g id="UNIT">^2</xliff:g></font>\n<font size="12">llende</font></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps">Aplicaciones desaniciaes</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps_users">Usuarios y aplicaciones desaniciaos</string>
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
@@ -4419,6 +4425,7 @@
   <string name="user_delete_user_description">Desaniciar usuariu</string>
   <!-- Delete button text [CHAR LIMIT=25] -->
   <string name="user_delete_button">Desaniciar</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <string name="user_guest">Convidáu</string>
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
@@ -4917,6 +4924,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <string name="managed_user_title">Perfil de trabayu</string>
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
@@ -5197,4 +5205,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 7fff13c..478267d 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -689,4 +689,9 @@
   <string name="live_lock_screen_settings_button">Tənzimləmələr</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index cd7d2a8..5e7563f 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -968,4 +968,14 @@
   <string name="interruptions_ignore_while_media_summary">Не змяншаць гучнасць прайгравання мультымедыя пры атрыманні паведамленняў</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Палітыка прыватнасці CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Скід статыстыкі</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Гісторыя выкарыстання батарэі будзе выдалена</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Батарэя дак-станцыі адсутнічае</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Зарадка ад адаптара дак-станцыі</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Зарадка праз USB дак-станцыю</string>
 </resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 9fadba4..cc237fa 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -1206,6 +1206,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1408,6 +1409,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1505,6 +1507,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1918,6 +1921,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2409,7 +2413,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2537,6 +2543,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2852,6 +2859,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3092,4 +3100,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index bde526d..ac6123c 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -116,7 +116,7 @@
   <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
   <string name="profile_volumeoverrides_title">Сила на звука</string>
-  <string name="connection_state_enabled">Звук при зареждане</string>
+  <string name="connection_state_enabled">Активирай</string>
   <string name="volume_override_summary">Задаване на %1$s/%2$s</string>
   <string name="profile_volume_override_checkbox_label">Отмяна силата на звука</string>
   <!-- Menu item for managing profiles -->
@@ -218,7 +218,7 @@
   <string name="navigation_bar_arrow_keys_summary">Показване на ляв и десен курсорен бутони при въвеждане. Замества IME превключвател.</string>
   <string name="navigation_bar_recents_title">Последни дълги натискания действие</string>
   <!-- Notification light dialogs -->
-  <string name="edit_light_settings">Редактиране на настройките на светлините индикации</string>
+  <string name="edit_light_settings">Редактиране на настройките на светлинните индикации</string>
   <string name="pulse_speed_title">Пулсиране продължителност и скорост</string>
   <string name="default_time">Нормално</string>
   <string name="custom_time">По избор</string>
@@ -259,7 +259,7 @@
   <string name="notification_light_automagic">Автоматичен избор на цвятове</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Настройки на светлината</string>
-  <string name="led_notification_text">Светлините индикации са разрешени от настройките</string>
+  <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Режим за отстраняване на грешки</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,7 +517,7 @@
   <string name="disable_navkeys_summary">Разреши екранна навигационна лента и забрани хардуерните бутони</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Двукратно почукване за заспиване</string>
-  <string name="double_tap_to_sleep_summary">Двукратно почукване върху лентата на състоянието за изключване на дисплея</string>
+  <string name="double_tap_to_sleep_summary">Двукратно почукване върху лентата на състоянието изключва на дисплея</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Предотвратяване на случайно събуждане</string>
   <string name="proximity_wake_summary">Проверява сензора за близост преди включване на екрана</string>
@@ -668,7 +668,7 @@
          [CHAR LIMIT=40] -->
   <string name="power_notifications_category_title">Звуци при зареждане</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
-  <string name="power_notifications_enable_title">Звук при зареждане</string>
+  <string name="power_notifications_enable_title">Активирай</string>
   <string name="power_notifications_enable_summary">Възпроизвежда звук, когато включвате или изключвате източник на захранване</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
   <string name="power_notifications_vibrate_title">Вибрация</string>
@@ -786,7 +786,7 @@
   <string name="kill_app_longpress_back_summary">Спиране на приложение на преден план с дълго натискане на бутон Назад</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">Лентата за търсене в Меню последни</string>
-  <string name="keywords_recents_show_searchbar">последен последни забрани разреши показване скриване търсене бар търсене</string>
+  <string name="keywords_recents_show_searchbar">последен последни забрани разреши показване скриване лента за търсене</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">Гласово събуждане</string>
   <string name="voice_wakeup_retrain_title">Тренирай гласа си</string>
@@ -827,7 +827,7 @@
   <!-- Sms security limit -->
   <string name="app_security_title">Безопасност в приложенията</string>
   <string name="sms_security_check_limit_title">Лимит на SMS съобщения</string>
-  <string name="sms_security_check_limit_summary">Приложенията могат да изпращат до %d съобщения за 30 минути преди да поискат потвърждение</string>
+  <string name="sms_security_check_limit_summary">Приложенията могат да изпращат до %d съобщения за 1 минута преди да поискат потвърждение</string>
   <string name="sms_security_check_limit_summary_none">Приложенията не могат да изпращат съобщения, без потвърждение</string>
   <string name="sms_security_check_limit_none">Без</string>
   <!-- Notification spamfilter -->
@@ -841,7 +841,7 @@
   <string name="anonymous_statistics_title">CyanogenMod статистики</string>
   <string name="anonymous_statistics_summary">Помогнете да направим CyanogenMod по-добър, като разрешите да събира анонимни статистически данни</string>
   <string name="anonymous_statistics_warning_title">Информация</string>
-  <string name="anonymous_statistics_warning">Ще позволи в CyanogenMod отчети с не лична информация да се подават на разработчиците на CyanogenMod, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
+  <string name="anonymous_statistics_warning">Ще позволи на CyanogenMod Statistics да изпраща не лична информация  на разработчиците от CyanogenMod, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
   <string name="enable_reporting_title">Разреши отчитане</string>
   <string name="preview_data_title">Визуализиране на данните</string>
   <string name="view_stats_title">Преглед на статистиките</string>
@@ -886,7 +886,7 @@
   <string name="category_sounds">Звуци</string>
   <string name="notification_manager">Известия</string>
   <string name="lockscreen_settings">Заключен екран</string>
-  <string name="category_lights">Светлини индикации</string>
+  <string name="category_lights">Светлинни индикации</string>
   <string name="category_volume">Сила на звука</string>
   <string name="category_vibrate">Вибрация</string>
   <string name="category_misc">Разни</string>
@@ -938,7 +938,7 @@
   <!-- IC Codes -->
   <string name="ic_code_model">Модел: %1$s</string>
   <string name="ic_code_full">IC: %1$s</string>
-  <string name="sim_ringtone_title">Стандартна мелодия СИМ-карта %d</string>
+  <string name="sim_ringtone_title">Мелодия при повикване СИМ карта %d</string>
   <!-- label for application name -->
   <string name="app_name_label_cm">Приложение:</string>
   <!-- label for last time used -->
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Не намалявай силата на звука, когато пристига известие</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod правни</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Нулиране на статистиката</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">История на статистиката на батерията се ще се нулира</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Док за зареждане батерията не е наличен</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Зареждане от док AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Зареждане от USB</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 214fb8c..93b20f0 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -553,4 +553,9 @@
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
   <string name="cmlicense_title">সায়ানোজেনমড বৈধতা</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-br-rFR/strings.xml b/res/values-br-rFR/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-br-rFR/strings.xml
+++ b/res/values-br-rFR/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 651d682..b58cf82 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">No redueixis el volum de reproducció multimèdia quan arribi una notificació</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Llicència CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Reinicia estadístiques</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">L\'historial d\'estadístiques de la bateria serà reiniciat</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Bateria no trobada a l\'acoblament</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">S\'està carregant en l\'acoblament CA</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">S\'està carregant sobre l\'acoblament USB</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index cfc0ce5..ba3ed50 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -210,7 +210,7 @@
   <string name="navigation_bar_left_title">Režim ovládání levou rukou</string>
   <string name="navigation_bar_left_summary">Při natočení na šířku umístit navigační lištu na levé straně obrazovky</string>
   <string name="navigation_bar_title">Tlačítka a rozmístění</string>
-  <string name="navigation_bar_help_text">Chcete-li začít, dotykem ikony můžete upravovat navigační panel.\n\nDotykem na ikonu můžete změnit odpovídající zkratku, nebo dlouhým podržením změnit rozvržení ikon.\n\nŤukněte na \"Uložit\" pro uložení vašich změn a na \"Obnovit\" pro obnovení výchozích nastavení.</string>
+  <string name="navigation_bar_help_text">Dotykem na ikonu „Upravit“ odemknete navigační lištu.\n\nDotykem na ikonu můžete změnit odpovídající zkratku, nebo dlouhým podržením změnit rozvržení ikon.\n\nDotykem na „Uložit“ provede uložení rozvržení a dotykem na „Obnovit výchozí“ dojde k obnovení výchozího nastavení ikon.</string>
   <string name="navigation_restore_button_text">Obnovit\nvýchozí</string>
   <string name="navigation_edit_button_text">Upravit</string>
   <string name="navigation_save_button_text">Uložit</string>
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Nesnižovat hlasitost přehrávané hudby při oznámení</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Právní ujednání CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Resetovat statistiky</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Bude vynulována historie statistiky baterie</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Baterie doku není k dispozici</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Nabíjení pomocí napájení doku</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-cy/strings.xml b/res/values-cy/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 9f97aaa..38e50d1 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -254,6 +254,8 @@
   <string name="notification_light_use_multiple_leds">Flere LED\'er</string>
   <string name="keywords_lights_brightness_level">dæmp led lysstyrke</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Lysindstillinger</string>
+  <string name="led_notification_text">LED-lys aktiveret via indstillinger</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-fejlfinding</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -285,6 +287,8 @@
   <string name="app_ops_summaries_modify_call_log">ændre opkaldslog</string>
   <string name="app_ops_summaries_read_calendar">læs kalender</string>
   <string name="app_ops_summaries_modify_calendar">ændre kalender</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi skanning</string>
+  <string name="app_ops_summaries_notification">underretning</string>
   <string name="app_ops_summaries_cell_scan">scan mobil</string>
   <string name="app_ops_summaries_call_phone">opkald til telefon</string>
   <string name="app_ops_summaries_read_sms">læs SMS</string>
@@ -312,15 +316,29 @@
   <string name="app_ops_summaries_media_volume">lydstyrke for medier</string>
   <string name="app_ops_summaries_alarm_volume">lydstyrke for alarm</string>
   <string name="app_ops_summaries_notification_volume">lydstyrke for underretninger</string>
+  <string name="app_ops_summaries_bluetooth_volume">lydstyrke for bluetooth</string>
   <string name="app_ops_summaries_keep_awake">hold vågen</string>
   <string name="app_ops_summaries_monitor_location">overvåg placering</string>
   <string name="app_ops_summaries_monitor_high_power_location">overvåg placering højt strømforbrug</string>
+  <string name="app_ops_summaries_get_usage_stats">få brugsstatistik</string>
   <string name="app_ops_summaries_mute_unmute_microphone">Mikrofon til/fra</string>
   <string name="app_ops_summaries_toast_window">Vis toastbeskeder</string>
   <string name="app_ops_summaries_project_media">projekt medie</string>
   <string name="app_ops_summaries_activate_vpn">aktiver VPN</string>
+  <string name="app_ops_summaries_make_call">foretag opkald</string>
+  <string name="app_ops_summaries_use_fingerprint">brug fingeraftryk</string>
+  <string name="app_ops_summaries_use_body_sensors">brug krops sensor</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">læs celle beskeder</string>
+  <string name="app_ops_summaries_mock_location">immitér placering</string>
+  <string name="app_ops_summaries_read_external_storage">læs eksternt lager</string>
+  <string name="app_ops_summaries_write_external_storage">skriv til eksternt lager</string>
+  <string name="app_ops_summaries_turn_screen_on">tænd skærmen</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi til/fra</string>
+  <string name="app_ops_summaries_toggle_bluetooth">bluetooth til/fra</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC til/fra</string>
   <string name="app_ops_summaries_superuser">root-adgang</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Grov placering</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrér</string>
   <string name="app_ops_labels_read_contacts">Læs kontaktpersoner</string>
@@ -819,15 +837,25 @@
   <string name="sim_enabler_airplane_on">Kan ikke udføre operationen, mens flytilstand er slået til.</string>
   <string name="sim_enabler_in_call">Kan ikke udføre handlingen under igangværende opkald.</string>
   <string name="sim_enabler_both_inactive">Kan ikke deaktivere alle SIM-kort</string>
+  <string name="sim_enabler_enabling">Aktiverer\u2026</string>
+  <string name="sim_enabler_disabling">Deaktiverer\u2026</string>
+  <string name="sub_activate_success">SIM-kort aktiveret.</string>
+  <string name="sub_activate_failed">Aktivering mislykkedes.</string>
+  <string name="sub_deactivate_success">SIM-kort deaktiveret.</string>
+  <string name="sub_deactivate_failed">Deaktivering mislykkedes.</string>
   <string name="primary_sub_select_title">Standard 3G/LTE abonnement</string>
+  <string name="select_sim_card">Vælg SIM-kort</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">SIM %d status</string>
   <string name="sim_card_lock_settings_title">SIM %d låseindstillinger</string>
   <string name="sim_card_summary_empty">SIM ikke indsat</string>
+  <string name="sim_mobile_network_settings_category_title">Indstillinger for mobilt netværk</string>
   <string name="sim_mobile_network_settings_title">SIM %d indstillinger</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">påmindelser</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">begivenheder</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -839,6 +867,7 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">SIM-kort %d ringetone</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">App:</string>
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -869,4 +898,14 @@
   <string name="interruptions_ignore_while_media_summary">Reducér ikke lydstyrken, når en meddelelse modtages</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Juridisk information for CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Nulstil statistikker</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Batterihistoriestatistik vil blive nulstillet</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dockbatteri findes ikke</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Oplader på dock AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Oplader via dock USB</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index b9afb83..2b2f443 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Medienlautstärke beim Eintreffen einer Benachrichtigung nicht reduzieren</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Rechtliche Hinweise zu CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Statistik zurücksetzen</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistik zum Akkuverlauf wird zurückgesetzt.</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dock-Akku nicht vorhanden</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Laden über Ladedock</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Laden über USB-Dock</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 2d64587..7d50dde 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -161,6 +161,7 @@
   <string name="toggleData">Σύνδεση δεδομένων</string>
   <string name="toggleSync">Αυτόματος συγχρονισμός</string>
   <string name="toggle2g3g4g">Προτιμώμενη λειτουργία δικτύου</string>
+  <string name="toggle2g3g4g_msim">Προτιμώμενη λειτουργία δικτύου (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Κωδικός περιοχής Wi-Fi</string>
@@ -983,4 +984,14 @@
   <string name="interruptions_ignore_while_media_summary">Να μη μειώνεται η ένταση της αναπαραγωγής πολυμέσων όταν φτάνει μια ειδοποίηση</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Νομικές πληροφορίες CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Επαναφορά στατιστικών</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Θα γίνει επαναφορά των στατιστικών μπαταρίας</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Δεν υπάρχει μπαταρία dock</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Φόρτιση με AC βάσης σύνδεσης</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Φόρτιση μέσω USB βάσης σύνδεσης</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index bff3458..d45c2a6 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -760,4 +760,9 @@
   <string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod legal</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index d0fcfdb..a999648 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -887,4 +887,14 @@
   <string name="interruptions_ignore_while_media_summary">Do not reduce media playback volume when a notification arrives</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod legal</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Reset stats</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Battery history stats are going to be reset</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dock battery not present</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Charging on dock AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-en-rPT/strings.xml b/res/values-en-rPT/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-en-rPT/strings.xml
+++ b/res/values-en-rPT/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 51e6f95..86685f9 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -827,4 +827,9 @@
   <string name="interruptions_ignore_while_media_summary">Ne mallaŭtigi aŭdvidan sonon, kiam atentigo alvenas</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Laŭleĝa informo pri CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 5fd19c8..d5d0f10 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -27,6 +27,7 @@
   <!-- About phone screen, Device model -->
   <!-- About phone screen, Device name -->
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">Nivel de API de CyanogenMod</string>
   <!-- About phone screen, build date -->
   <!-- CM Updater -->
   <!-- Settings switch for updating Cyanogen recovery -->
@@ -38,6 +39,7 @@
   <!-- Add Profile -->
   <!-- Rename Dialog  -->
   <!-- Reset Profiles -->
+  <string name="profile_reset_message">¿Eliminar todos los perfiles y grupos de aplicaciones creados por el usuario y restaurarlos a los valores por defecto?</string>
   <!-- Delete confimation messages -->
   <!-- Profile network mode -->
   <!-- Profile Config screen PreferenceGroup titles -->
@@ -59,7 +61,11 @@
   <!-- Values for the notification light pulse spinners -->
   <!-- Battery light settings -->
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_zen_mode">Luces en el modo no molestar</string>
+  <string name="notification_light_automagic">Elegir colores automáticamente</string>
   <!-- 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>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
   <!-- Android debugging over WiFi -->
@@ -67,7 +73,64 @@
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_wifi_scan">Escaneo de conexiones Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notificación/toast</string>
+  <string name="app_ops_summaries_bluetooth_volume">volumen de bluetooth</string>
+  <string name="app_ops_summaries_get_usage_stats">obtener estadísticas de uso</string>
+  <string name="app_ops_summaries_write_wallpaper">editar fondo de pantalla</string>
+  <string name="app_ops_summaries_assist_structure">ayudar a la estructura</string>
+  <string name="app_ops_summaries_assist_screenshot">ayudar a la captura de pantalla</string>
+  <string name="app_ops_summaries_read_phone_state">leer estado del teléfono</string>
+  <string name="app_ops_summaries_add_voicemail">agregar al buzón de voz</string>
+  <string name="app_ops_summaries_use_sip">usar SIP</string>
+  <string name="app_ops_summaries_make_call">hacer llamada</string>
+  <string name="app_ops_summaries_use_fingerprint">usar huella digital</string>
+  <string name="app_ops_summaries_use_body_sensors">utilizar sensores corporales</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">leer transmisiones celulares</string>
+  <string name="app_ops_summaries_mock_location">ubicación falsa</string>
+  <string name="app_ops_summaries_read_external_storage">leer en almacenamiento externo</string>
+  <string name="app_ops_summaries_write_external_storage">escribir en almacenamiento externo</string>
+  <string name="app_ops_summaries_turn_screen_on">encender pantalla</string>
+  <string name="app_ops_summaries_get_accounts">obtener cuentas</string>
+  <string name="app_ops_summaries_toggle_wifi">conmutar Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">conmutar Bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">iniciar en el arranque</string>
+  <string name="app_ops_summaries_toggle_nfc">conmutar NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">conmutar los datos móviles</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Ubicación aproximada</string>
+  <string name="app_ops_labels_fine_location">Ubicación precisa</string>
+  <string name="app_ops_labels_wifi_scan">Escaneo de conexiones Wi-Fi</string>
+  <string name="app_ops_labels_cell_scan">Escaneo celular</string>
+  <string name="app_ops_labels_read_sms">Leer SMS</string>
+  <string name="app_ops_labels_write_sms">Escribir SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Recibir SMS de emergencia</string>
+  <string name="app_ops_labels_receive_wap_push">Recibir mensajes WAP</string>
+  <string name="app_ops_labels_read_icc_sms">Leer tus mensajes ICC</string>
+  <string name="app_ops_labels_write_icc_sms">Editar tus mensajes ICC</string>
+  <string name="app_ops_labels_monitor_location">Consultar ubicación aproximada</string>
+  <string name="app_ops_labels_monitor_high_power_location">Consultar ubicación precisa</string>
+  <string name="app_ops_labels_get_usage_stats">Obtener estadísticas de uso</string>
+  <string name="app_ops_labels_write_wallpaper">Editar fondo de pantalla</string>
+  <string name="app_ops_labels_assist_structure">Ayudar a la estructura</string>
+  <string name="app_ops_labels_assist_screenshot">Ayudar a la captura de pantalla</string>
+  <string name="app_ops_labels_read_phone_state">Leer estado del teléfono</string>
+  <string name="app_ops_labels_add_voicemail">Agregar al buzón de voz</string>
+  <string name="app_ops_labels_use_sip">Usar SIP</string>
+  <string name="app_ops_labels_make_call">Hacer llamada</string>
+  <string name="app_ops_labels_use_fingerprint">Usar huella digital</string>
+  <string name="app_ops_labels_use_body_sensors">Utilizar sensores corporales</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Leer transmisiones celulares</string>
+  <string name="app_ops_labels_mock_location">Ubicación falsa</string>
+  <string name="app_ops_labels_read_external_storage">Leer en almacenamiento externo</string>
+  <string name="app_ops_labels_write_external_storage">Escribir en almacenamiento externo</string>
+  <string name="app_ops_labels_turn_screen_on">Encender pantalla</string>
+  <string name="app_ops_labels_get_accounts">Obtener cuentas</string>
+  <string name="app_ops_labels_toggle_wifi">Conmutar Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Conmutar Bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Iniciar en el arranque</string>
+  <string name="app_ops_labels_toggle_nfc">Conmutar NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Conmutar datos móviles</string>
   <!-- App ops permissions -->
   <!-- App ops detail -->
   <!-- App ops menu options -->
@@ -95,6 +158,11 @@
   <!-- Display : Rotation  -->
   <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <string name="live_display_color_profile_cinema_summary">Reproducción perfecta de color para video</string>
+  <string name="live_display_color_profile_photography_title">Fotografía</string>
+  <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
+  <string name="live_display_color_profile_basic_title">Básico</string>
+  <string name="live_display_color_profile_basic_summary">Utilizar pantalla sin calibrar</string>
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
@@ -114,10 +182,14 @@
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
   <!-- Sound settings, charging sounds label for ringtone == none -->
   <!-- Status bar -->
+  <string name="status_bar_quick_qs_pulldown_summary_left">Izquierdo</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Derecho</string>
   <!-- Status bar - Clock -->
   <!-- Status bar - Battery -->
   <!-- Status bar - Battery percentage -->
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Iconos de la barra de estado</string>
+  <string name="status_bar_icons_summary">Controlar qué iconos aparecen en la barra de estado</string>
   <!-- EdgeGesture service -->
   <!-- Keep screen on strings -->
   <!-- Privacy Settings Header item -->
@@ -130,15 +202,20 @@
   <!-- Whether the keyguard will directly pass to PIN entry -->
   <!-- lock screen visualizer -->
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Desactivado por el ajuste rápido de controles</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Pulse para activar la pantalla de bloqueo</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Pantalla de bloqueo activada!</string>
   <!-- Battery saver -->
   <!-- Battery : Automatic performance profiles -->
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplicaciones iniciadas en el arranque</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <!-- Advanced reboot options -->
   <!-- Expanded desktop -->
   <!-- Kill app long-press back -->
   <!-- Show/Hide Search Bar -->
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_needs_dial_permission_warning">La activación por voz debe tener permisos de llamada para seleccionar un contacto directo.</string>
   <!-- Blacklist preferences -->
   <!-- Blacklist management -->
   <!-- Sms security limit -->
@@ -148,30 +225,74 @@
   <!-- Anonymous Statistics - Preview -->
   <!-- Protected apps lockpattern reset button -->
   <!-- Protected Apps -->
+  <string name="protected_apps_summary">Administrar aplicaciones que se ocultan detrás de un bloqueo seguro</string>
+  <string name="pa_pattern_or_fingerprint_header">Debe dibujar el patrón o utilizar huellas digitales para desbloquear</string>
   <!-- Contributors cloud activity -->
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Nombre:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Apodo:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Contribuciones:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="lcd_density_prompt_message">Algunas aplicaciones pueden no funcionar con un DPI no estándar.\n\nEsto reiniciará tu teléfono.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Número de teléfono de APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN Duplicado</string>
+  <string name="duplicate_apn_error_message">Ya existe esta APN. Desecha o cambia los parámetros.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> es <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
+  <string name="sim_enabler_need_disable_sim">La tarjeta SIM se desactivará. ¿Quieres continuar?</string>
+  <string name="sim_enabler_will_disable_sim_title">Atención</string>
+  <string name="sim_enabler_need_switch_data_service">Se desactivará esta SIM y la SIM <xliff:g id="slotid">%1$s</xliff:g> se utilizará para servicios de datos. ¿Estás seguro que deseas continuar?</string>
+  <string name="sim_enabler_enabling">Activando\u2026</string>
+  <string name="sim_enabler_disabling">Desactivando\u2026</string>
+  <string name="sub_activate_success">SIM activada.</string>
+  <string name="sub_activate_failed">Error de activación.</string>
+  <string name="sub_deactivate_success">SIM desactivada.</string>
+  <string name="sub_deactivate_failed">Error de desactivación.</string>
+  <string name="select_sim_card">Seleccionar tarjeta SIM</string>
   <!-- MSIM SIM status -->
+  <string name="sim_mobile_network_settings_category_title">Configuración de red móvil</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">recordatorios</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">llamadores seleccionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Última vez utilizada:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Tiempo de uso:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- Factory reset strings -->
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Otros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tiempo de espera del punto de acceso Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minuto</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">El punto de acceso portable Wi\u2011Fi no se apagará nunca</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">El punto de acceso portable Wi\u2011Fi se apagará después de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Pantalla de bloqueo animada</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Activa y configura pantallas de bloqueo animadas</string>
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Para ver las pantallas de bloqueo animadas disponibles, activa las pantallas de bloqueo animadas.</string>
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-es-rMX/strings.xml b/res/values-es-rMX/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-es-rMX/strings.xml
+++ b/res/values-es-rMX/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-es-rUS/cm_plurals.xml b/res/values-es-rUS/cm_plurals.xml
new file mode 100644
index 0000000..72b4c0d
--- /dev/null
+++ b/res/values-es-rUS/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> segundo</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> segundos</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">una vez</item>
+    <item quantity="other">%d veces</item>
+  </plurals>
+</resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 37c084c..034e837 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -26,6 +26,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already_cm">No es necesario. Las configuraciones de desarrollo ya están habilitadas.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">Herramientas de desarrollo</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Acceso directo de desarrollador</string>
   <string name="development_shortcut_summary">Activar los accesos directos de administración de la aplicación en la lista de aplicaciones recientes</string>
@@ -34,51 +35,168 @@
   <string name="root_access_warning_title">¿Permitir acceso root?</string>
   <string name="root_access_warning_message">¡Permitir que las aplicaciones tengan acceso root es muy peligroso y puede comprometer la seguridad del dispositivo!</string>
   <string name="root_access_none">Deshabilitado</string>
+  <string name="root_access_apps">Solo aplicaciones</string>
+  <string name="root_access_adb">Solo ADB</string>
+  <string name="root_access_all">Aplicaciones y ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">Versión de CyanogenMod</string>
+  <string name="mod_version_default">Desconocido</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">Modelo de dispositivo</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">Nombre del dispositivo</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">Nivel de API de CyanogenMod</string>
+  <string name="mod_api_level_default">Desconocido</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">Fecha de compilación</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">Actualizaciones de CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Actualizar recovery de CyanogenMod</string>
+  <string name="update_recovery_summary">Actualizar recovery con las actualizaciones del sistema</string>
   <string name="update_recovery_on_warning">AVISO: Con esta característica activada, la recuperación instalada se reemplazará por la incluida en la versión actual del sistema.\n\nLa recuperación se actualizará junto con algunas mejoras en el sistema, lo que garantiza la compatibilidad con versiones futuras.\n\n¿Quieres activar esta característica?</string>
   <string name="update_recovery_off_warning">ADVERTENCIA: Con esta característica desactivada, la recuperación instalada no se actualizará con las actualizaciones del sistema.\n\nQuizás no sea posible instalar versiones futuras del sistema con una recuperación no actualizada o no compatible.\n\n¿Quieres desactivar esta característica?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">Temas</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">Modo de sonido</string>
+  <string name="ring_mode_normal">Normal</string>
+  <string name="ring_mode_vibrate">Vibrar</string>
+  <string name="ring_mode_mute">Silencio</string>
+  <string name="settings_reset_button">Restablecer</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">Perfiles del sistema</string>
+  <string name="profiles_add">Añadir</string>
+  <string name="profile_menu_delete">Eliminar</string>
+  <string name="profile_settings_title">Perfil</string>
+  <string name="profile_empty_list_profiles_off">Para configurar y usar los perfiles del sistema, actívalos previamente.</string>
+  <string name="profile_trigger_configure">Configurar el disparador</string>
   <string name="profile_write_nfc_tag">Escribir en etiqueta NFC</string>
+  <string name="profile_write_touch_tag">Tocar etiqueta para escribir</string>
+  <string name="profile_write_success">Etiqueta escrita correctamente</string>
   <string name="profile_write_failed">¡Error al escribir la etiqueta!</string>
+  <string name="profile_selected">Perfil seleccionado: %1$s</string>
   <string name="profile_nfc_text">Escribir un perfil en una etiqueta NFC permite pulsar la etiqueta para seleccionar el perfil. Pulsar una segunda vez seleccionará el perfil elegido previamente.</string>
+  <string name="profile_unknown_nfc_tag">Perfil desconocido</string>
+  <string name="profile_add_nfc_text">Esta etiqueta NFC hace referencia a un perfil desconocido. Añadir esta etiqueta NFC a un perfil existente permitirá seleccionar el perfil en el futuro.</string>
+  <string name="profile_select">Seleccionar perfil</string>
+  <string name="profile_remove_dialog_message">¿Eliminar perfil %1$s?</string>
+  <string name="profile_populate_profile_from_state">¿Configurar el perfil usando la configuración actual del dispositivo?</string>
+  <string name="profile_menu_fill_from_state">Importar la configuración actual del dispositivo</string>
+  <string name="profile_remove_current_profile">¡No se puede eliminar el perfil actual!</string>
+  <string name="profile_app_group_category_title">Anulaciones de notificación</string>
+  <string name="profile_app_group_item_instructions">Añadir o quitar grupos</string>
+  <string name="profile_app_group_item_instructions_summary">Añadir o eliminar grupos de aplicaciones para anulación de notificación a este perfil</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">Activada</string>
+  <string name="profile_entries_off">Desactivada</string>
+  <string name="profile_entries_no_override">No sobrescribir</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">Nombre</string>
+  <string name="new_profile_name">&lt;nuevo perfil&gt;</string>
   <!-- Rename Dialog  -->
   <string name="rename_dialog_title">Cambiar nombre</string>
+  <string name="rename_dialog_message">Introducir un nuevo nombre</string>
+  <string name="duplicate_appgroup_name">¡Nombre de grupo de aplicación duplicado!</string>
   <string name="rename_dialog_hint">Introducir el nombre del perfil</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">Restablecer</string>
   <string name="profile_reset_message">¿Eliminar todos los perfiles y grupos de aplicaciones creados por el usuario y restaurarlos a los valores predeterminados?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">¿Quitar esta aplicación?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">Volumen</string>
+  <string name="connection_state_enabled">Habilitar</string>
+  <string name="volume_override_summary">Establecer a %1$s/%2$s</string>
+  <string name="profile_volume_override_checkbox_label">Anular volumen</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">Perfiles</string>
+  <string name="profile_profile_manage">Administrar perfil</string>
+  <string name="profile_appgroups_manage">Grupo de aplicaciones</string>
+  <string name="profile_appgroup_manage">Administrar grupo de aplicaciones</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">Ajustes de perfil</string>
+  <string name="profile_trigger_connect">Al conectar</string>
+  <string name="profile_trigger_disconnect">Al desconectar</string>
+  <string name="profile_trigger_notrigger">Sin evento</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">Modo de notificación</string>
+  <string name="ringer_mode">Modo de sonido</string>
+  <string name="lights_mode">Brillo</string>
+  <string name="vibrate_mode">Vibración</string>
+  <string name="choose_soundtone">Escoger tono de notificación</string>
+  <string name="choose_ringtone">Seleccionar tono</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">Tono de notificación</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupo de aplicaciones</string>
+  <string name="profile_applist_title">Aplicaciones</string>
+  <string name="profile_new_appgroup">Nuevo grupo de aplicaciones</string>
+  <string name="profile_delete_appgroup">¿Eliminar este grupo de aplicaciones?</string>
+  <string name="profile_appgroup_name_prompt">Introducir un nombre para el nuevo grupo de aplicaciones</string>
+  <string name="profile_appgroup_name_title">Nombre</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">Elegir aplicación</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">Configuración del sistema</string>
   <string name="profile_lockmode_title">Modo de pantalla bloqueada</string>
+  <string name="profile_lockmode_policy_disabled_summary">Esta opción ha sido desactivada por una política del administrador del dispositivo</string>
+  <string name="profile_lockmode_insecure_summary">No pedir PIN o contraseña</string>
   <string name="profile_lockmode_disabled_summary">Desactivar pantalla bloqueada</string>
+  <string name="profile_airplanemode_title">Modo avión</string>
+  <string name="profile_brightness_title">Brillo de pantalla</string>
+  <string name="profile_brightness_override_summary">Establecer al %1$d%%</string>
+  <string name="profile_brightness_override_checkbox_label">Modificar brillo</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi\u2011Fi</string>
+  <string name="toggleWifiAp">Punto de acceso Wi\u2011Fi</string>
+  <string name="toggleBluetooth">Bluetooth</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">Conexión de datos</string>
+  <string name="toggleSync">Sincronización automática</string>
+  <string name="toggle2g3g4g">Tipo de red preferido</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Código de región Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Especificar el código de región para Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">Ocurrió un error al establecer el código de región.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">Eliminar</string>
+  <string name="profile_action_none">Dejar sin cambios</string>
   <string name="profile_action_system">Ajustes del sistema predeterminados</string>
+  <string name="profile_action_disable">Apagar</string>
+  <string name="profile_action_enable">Activar</string>
+  <string name="profile_trigger_a2dp_connect">Al conectar A2DP</string>
+  <string name="profile_trigger_a2dp_disconnect">Al desconectar A2DP</string>
+  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
+  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">Eventos que activarán este perfil</string>
+  <string name="profile_setup_setup_triggers_title">Paso 1: Añadir eventos</string>
+  <string name="profile_setup_setup_triggers_title_config">Modificar eventos: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">Paso 2: Configurar acciones</string>
+  <string name="profile_setup_actions_title_config">Reconfigurar acciones</string>
+  <string name="profile_appgroups_manage">Grupo de aplicaciones</string>
+  <string name="profile_appgroup_manage">Administrar grupo de aplicaciones</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupo de aplicaciones</string>
+  <string name="profile_new_appgroup">Nuevo grupo de aplicaciones</string>
+  <string name="profile_delete_appgroup">¿Eliminar este grupo de aplicaciones?</string>
+  <string name="profile_appgroup_name_prompt">Introducir un nombre para el nuevo grupo de aplicaciones</string>
+  <string name="profile_appgroup_name_title">Nombre</string>
+  <string name="duplicate_appgroup_name">¡Nombre de grupo de aplicación duplicado!</string>
   <string name="profile_app_delete_confirm">¿Quitar esta aplicación?</string>
   <string name="no_bluetooth_triggers">No hay dispositivos Bluetooth emparejados. \nPulsar para emparejar el dispositivo Bluetooth antes de configurar los eventos.</string>
   <string name="no_wifi_triggers">No hay puntos de acceso Wi\u2011Fi configurados. \nPulsar para activar la conexión Wi\u2011Fi antes de configurar los eventos.</string>
@@ -87,224 +205,769 @@
   <string name="profile_setup_setup_triggers_description">Seleccionar qué eventos activarán este perfil</string>
   <string name="profile_setup_actions_description">Ahora configurar qué sucederá cuando el perfil esté activado</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">Barra de navegación</string>
+  <string name="navigation_bar_left_title">Modo para zurdos</string>
+  <string name="navigation_bar_left_summary">Colocar la barra de navegación a la izquierda de la pantalla en modo horizontal</string>
+  <string name="navigation_bar_title">Botones y disposición</string>
   <string name="navigation_bar_help_text">Para empezar, pulsa el icono editar para abrir la barra de navegación en modo de edición.\n\nPuedes pulsar el icono para cambiar su acceso directo, o bien mantener pulsado un icono para volver a organizar su disposición.\n\nPulsa sobre \'Guardar\' para guardar los cambios o restaurar para volver a la disposición predeterminada.</string>
   <string name="navigation_restore_button_text">Restaurar\nde forma predeterminada.</string>
+  <string name="navigation_edit_button_text">Editar</string>
+  <string name="navigation_save_button_text">Guardar</string>
   <string name="navigation_bar_reset_message">¿Eliminar la configuración actual y restaurar la disposición predeterminada?</string>
+  <string name="navigation_bar_arrow_keys_title">Mostrar teclas de flechas al escribir</string>
+  <string name="navigation_bar_arrow_keys_summary">Mostrar los cursores izquierda y derecha durante la escritura. Reemplaza al selector IME.</string>
+  <string name="navigation_bar_recents_title">Pulsación prolongada en recientes</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Editar configuraciones de luz</string>
   <string name="pulse_speed_title">Duración y velocidad de la pulsación</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personalizado</string>
+  <string name="dialog_delete_title">Eliminar</string>
+  <string name="dialog_delete_message">¿Eliminar el elemento seleccionado?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">Siempre encendida</string>
+  <string name="pulse_length_very_short">Muy corta</string>
+  <string name="pulse_length_short">Corta</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Larga</string>
+  <string name="pulse_length_very_long">Muy larga</string>
+  <string name="pulse_speed_very_fast">Muy rápida</string>
+  <string name="pulse_speed_fast">Rápida</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lenta</string>
+  <string name="pulse_speed_very_slow">Muy lenta</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">Indicador de batería</string>
+  <string name="battery_low_pulse_title">Parpadear con batería baja</string>
+  <string name="battery_light_list_title">Colores</string>
+  <string name="battery_light_low_color_title">Batería baja</string>
+  <string name="battery_light_medium_color_title">Cargando</string>
+  <string name="battery_light_full_color_title">Cargada</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">Luz de notificación</string>
+  <string name="notification_light_general_title">General</string>
+  <string name="notification_light_applist_title">Aplicaciones</string>
+  <string name="notification_light_phonelist_title">Teléfono</string>
+  <string name="notification_light_use_custom">Usar valores personalizados</string>
   <string name="notification_light_default_value">Predeterminado</string>
+  <string name="notification_light_missed_call_title">Llamada perdida</string>
+  <string name="notification_light_voicemail_title">Correo de voz</string>
+  <string name="notification_light_screen_on">Luces con la pantalla encendida</string>
   <string name="notification_light_zen_mode">Luces en modo no molestar</string>
   <string name="notification_light_use_multiple_leds">Múltiples LED</string>
   <string name="keywords_lights_brightness_level">atenuar el brillo de los led</string>
+  <string name="notification_light_automagic">Elegir colores automáticamente</string>
   <!-- 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>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Depuración en Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">Habilitar la interfaz Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB sobre red</string>
+  <string name="adb_over_network_summary">Activar la depuración TCP/IP sobre las interfaces de red (Wi\u2011Fi, redes USB). Esta configuración se restablece al reiniciar el dispositivo</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">ADVERTENCIA: Cuando ADB sobre red está activado, el dispositivo está abierto para intrusiones en todas las redes conectadas.\n\nUtiliza esta función solamente cuando estés conectado a redes de confianza.\n\n¿Realmente deseas activar esta función?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">Notificación de depuración</string>
+  <string name="adb_notify_summary">Mostrar una notificación cuando esté activada la depuración por USB o red</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">Ubicación</string>
+  <string name="app_ops_categories_personal">Personal</string>
+  <string name="app_ops_categories_messaging">Mensajes</string>
+  <string name="app_ops_categories_media">Multimedia</string>
+  <string name="app_ops_categories_device">Dispositivo</string>
   <string name="app_ops_categories_bootup">Arranque</string>
   <string name="app_ops_categories_su">Acceso root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">ubicación aproximada</string>
+  <string name="app_ops_summaries_fine_location">ubicación precisa</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">vibración</string>
+  <string name="app_ops_summaries_read_contacts">consultar tus contactos</string>
+  <string name="app_ops_summaries_modify_contacts">modificar tus contactos</string>
+  <string name="app_ops_summaries_read_call_log">leer el registro de llamadas</string>
+  <string name="app_ops_summaries_modify_call_log">modificar registro de llamadas</string>
+  <string name="app_ops_summaries_read_calendar">leer el calendario</string>
+  <string name="app_ops_summaries_modify_calendar">modificar el calendario</string>
   <string name="app_ops_summaries_wifi_scan">Exploración de conexiones Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notificación/toast</string>
+  <string name="app_ops_summaries_cell_scan">ver conexiones de red</string>
+  <string name="app_ops_summaries_call_phone">llamar a teléfono</string>
+  <string name="app_ops_summaries_read_sms">leer SMS</string>
+  <string name="app_ops_summaries_write_sms">escribir SMS</string>
+  <string name="app_ops_summaries_receive_sms">recibir SMS</string>
+  <string name="app_ops_summaries_receive_emergency_sms">recibir SMS de emergencia</string>
+  <string name="app_ops_summaries_receive_mms">recibir mensajes MMS</string>
+  <string name="app_ops_summaries_receive_wap_push">recibir mensajes WAP</string>
+  <string name="app_ops_summaries_send_sms">enviar mensajes SMS</string>
   <string name="app_ops_summaries_read_icc_sms">leer mensajes ICC</string>
   <string name="app_ops_summaries_write_icc_sms">editar mensajes ICC</string>
+  <string name="app_ops_summaries_modify_settings">modificar los ajustes del sistema</string>
+  <string name="app_ops_summaries_draw_on_top">mostrar sobre otras aplicaciones</string>
+  <string name="app_ops_summaries_access_notifications">acceder a las notificaciones</string>
+  <string name="app_ops_summaries_camera">cámara</string>
+  <string name="app_ops_summaries_record_audio">grabar audio</string>
+  <string name="app_ops_summaries_play_audio">reproducir el audio</string>
+  <string name="app_ops_summaries_read_clipboard">leer el portapapeles</string>
+  <string name="app_ops_summaries_modify_clipboard">modificar el portapapeles</string>
+  <string name="app_ops_summaries_media_buttons">botones multimedia</string>
+  <string name="app_ops_summaries_audio_focus">enfoque del audio</string>
+  <string name="app_ops_summaries_master_volume">volumen maestro</string>
+  <string name="app_ops_summaries_voice_volume">volumen de voz</string>
+  <string name="app_ops_summaries_ring_volume">volumen de llamada</string>
+  <string name="app_ops_summaries_media_volume">volumen multimedia</string>
+  <string name="app_ops_summaries_alarm_volume">volumen de alarma</string>
+  <string name="app_ops_summaries_notification_volume">volumen de notificación</string>
+  <string name="app_ops_summaries_bluetooth_volume">volumen de bluetooth</string>
+  <string name="app_ops_summaries_keep_awake">mantener encendido</string>
+  <string name="app_ops_summaries_monitor_location">consultar ubicación aproximada</string>
+  <string name="app_ops_summaries_monitor_high_power_location">consultar ubicación precisa</string>
+  <string name="app_ops_summaries_get_usage_stats">obtener estadísticas de uso</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">activar/desactivar el micrófono</string>
+  <string name="app_ops_summaries_toast_window">mostrar notificaciones emergentes</string>
+  <string name="app_ops_summaries_project_media">proyectar medios</string>
+  <string name="app_ops_summaries_activate_vpn">activar VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">editar fondo de pantalla</string>
   <string name="app_ops_summaries_assist_structure">ayudar en la estructura</string>
   <string name="app_ops_summaries_assist_screenshot">ayudar en la captura de pantalla</string>
+  <string name="app_ops_summaries_read_phone_state">leer estado del teléfono</string>
+  <string name="app_ops_summaries_add_voicemail">agregar al buzón de voz</string>
+  <string name="app_ops_summaries_use_sip">usar SIP</string>
+  <string name="app_ops_summaries_make_call">hacer llamada</string>
+  <string name="app_ops_summaries_use_fingerprint">usar huella digital</string>
   <string name="app_ops_summaries_use_body_sensors">usar sensores corporales</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">leer transmisiones celulares</string>
   <string name="app_ops_summaries_mock_location">simular ubicación</string>
+  <string name="app_ops_summaries_read_external_storage">leer en almacenamiento externo</string>
+  <string name="app_ops_summaries_write_external_storage">escribir en almacenamiento externo</string>
+  <string name="app_ops_summaries_turn_screen_on">encender pantalla</string>
+  <string name="app_ops_summaries_get_accounts">obtener cuentas</string>
+  <string name="app_ops_summaries_toggle_wifi">activar/desactivar Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">activar/desactivar la conexión Bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">iniciar en el arranque</string>
+  <string name="app_ops_summaries_toggle_nfc">activar/desactivar el NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">conmutar los datos móviles</string>
   <string name="app_ops_summaries_superuser">acceso root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Ubicación aproximada</string>
+  <string name="app_ops_labels_fine_location">Ubicación precisa</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">Vibrar</string>
+  <string name="app_ops_labels_read_contacts">Consultar contactos</string>
+  <string name="app_ops_labels_modify_contacts">Modificar contactos</string>
+  <string name="app_ops_labels_read_call_log">Leer registro de llamadas</string>
+  <string name="app_ops_labels_modify_call_log">Modificar registro de llamadas</string>
+  <string name="app_ops_labels_read_calendar">Leer calendario</string>
+  <string name="app_ops_labels_modify_calendar">Modificar calendario</string>
   <string name="app_ops_labels_wifi_scan">Exploración de conexiones Wi-Fi</string>
+  <string name="app_ops_labels_notification">Notificación/Mensaje</string>
   <string name="app_ops_labels_cell_scan">Exploración del celular</string>
+  <string name="app_ops_labels_call_phone">Llamar</string>
+  <string name="app_ops_labels_read_sms">Leer SMS</string>
+  <string name="app_ops_labels_write_sms">Escribir SMS</string>
+  <string name="app_ops_labels_receive_sms">Recibir SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Recibir SMS de emergencia</string>
+  <string name="app_ops_labels_receive_mms">Recibir MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Recibir mensajes WAP</string>
+  <string name="app_ops_labels_send_sms">Enviar SMS</string>
   <string name="app_ops_labels_read_icc_sms">Leer mensajes ICC</string>
   <string name="app_ops_labels_write_icc_sms">Editar mensajes ICC</string>
+  <string name="app_ops_labels_modify_settings">Modificar ajustes</string>
   <string name="app_ops_labels_draw_on_top">Dibujar sobre</string>
+  <string name="app_ops_labels_access_notifications">Acceso a notificaciones</string>
+  <string name="app_ops_labels_camera">Cámara</string>
+  <string name="app_ops_labels_record_audio">Grabar sonido</string>
+  <string name="app_ops_labels_play_audio">Reproducir sonido</string>
+  <string name="app_ops_labels_read_clipboard">Leer el portapapeles</string>
+  <string name="app_ops_labels_modify_clipboard">Modificar el portapapeles</string>
+  <string name="app_ops_labels_media_buttons">Botones multimedia</string>
+  <string name="app_ops_labels_audio_focus">Sonido</string>
+  <string name="app_ops_labels_master_volume">Volumen</string>
+  <string name="app_ops_labels_voice_volume">Volumen de voz</string>
+  <string name="app_ops_labels_ring_volume">Volumen de llamada</string>
+  <string name="app_ops_labels_media_volume">Volumen multimedia</string>
+  <string name="app_ops_labels_alarm_volume">Volumen de alarma</string>
+  <string name="app_ops_labels_notification_volume">Volumen de notificación</string>
+  <string name="app_ops_labels_bluetooth_volume">Volumen de Bluetooth</string>
+  <string name="app_ops_labels_keep_awake">Mantener encendido</string>
+  <string name="app_ops_labels_monitor_location">Consultar ubicación aproximada</string>
+  <string name="app_ops_labels_monitor_high_power_location">Consultar ubicación precisa</string>
+  <string name="app_ops_labels_get_usage_stats">Obtener estadísticas de uso</string>
+  <string name="app_ops_labels_mute_unmute_microphone">Activar/desactivar micrófono</string>
+  <string name="app_ops_labels_toast_window">Mostrar notificaciones emergentes</string>
+  <string name="app_ops_labels_project_media">Proyectar medios</string>
+  <string name="app_ops_labels_activate_vpn">Activar VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Editar fondo de pantalla</string>
   <string name="app_ops_labels_assist_structure">Ayudar en la estructura</string>
   <string name="app_ops_labels_assist_screenshot">Ayudar en la captura de pantalla</string>
+  <string name="app_ops_labels_read_phone_state">Leer estado del teléfono</string>
   <string name="app_ops_labels_add_voicemail">Añadir al buzón de voz</string>
+  <string name="app_ops_labels_use_sip">Usar SIP</string>
+  <string name="app_ops_labels_make_call">Hacer llamada</string>
+  <string name="app_ops_labels_use_fingerprint">Usar huella digital</string>
   <string name="app_ops_labels_use_body_sensors">Usar sensores corporales</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Leer transmisiones celulares</string>
   <string name="app_ops_labels_mock_location">Simular ubicación</string>
+  <string name="app_ops_labels_read_external_storage">Leer en almacenamiento externo</string>
+  <string name="app_ops_labels_write_external_storage">Escribir en almacenamiento externo</string>
+  <string name="app_ops_labels_turn_screen_on">Encender pantalla</string>
+  <string name="app_ops_labels_get_accounts">Obtener cuentas</string>
+  <string name="app_ops_labels_toggle_wifi">Activar/desactivar Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Activar/desactivar la conexión Bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Iniciar en el arranque</string>
+  <string name="app_ops_labels_toggle_nfc">Activar/desactivar el NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Conmutar datos móviles</string>
   <string name="app_ops_labels_superuser">Acceso root</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">Permitir</string>
+  <string name="app_ops_permissions_ignored">Ignorado</string>
+  <string name="app_ops_permissions_always_ask">Preguntar siempre</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (usado <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">Permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">Denegado <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">Permitido <xliff:g id="count">%1$s</xliff:g>, denegado <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">Mostrar aplicaciones de usuario</string>
+  <string name="app_ops_show_system_apps">Mostrar aplicaciones del sistema</string>
+  <string name="app_ops_reset_counters">Restablecer permitir/denegar contadores</string>
+  <string name="app_ops_reset_confirm_title">Confirmar restablecimiento de contadores</string>
+  <string name="app_ops_reset_confirm_mesg">¿Estás seguro de que deseas restablecer los contadores?</string>
+  <string name="ok">Aceptar</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">Nombre del dispositivo</string>
+  <string name="unlock_scramble_pin_layout_title">Disposición aleatoria</string>
+  <string name="unlock_scramble_pin_layout_summary">Cambiar la disposición de los números del PIN para desbloquear el dispositivo</string>
+  <string name="button_pref_title">Botones</string>
+  <string name="hardware_keys_power_key_title">Botón de encendido</string>
   <string name="hardware_keys_home_key_title">Botón inicio</string>
   <string name="hardware_keys_back_key_title">Botón atrás</string>
+  <string name="hardware_keys_menu_key_title">Botón de menú</string>
+  <string name="hardware_keys_assist_key_title">Botón de búsqueda</string>
   <string name="hardware_keys_appswitch_key_title">Botón recientes</string>
   <string name="hardware_keys_camera_key_title">Botón cámara</string>
+  <string name="hardware_keys_volume_keys_title">Botones de volumen</string>
+  <string name="hardware_keys_short_press_title">Acción de pulsación corta</string>
+  <string name="hardware_keys_long_press_title">Acción de pulsación larga</string>
+  <string name="hardware_keys_double_tap_title">Acción de doble toque</string>
+  <string name="hardware_keys_action_nothing">Sin acción</string>
+  <string name="hardware_keys_action_menu">Abrir/Cerrar menú</string>
+  <string name="hardware_keys_action_app_switch">Cambio entre aplicaciones recientes</string>
+  <string name="hardware_keys_action_search">Asistente de búsqueda</string>
+  <string name="hardware_keys_action_voice_search">Búsqueda por voz</string>
+  <string name="hardware_keys_action_in_app_search">Búsqueda dentro de la aplicación</string>
+  <string name="hardware_keys_action_launch_camera">Iniciar cámara</string>
+  <string name="hardware_keys_action_sleep">Apagar la pantalla</string>
+  <string name="hardware_keys_action_last_app">Última aplicación</string>
+  <string name="camera_sleep_on_release_title">Vista rápida</string>
   <string name="camera_sleep_on_release_summary">Una leve pulsación del botón cámara dejará la pantalla encendida mientras el botón se mantenga pulsado</string>
+  <string name="camera_launch_title">Iniciar cámara</string>
   <string name="camera_launch_summary">Una pulsación prolongada iniciará la cámara</string>
+  <string name="volbtn_music_controls_title">Control multimedia</string>
   <string name="volbtn_music_controls_summary">Cuando la pantalla esté apagada, una pulsación prolongada de los controles de volumen avanzará o retrocederá sobre las pistas de música activas</string>
+  <string name="volbtn_cursor_control_title">Control del cursor</string>
+  <string name="volbtn_cursor_control_off">Deshabilitada</string>
   <string name="volbtn_cursor_control_on">Los botones subir y bajar volumen moverán el cursor a izquierda y derecha, respectivamente</string>
   <string name="volbtn_cursor_control_on_reverse">Los botones subir y bajar volumen moverán el cursor a derecha e izquierda, respectivamente</string>
+  <string name="power_end_call_title">Finalizar llamada</string>
   <string name="power_end_call_summary">Al pulsar el botón de encendido finalizará la llamada en curso</string>
+  <string name="swap_volume_buttons_title">Reorientar botones</string>
   <string name="swap_volume_buttons_summary">Intercambiar los botones de control de volumen al girar la pantalla</string>
   <string name="button_wake_title">Activar dispositivo</string>
+  <string name="home_answer_call_title">Contestar la llamada</string>
   <string name="home_answer_call_summary">Al pulsar el botón de encendido se contestará la llamada entrante</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">Brillo adaptativo</string>
   <string name="adaptive_backlight_summary">Variar inteligentemente el brillo de la pantalla para optimizar la duración de la batería</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">Luz del sol</string>
+  <string name="sunlight_enhancement_summary">Mejorar el brillo y la lectura de la pantalla bajo la luz del sol</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">Realce de color</string>
+  <string name="color_enhancement_summary">Realzar dinámicamente los colores de la pantalla</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">Contraluz</string>
+  <string name="button_backlight_enabled">Iluminar botones</string>
+  <string name="keyboard_backlight_enabled">Iluminar teclado</string>
+  <string name="button_backlight_seekbar_title">Brillo de los botones</string>
+  <string name="keyboard_backlight_seekbar_title">Brillo del teclado</string>
+  <string name="backlight_timeout_title">Tiempo de iluminación</string>
+  <string name="backlight_timeout_unlimited">No apagar</string>
+  <string name="backlight_summary_disabled">Deshabilitada</string>
   <string name="backlight_summary_enabled_with_timeout">Habilitada durante <xliff:g id="timeout">%s</xliff:g></string>
   <string name="backlight_summary_enabled">Habilitada</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">Gestos</string>
   <!-- Power menu -->
+  <string name="power_menu_title">Menú de apagado</string>
+  <string name="power_menu_reboot_title">Menú de reinicio</string>
+  <string name="power_menu_screenshot_title">Captura pantalla</string>
+  <string name="power_menu_airplane_title">Modo avión</string>
+  <string name="power_menu_users_title">Cambio de usuario</string>
+  <string name="power_menu_settings_title">Atajo de configuración</string>
+  <string name="power_menu_lockdown_title">Bloqueo de dispositivo</string>
+  <string name="power_menu_bug_report_title">Informe de errores</string>
+  <string name="power_menu_sound_title">Panel de sonido</string>
   <string name="power_menu_bug_report_disabled">Los informes de error están desactivados en las configuraciones de desarrollo</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">Habilitar barra de navegación en pantalla</string>
+  <string name="disable_navkeys_summary">Habilitar barra de navegación en pantalla y deshabilitar los botones de hardware</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">Doble toque para suspender</string>
   <string name="double_tap_to_sleep_summary">Apagar la pantalla mediante un doble toque sobre la barra de estado</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir activación accidental</string>
+  <string name="proximity_wake_summary">Comprobar el sensor de proximidad antes de encender la pantalla</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Activar con cargador</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">Muestra</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">Sonidos de ajuste de volumen</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">Intensidad de vibración</string>
+  <string name="vibrator_warning">No son recomendables valores superiores a %1$d</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">Calibración de color</string>
+  <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
+  <string name="color_red_title">Rojo</string>
+  <string name="color_green_title">Verde</string>
+  <string name="color_blue_title">Azul</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">Corrección gamma</string>
+  <string name="gamma_tuning_summary_head">Ajustar la corrección gamma de la pantalla</string>
+  <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">Contraste</string>
+  <string name="gamma_tuning_brightness">Brillo</string>
+  <string name="gamma_tuning_saturation">Saturación</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">Iniciar el reproductor de música</string>
   <string name="headset_connect_player_summary">Iniciar el reproductor de música predeterminado al conectar los auriculares</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">Prioridad automática</string>
+  <string name="auto_brightness_reset_button">Restablecer</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">Rotación</string>
+  <string name="display_rotation_disabled">Deshabilitada</string>
+  <string name="display_rotation_unit">grados</string>
   <string name="display_lockscreen_rotation_title">Girar la pantalla bloqueada</string>
+  <string name="display_rotation_category_title">Modos de rotación</string>
+  <string name="display_rotation_0_title">0 grados</string>
+  <string name="display_rotation_90_title">90 grados</string>
+  <string name="display_rotation_180_title">180 grados</string>
+  <string name="display_rotation_270_title">270 grados</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">Color de pantalla</string>
+  <string name="screencolor_summary">Ajustar el matiz de la pantalla, saturación, contraste o intensidad</string>
+  <string name="custom_screencolor">Personalizar color de pantalla</string>
+  <string name="screencolor_save">Guardar</string>
+  <string name="screencolor_cancel">Cancelar</string>
+  <string name="restore_preview">Ver imagen predeterminada</string>
   <string name="selectnewfile_menu">Ver nueva imagen desde la galería</string>
   <string name="selectfile_menu">Ver imagen desde la galería</string>
+  <string name="restore_default_str">Restablecer</string>
+  <string name="hue_str">Color: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
+  <string name="live_display_mode">Modo de visualización</string>
+  <string name="live_display_color_temperature_title">Temperatura de color</string>
+  <string name="live_display_color_temperature_summary">Día: <xliff:g id="day_temperature">%1$d</xliff:g>K Noche: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">Día</string>
+  <string name="live_display_night">Noche</string>
+  <string name="live_display_outdoor_mode_title">Modo automático al aire libre</string>
   <string name="live_display_outdoor_mode_summary">Aumentar automáticamente el brillo y la saturación con la luz del sol</string>
+  <string name="live_display_low_power_title">Reducir el consumo de energía</string>
+  <string name="live_display_low_power_summary">Ajustar la pantalla al mínimo consumo de energía sin degradación</string>
+  <string name="live_display_enhance_color_title">Mejorar colores</string>
   <string name="live_display_enhance_color_summary">Mejorar la intensidad del color de tonos de piel, paisajes y otras imágenes</string>
+  <string name="live_display_color_profile_title">Perfil de color</string>
+  <string name="live_display_color_profile_standard_title">Estándar</string>
+  <string name="live_display_color_profile_standard_summary">Colores precisos y blancos brillantes</string>
+  <string name="live_display_color_profile_natural_title">Natural</string>
+  <string name="live_display_color_profile_natural_summary">Colores realistas y tonos cálidos</string>
+  <string name="live_display_color_profile_dynamic_title">Dinámico</string>
+  <string name="live_display_color_profile_dynamic_summary">Colores mejorados y blancos brillantes</string>
+  <string name="live_display_color_profile_cinema_title">Cine</string>
+  <string name="live_display_color_profile_cinema_summary">Reproducción perfecta de color para video</string>
+  <string name="live_display_color_profile_astronomy_title">Astronomía</string>
+  <string name="live_display_color_profile_astronomy_summary">Rojo profundo para conservar la visión de noche</string>
+  <string name="live_display_color_profile_photography_title">Fotografía</string>
+  <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
+  <string name="live_display_color_profile_basic_title">Básico</string>
+  <string name="live_display_color_profile_basic_summary">Utilizar pantalla sin calibrar</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">Icono de selección</string>
+  <string name="ime_switcher_notify_summary">Mostrar el icono de selección del método de entrada</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">Notificaciones emergentes</string>
+  <string name="summary_heads_up_enabled">Las notificaciones emergentes están habilitadas</string>
+  <string name="summary_heads_up_disabled">Las notificaciones emergentes están deshabilitadas</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">Aceptar todos los tipos de archivo</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">Alta sensibilidad táctil</string>
+  <string name="high_touch_sensitivity_summary">Aumentar la sensibilidad del panel táctil para que pueda usarse con guantes</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">Densidad del LCD</string>
+  <string name="dialog_title_lcd_density">Densidad del LCD</string>
+  <string name="lcd_density_value_format">%d DPI</string>
   <string name="lcd_density_default_value_format">%d DPI (predeterminado)</string>
+  <string name="restarting_ui">Reiniciando interfaz de usuario\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">Mostrar icono al usar el lápiz</string>
+  <string name="stylus_icon_enabled_summary">Mostrar el cursor cuando se arrastra o dibuja con el lápiz</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">Gestos del lápiz</string>
+  <string name="category_spen_title">Gestos del lápiz</string>
+  <string name="enable_subcat_title">Lápiz</string>
+  <string name="enable_spen_title_head">Habilitar gestos</string>
+  <string name="enable_spen_summary_head">Usar gestos con el botón del lápiz pulsado</string>
+  <string name="gestures_subcat_title">Gestos</string>
+  <string name="gestures_left_spen_title_head">Deslizar a la izquierda</string>
+  <string name="gestures_right_spen_title_head">Deslizar a la derecha</string>
+  <string name="gestures_up_spen_title_head">Deslizar hacia arriba</string>
+  <string name="gestures_down_spen_title_head">Deslizar hacia abajo</string>
+  <string name="gestures_long_spen_title_head">Pulsación prolongada</string>
+  <string name="gestures_double_spen_title_head">Doble toque</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">Sin acción</string>
+  <string name="gestures_action_home">Inicio</string>
+  <string name="gestures_action_back">Atrás</string>
+  <string name="gestures_action_menu">Menú</string>
+  <string name="gestures_action_search">Iniciar búsqueda</string>
+  <string name="gestures_action_recent">Aplicaciones recientes</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s no está instalado</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">Pantalla táctil deslizante</string>
   <string name="touchscreen_hovering_summary">Permite deslizarse por la pantalla como un ratón en navegadores, escritorios remotos, etc</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">Volumen de tono ascendente</string>
+  <string name="increasing_ring_min_volume_title">Volumen de inicio</string>
+  <string name="increasing_ring_ramp_up_time_title">Tiempo de incremento</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">Descarga de datos por GPS</string>
+  <string name="lto_download_data_wifi_only_on">En cualquier red</string>
+  <string name="lto_download_data_wifi_only_off">Solo en redes Wi\u2011Fi</string>
+  <string name="volume_keys_control_ring_stream_title">Controlar el volumen del tono de llamada</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Las teclas de volumen controlan el volumen del tono de llamada</string>
   <string name="volume_keys_control_ring_stream_summary_off">Las teclas de volumen controlan el volumen de archivos multimedia</string>
+  <string name="category_calibration">Calibración</string>
   <string name="display_and_lights">Pantalla y led</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">Cargador</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">Habilitar</string>
+  <string name="power_notifications_enable_summary">Reproducir un sonido al conectar o desconectar el cargador</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">Vibrar</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">Sonido de notificación</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">Silencio</string>
   <!-- Status bar -->
+  <string name="status_bar_title">Barra de estado</string>
+  <string name="status_bar_toggle_brightness">Ajuste de brillo</string>
+  <string name="status_bar_toggle_brightness_summary">Permitir ajustar la luminosidad de la pantalla mediante el deslizamiento por la barra de estado</string>
+  <string name="status_bar_notif_count_title">Mostrar contador de notificaciones</string>
+  <string name="status_bar_notif_count_summary">Mostrar el número de notificaciones pendientes en la barra de estado</string>
+  <string name="status_bar_quick_qs_pulldown_title">Despliegue rápido</string>
+  <string name="status_bar_quick_qs_pulldown_summary">El borde %1$s de la barra de notificaciones desplegará el panel de ajustes rápidos</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Izquierdo</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Derecho</string>
+  <string name="status_bar_quick_qs_pulldown_off">Desactivada</string>
+  <string name="status_bar_quick_qs_pulldown_left">Izquierdo</string>
+  <string name="status_bar_quick_qs_pulldown_right">Derecho</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">Estilo del reloj</string>
+  <string name="status_bar_clock_style_right">Derecho</string>
+  <string name="status_bar_clock_style_left">Izquierdo</string>
+  <string name="status_bar_clock_style_center">Centrado</string>
+  <string name="status_bar_clock_style_hidden">Oculto</string>
+  <string name="status_bar_am_pm_title">Estilo AM/PM</string>
+  <string name="status_bar_am_pm_info">El formato de 24 horas está activado</string>
+  <string name="status_bar_am_pm_normal">Normal</string>
+  <string name="status_bar_am_pm_small">Pequeño</string>
+  <string name="status_bar_am_pm_hidden">Oculto</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">Estilo del icono de batería</string>
+  <string name="status_bar_battery_style_icon_portrait">Icono vertical</string>
+  <string name="status_bar_battery_style_icon_landscape">Icono horizontal</string>
+  <string name="status_bar_battery_style_circle">Circular</string>
+  <string name="status_bar_battery_style_text">Texto</string>
+  <string name="status_bar_battery_style_hidden">Oculto</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">Porcentaje de batería</string>
+  <string name="status_bar_battery_percentage_default">Oculto</string>
+  <string name="status_bar_battery_percentage_text_inside">Dentro del icono</string>
+  <string name="status_bar_battery_percentage_text_next">Junto al icono</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Iconos de la barra de estado</string>
   <string name="status_bar_icons_summary">Controlar qué iconos aparecen en la barra de estado</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">Bloquear eventos táctiles</string>
+  <string name="edge_gesture_service_summary">No enviar a las aplicaciones eventos táctiles de la barra de estado y de navegación</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">Nunca</string>
+  <string name="keep_screen_on_debugging">Durante la depuración USB</string>
+  <string name="keep_screen_on_charging">Durante la carga</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">Privacidad</string>
   <!-- Privacy Guard -->
   <string name="privacy_guard_default_title">Habilitada de forma predeterminada</string>
   <string name="privacy_guard_default_summary">Habilitar la privacidad de forma predeterminada para nuevas aplicaciones</string>
+  <string name="privacy_guard_manager_title">Privacidad</string>
+  <string name="privacy_guard_manager_summary">Gestionar las aplicaciones que podrán acceder a los datos personales</string>
+  <string name="privacy_guard_no_user_apps">No hay aplicaciones instaladas</string>
+  <string name="privacy_guard_help_title">Ayuda</string>
+  <string name="privacy_guard_reset_title">Restablecer</string>
+  <string name="privacy_guard_reset_text">¿Restablecer permisos?</string>
   <string name="privacy_guard_help_text">En esta pantalla puedes elegir las aplicaciones para las que se activará Privacy Guard tocando sobre ellas. Las aplicaciones seleccionadas no podrán acceder a tu información personal, como contactos, mensajes o registro de llamadas. Realiza una pulsación prolongada para ver la pantalla de detalles de la aplicación.\n\nLas aplicaciones del sistema no se muestran de forma predeterminada pero pueden mostrarse seleccionando la opción de menú correspondiente.</string>
+  <string name="privacy_guard_manager_show_system_apps">Mostrar aplicaciones del sistema</string>
+  <string name="privacy_guard_advanced_settings_title">Avanzado</string>
+  <string name="privacy_guard_notification_title">Mostrar notificación</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">Mostrar patrón erróneo</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">Mostrar puntos de patrón</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Mostrar directamente la contraseña</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Mostrar directamente el patrón</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Mostrar directamente la entrada PIN</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">Mostrar visualizador musical</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Desactivado por la configuración rápida de los mosaicos</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Pulsar para activar la pantalla bloqueada</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Pantalla bloqueada activada!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">Ahorro de batería</string>
+  <string name="battery_saver_summary">Reducir el rendimiento y limitar los datos en segundo plano</string>
+  <string name="battery_saver_summary_unavailable">No disponible mientras se carga</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">Habilitar perfiles por aplicación</string>
+  <string name="autoperf_summary">Elige automáticamente un modo de batería adecuado para diversas aplicaciones</string>
+  <string name="perf_profile_title">Modo de batería</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplicaciones iniciadas en el arranque</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">Tono de notificación</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Opciones avanzadas para reiniciar</string>
+  <string name="advanced_reboot_summary">Al desbloquear, incluir en el menú de apagado opciones para reiniciar en modo recovery, bootloader o realizar un reinicio rápido</string>
+  <string name="category_interface">Interfaz</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Escritorio ampliado</string>
+  <string name="expanded_hide_nothing">No ocultar nada</string>
+  <string name="expanded_hide_status">Ocultar barra de estado</string>
+  <string name="expanded_hide_navigation">Ocultar la barra de navegación</string>
+  <string name="expanded_hide_both">Ocultar ambas</string>
   <string name="expanded_nothing_to_show">Para añadir una configuración personalizada por aplicación para el estado ampliado, configurar \"Habilitado para todos\" en la posición de apagado</string>
+  <string name="expanded_enabled_for_all">Habilitado para todos</string>
   <string name="expanded_desktop_style">Estilo de escritorio ampliado</string>
   <string name="expanded_desktop_style_description">Elige un valor predeterminado para el estilo del escritorio ampliado</string>
   <string name="expanded_desktop_title">Opciones del escritorio ampliado</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">Cerrar aplicaciones con el botón volver</string>
+  <string name="kill_app_longpress_back_summary">Finalizar la aplicación actual al mantener pulsado el botón atrás</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">Mostrar la barra de búsqueda en el menú de recientes</string>
+  <string name="keywords_recents_show_searchbar">reciente recientes desactivar activar mostrar ocultar barra de búsqueda</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">Activación por voz</string>
+  <string name="voice_wakeup_retrain_title">Entrenar tu voz</string>
   <string name="voice_wakeup_activity_title">Actividad para iniciar</string>
+  <string name="voice_wakeup_default_activity">Google Now</string>
   <string name="voice_wakeup_needs_dial_permission_warning">La activación de voz debe tener permisos de llamada para seleccionar un contacto directo.</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">Lista de contactos bloqueados</string>
+  <string name="blacklist_edit_dialog_title">Editar número de teléfono bloqueado</string>
+  <string name="blacklist_prefs">Opciones</string>
+  <string name="blacklist_button_delete">Eliminar</string>
+  <string name="blacklist_empty_text">No hay números en la lista de números bloqueados. Añade una entrada tocando el botón (+).</string>
+  <string name="blacklist_disabled_empty_text">Activa la lista de números bloqueados para evitar que te llamen o manden mensajes.</string>
+  <string name="blacklist_summary_disabled">Deshabilitada</string>
+  <string name="blacklist_summary">No recibirás llamadas ni mensajes de los números incluidos en la lista de números bloqueados</string>
+  <string name="blacklist_notify">Mostrar notificación</string>
+  <string name="blacklist_private_numbers_title">Números privados</string>
+  <string name="blacklist_private_numbers_summary_disabled">No bloquear llamadas de números privados</string>
   <string name="blacklist_private_numbers_summary">Bloquear <xliff:g id="type">%s</xliff:g> entrante de números privados</string>
+  <string name="blacklist_unknown_numbers_title">Números desconocidos</string>
   <string name="blacklist_unknown_numbers_summary_disabled">No bloquear llamadas o mensajes de números que no están en la lista de contactos</string>
   <string name="blacklist_unknown_numbers_summary">Bloquear <xliff:g id="type">%s</xliff:g> entrantes de números que no están en la lista de contactos</string>
+  <string name="blacklist_summary_type_calls_only">llamadas</string>
+  <string name="blacklist_summary_type_messages_only">mensajes</string>
+  <string name="blacklist_summary_type_calls_and_messages">llamadas y mensajes</string>
+  <string name="blacklist_regex_title">Permitir comodines</string>
   <string name="blacklist_regex_summary">Usar \u00AB.\u00BB como comodín y \u00AB*\u00BB para repetición. Por ejemplo, \u00AB123.*\u00BB bloqueará números que comiencen con 123 y \u00AB.*123.*\u00BB bloqueará números que contengan 123</string>
+  <string name="blacklist_policy_block_calls">Bloquear llamadas entrantes</string>
+  <string name="blacklist_policy_block_messages">Bloquear mensajes entrantes</string>
   <string name="blacklist_bad_number_add">No se puede añadir un número no válido a la lista de personas bloqueadas</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">Quitar número</string>
+  <string name="remove_blacklist_entry">¿Quieres eliminar este número de teléfono bloqueado?</string>
+  <string name="select_contact">Seleccionar contacto</string>
   <!-- Sms security limit -->
   <string name="app_security_title">Seguridad de las aplicaciones</string>
+  <string name="sms_security_check_limit_title">Límite de mensajes SMS</string>
   <string name="sms_security_check_limit_summary">Las aplicaciones pueden enviar hasta %d Sms en 1 minuto antes de solicitar confirmación</string>
   <string name="sms_security_check_limit_summary_none">Las aplicaciones no están autorizadas a enviar mensajes sin confirmación</string>
+  <string name="sms_security_check_limit_none">Ninguno</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">Añadido %1$s</string>
+  <string name="spam_last_blocked_title">Último bloqueado %1$s</string>
+  <string name="block_notifications_title">Filtrar notificaciones</string>
+  <string name="block_notifications_summary">Gestionar filtros y notificaciones bloqueadas</string>
+  <string name="no_filters_title">No hay filtros establecidos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estadísticas CyanogenMod</string>
+  <string name="anonymous_statistics_summary">Ayuda a mejorar CyanogenMod mediante el envío anónimo de estadísticas</string>
+  <string name="anonymous_statistics_warning_title">Acerca de</string>
   <string name="anonymous_statistics_warning">Al permitir la recopilación y el envío de estadísticas de CyanogenMod, autorizas el envío de información de carácter no personal a los desarrolladores de CyanogenMod para hacer un seguimiento de las instalaciones que realices en los dispositivos. La información enviada incluye un identificador único que no compromete tu privacidad ni tu información personal. Esta información es enviada durante el arranque.\n\nPara ver un ejemplo de la información enviada, pulsa en \u00ABPrevisualizar datos\u00BB.</string>
   <string name="enable_reporting_title">Activar envío de estadísticas</string>
+  <string name="preview_data_title">Previsualizar datos</string>
+  <string name="view_stats_title">Ver estadísticas</string>
+  <string name="anonymous_learn_more">Leer más</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">Identificador único</string>
+  <string name="preview_device_title">Dispositivo</string>
+  <string name="preview_version_title">Versión</string>
   <string name="preview_country_title">País</string>
+  <string name="preview_carrier_title">Operadora móvil</string>
+  <string name="stats_collection_title">Recolección de estadísticas</string>
+  <string name="stats_collection_summary">Obtener información sobre las operaciones realizadas por las aplicaciones</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">Restablecer patrón</string>
+  <string name="lockpattern_settings_reset_summary">Introducir la cuenta de correo principal y su contraseña asociada para restablecer el patrón de bloqueo</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">Restablecer</string>
+  <string name="menu_hidden_apps_reset_lock">Restablecer patrón de bloqueo</string>
+  <string name="protected_apps">Aplicaciones protegidas</string>
+  <string name="protected_apps_summary">Administrar aplicaciones que se ocultan detrás de un bloqueo seguro</string>
+  <string name="saving_protected_components">Guardar el estado del componente\u2026</string>
+  <string name="pa_login_username_hint">Usuario (correo electrónico)</string>
+  <string name="pa_login_password_hint">Contraseña</string>
+  <string name="pa_login_submit_button">Iniciar sesión</string>
+  <string name="pa_login_checking_password">Comprobando cuenta\u2026</string>
+  <string name="pa_login_incorrect_login">El inicio de sesión fue incorrecto</string>
   <string name="pa_pattern_or_fingerprint_header">Se debe dibujar el patrón o usar huellas dactilares para desbloquear</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">Colaboradores</string>
+  <string name="contributors_cloud_loading_message">Cargando datos de colaboradores\u2026</string>
+  <string name="contributors_cloud_failed_message">No se pueden cargar los datos de colaboradores</string>
+  <string name="contributor_info_menu">Información del colaborador</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Nombre:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Sobrenombre:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Contribuciones:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">Información de las contribuciones</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Contribuyentes totales:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Contribuciones totales:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Última actualización:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">Sonidos</string>
+  <string name="notification_manager">Notificaciones</string>
   <string name="lockscreen_settings">Pantalla bloqueada</string>
   <string name="category_lights">Luces</string>
+  <string name="category_volume">Volumen</string>
+  <string name="category_vibrate">Vibrar</string>
+  <string name="category_misc">Varios</string>
+  <string name="title_general">General</string>
+  <string name="advanced">Avanzado</string>
   <string name="link_volume_option_title">Vincular tonos y volumen de notificaciones</string>
+  <string name="lcd_density_prompt_message">Algunas aplicaciones pueden no funcionar con un DPI no estándar.\n\nEsto reiniciará tu teléfono.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Número de teléfono de APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN Duplicado</string>
+  <string name="duplicate_apn_error_message">Ya existe esta APN. Deseche o cambie los parámetros.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> es <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
+  <string name="sim_disabled">desactivada</string>
+  <string name="sim_missing">ausente o defectuosa</string>
+  <string name="sim_enabler_need_disable_sim">La tarjeta SIM se desactivará. ¿Quieres continuar?</string>
+  <string name="sim_enabler_will_disable_sim_title">Atención</string>
   <string name="sim_enabler_need_switch_data_service">Se deshabilitará esta SIM y la SIM <xliff:g id="slotid">%1$s</xliff:g> se utilizará para servicios de datos. ¿Estás seguro de que deseas continuar?</string>
+  <string name="sim_enabler_airplane_on">No se puede realizar la operación mientras esté activado el modo avión.</string>
+  <string name="sim_enabler_in_call">No se puede realizar la operación mientras haya una llamada en curso.</string>
+  <string name="sim_enabler_both_inactive">No es posible desactivar todas las tarjetas SIM</string>
+  <string name="sim_enabler_enabling">Activando\u2026</string>
+  <string name="sim_enabler_disabling">Desactivando\u2026</string>
+  <string name="sub_activate_success">SIM activada.</string>
+  <string name="sub_activate_failed">Activación fallida.</string>
+  <string name="sub_deactivate_success">SIM desactivada.</string>
   <string name="sub_deactivate_failed">Error de desactivación.</string>
   <string name="primary_sub_select_title">Suscripción 3G/LTE predeterminada</string>
+  <string name="select_sim_card">Seleccionar tarjeta SIM</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">Estado de SIM %d</string>
+  <string name="sim_card_lock_settings_title">Ajustes de bloqueo de SIM %d</string>
+  <string name="sim_card_summary_empty">Tarjeta SIM no insertada</string>
+  <string name="sim_mobile_network_settings_category_title">Configuración de red móvil</string>
+  <string name="sim_mobile_network_settings_title">Ajustes de la tarjeta SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">recordatorios</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">llamadores seleccionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
+  <string name="maximum_body_level">Cuerpo: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">Modelo: %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Tono de llamada para SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Última vez utilizado:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Tiempo de uso:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Esto borrará todos los datos del <b>almacenamiento interno</b> de la tableta, a saber:\n\n<li>Tus cuentas del dispositivo</li>\n<li>Ajustes del sistema y datos de las aplicaciones</li>\n<li>Aplicaciones descargadas</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="default">Esto borrará todos los datos del <b>almacenamiento interno</b> del teléfono, a saber:\n\n<li>Tus cuentas del dispositivo</li>\n<li>Ajustes del sistema y datos de las aplicaciones</li>\n<li>Aplicaciones descargadas</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">Aplicaciones y datos personales</string>
+  <string name="factory_reset_instructions_summary">Esto borrará del dispositivo todas tus cuentas, aplicaciones, datos de aplicaciones y ajustes de sistema</string>
+  <string name="factory_reset_personal_content">Contenido personal</string>
+  <string name="factory_reset_erase_stored_content">Eliminar contenido almacenado</string>
   <string name="factory_reset_erase_stored_content_summary">Eliminar música, fotos, videos y otros datos de usuario almacenados en este dispositivo</string>
   <string name="factory_reset_erase_stored_content_summary_forced">Borrar música, fotos, videos y otros datos de usuario almacenados en este dispositivo. \n\n <b>El contenido no se puede guardar debido a que el dispositivo esta cifrado.</b></string>
+  <string name="factory_reset_erase_sd_card">Formatear tarjeta SD</string>
   <string name="factory_reset_erase_sd_card_summary">Borrar todos los datos de la tarjeta SD, incluidos música y fotos</string>
   <string name="factory_reset_warning_text_reset_now">RESTABLECER AHORA</string>
+  <string name="factory_reset_warning_text_message">Todas tus cuentas, aplicaciones, datos de aplicaciones y ajustes del sistema se eliminarán del dispositivo. Esto no se puede revertir.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Otros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tiempo de espera del punto de acceso Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_never">Nunca</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minuto</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
   <string name="hotstpot_inactivity_timeout_never_summary_text">El punto de acceso portátil Wi\u2011Fi no se apagará nunca</string>
   <string name="hotstpot_inactivity_timeout_summary_text">El punto de acceso portátil Wi\u2011Fi se apagará después de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
@@ -313,7 +976,21 @@
   <!-- Live lock screen summary -->
   <string name="live_lock_screen_summary">Habilitar y configurar pantallas bloqueadas animadas</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">Opciones</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <string name="live_lock_screen_settings_disabled_prompt">Para ver las pantallas bloqueadas animadas disponibles, activar las pantallas bloqueadas animadas.</string>
+  <string name="interruptions_ignore_while_media_title">Prevenir reducción de audio</string>
+  <string name="interruptions_ignore_while_media_summary">No reducir el volumen de reproducción cuando llegue una notificación</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">Licencia de CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Restablecer estadísticas</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Se restablecerán las estadísticas de la batería</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">No se encontró la batería de la base</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Carga en estado AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 6ce7737..5b1d20f 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -167,9 +167,9 @@
   <string name="toggle2g3g4g">Tipo de red preferido</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
-  <string name="wifi_setting_countrycode_title">Código de región Wiu2011Fi</string>
+  <string name="wifi_setting_countrycode_title">Código de región Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">Especificar el código de región Wiu2011Fi</string>
+  <string name="wifi_setting_countrycode_summary">Especificar el código de región Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ocurrió un error al establecer el código de región.</string>
   <!-- Profiles -->
@@ -253,8 +253,10 @@
   <string name="notification_light_missed_call_title">Llamada perdida</string>
   <string name="notification_light_voicemail_title">Buzón de voz</string>
   <string name="notification_light_screen_on">Luces con la pantalla encendida</string>
+  <string name="notification_light_zen_mode">Luces en el modo no molestar</string>
   <string name="notification_light_use_multiple_leds">Múltiples LEDs</string>
   <string name="keywords_lights_brightness_level">atenuar el brillo de los leds</string>
+  <string name="notification_light_automagic">Elegir colores automáticamente</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustes de luz</string>
   <string name="led_notification_text">Luz LED activada por ajustes</string>
@@ -289,6 +291,8 @@
   <string name="app_ops_summaries_modify_call_log">modificar registro de llamadas</string>
   <string name="app_ops_summaries_read_calendar">leer el calendario</string>
   <string name="app_ops_summaries_modify_calendar">modificar el calendario</string>
+  <string name="app_ops_summaries_wifi_scan">Escanear Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notificación</string>
   <string name="app_ops_summaries_cell_scan">escanear red celular</string>
   <string name="app_ops_summaries_call_phone">llamar al teléfono</string>
   <string name="app_ops_summaries_read_sms">leer tus mensajes SMS</string>
@@ -316,15 +320,39 @@
   <string name="app_ops_summaries_media_volume">volumen multimedia</string>
   <string name="app_ops_summaries_alarm_volume">volumen de alarma</string>
   <string name="app_ops_summaries_notification_volume">volumen de notificación</string>
+  <string name="app_ops_summaries_bluetooth_volume">volumen de Bluetooth</string>
   <string name="app_ops_summaries_keep_awake">mantener encendido</string>
   <string name="app_ops_summaries_monitor_location">consultar ubicación aproximada</string>
   <string name="app_ops_summaries_monitor_high_power_location">consultar ubicación precisa</string>
+  <string name="app_ops_summaries_get_usage_stats">obtener estadísticas de uso</string>
   <string name="app_ops_summaries_mute_unmute_microphone">activar/desactivar el micrófono</string>
   <string name="app_ops_summaries_toast_window">mostrar notificaciones emergentes</string>
   <string name="app_ops_summaries_project_media">proyectar medios</string>
   <string name="app_ops_summaries_activate_vpn">activar VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">escribir fondo de pantalla</string>
+  <string name="app_ops_summaries_assist_structure">asistente de estructura</string>
+  <string name="app_ops_summaries_assist_screenshot">asistente para captura de pantalla</string>
+  <string name="app_ops_summaries_read_phone_state">leer estado del teléfono</string>
+  <string name="app_ops_summaries_add_voicemail">agregar buzón de voz</string>
+  <string name="app_ops_summaries_use_sip">usar SIP</string>
+  <string name="app_ops_summaries_make_call">hacer llamada</string>
+  <string name="app_ops_summaries_use_fingerprint">usar huella digital</string>
+  <string name="app_ops_summaries_use_body_sensors">utilizar sensores corporales</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">leer transmisiones celulares</string>
+  <string name="app_ops_summaries_mock_location">ubicación falsa</string>
+  <string name="app_ops_summaries_read_external_storage">leer almacenamiento externo</string>
+  <string name="app_ops_summaries_write_external_storage">escribir al almacenamiento externo</string>
+  <string name="app_ops_summaries_turn_screen_on">encender pantalla</string>
+  <string name="app_ops_summaries_get_accounts">obtener cuentas</string>
+  <string name="app_ops_summaries_toggle_wifi">alternar Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">alternar Bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">iniciar en el arranque</string>
+  <string name="app_ops_summaries_toggle_nfc">alternar NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">conmutar datos móviles</string>
   <string name="app_ops_summaries_superuser">acceso administrativo</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Ubicación aproximada</string>
+  <string name="app_ops_labels_fine_location">Ubicación precisa</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrar</string>
   <string name="app_ops_labels_read_contacts">Leer contactos</string>
@@ -333,11 +361,19 @@
   <string name="app_ops_labels_modify_call_log">Modificar registro de llamadas</string>
   <string name="app_ops_labels_read_calendar">Leer calendario</string>
   <string name="app_ops_labels_modify_calendar">Modificar calendario</string>
+  <string name="app_ops_labels_wifi_scan">Escanear Wi-Fi</string>
   <string name="app_ops_labels_notification">Notificación/Mensaje</string>
+  <string name="app_ops_labels_cell_scan">Escaneo de red móvil</string>
   <string name="app_ops_labels_call_phone">Llamar</string>
+  <string name="app_ops_labels_read_sms">Leer SMS</string>
+  <string name="app_ops_labels_write_sms">Escribir SMS</string>
   <string name="app_ops_labels_receive_sms">Recibir SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Recibir mensajes de emergencia SMS</string>
   <string name="app_ops_labels_receive_mms">Recibir MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Recibir mensajes WAP</string>
   <string name="app_ops_labels_send_sms">Enviar SMS</string>
+  <string name="app_ops_labels_read_icc_sms">Leer mensajes ICC</string>
+  <string name="app_ops_labels_write_icc_sms">Escribir mensajes ICC</string>
   <string name="app_ops_labels_modify_settings">Modificar ajustes</string>
   <string name="app_ops_labels_draw_on_top">Mostrar encima</string>
   <string name="app_ops_labels_access_notifications">Acceso a notificaciones</string>
@@ -356,10 +392,33 @@
   <string name="app_ops_labels_notification_volume">Volumen de notificación</string>
   <string name="app_ops_labels_bluetooth_volume">Volumen de Bluetooth</string>
   <string name="app_ops_labels_keep_awake">Mantener encendido</string>
+  <string name="app_ops_labels_monitor_location">Monitorear ubicación</string>
+  <string name="app_ops_labels_monitor_high_power_location">Monitorear ubicación precisa</string>
+  <string name="app_ops_labels_get_usage_stats">Obtener estadísticas de uso</string>
   <string name="app_ops_labels_mute_unmute_microphone">Activar/desactivar micrófono</string>
   <string name="app_ops_labels_toast_window">Mostrar notificaciones emergentes</string>
   <string name="app_ops_labels_project_media">Proyectar medios</string>
   <string name="app_ops_labels_activate_vpn">Activar VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Escribir fondo de pantalla</string>
+  <string name="app_ops_labels_assist_structure">Asistente de estructura</string>
+  <string name="app_ops_labels_assist_screenshot">Asistente para captura de pantalla</string>
+  <string name="app_ops_labels_read_phone_state">Leer estado del teléfono</string>
+  <string name="app_ops_labels_add_voicemail">Añadir buzón de voz</string>
+  <string name="app_ops_labels_use_sip">Usar SIP</string>
+  <string name="app_ops_labels_make_call">Hacer llamada</string>
+  <string name="app_ops_labels_use_fingerprint">Usar huella digital</string>
+  <string name="app_ops_labels_use_body_sensors">Utilizar sensores corporales</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Leer transmisiones celulares</string>
+  <string name="app_ops_labels_mock_location">Ubicación falsa</string>
+  <string name="app_ops_labels_read_external_storage">Leer almacenamiento externo</string>
+  <string name="app_ops_labels_write_external_storage">Escribir al almacenamiento externo</string>
+  <string name="app_ops_labels_turn_screen_on">Encender pantalla</string>
+  <string name="app_ops_labels_get_accounts">Obtener cuentas</string>
+  <string name="app_ops_labels_toggle_wifi">Alternar Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Alternar Bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Iniciar en el arranque</string>
+  <string name="app_ops_labels_toggle_nfc">Alternar NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Conmutar datos móviles</string>
   <string name="app_ops_labels_superuser">Acceso administrativo</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Permitido</string>
@@ -654,6 +713,8 @@
   <string name="status_bar_battery_percentage_text_inside">Dentro del icono</string>
   <string name="status_bar_battery_percentage_text_next">Junto al icono</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Iconos de la barra de estado</string>
+  <string name="status_bar_icons_summary">Controlar qué iconos de la barra de estado se muestran</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Bloquear eventos táctiles</string>
   <string name="edge_gesture_service_summary">No enviar a las aplicaciones los eventos táctiles de la barra de estado y de navegación</string>
@@ -690,6 +751,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Mostrar visualizador musical</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Desactivado por la configuración rápida de los controles</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Toca para activar la pantalla de bloqueo</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Pantalla de bloqueo activada!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Ahorro de batería</string>
   <string name="battery_saver_summary">Reduce el rendimiento y limita los datos en segundo plano</string>
@@ -699,6 +763,7 @@
   <string name="autoperf_summary">Elige automáticamente un modo de batería adecuado para diversas aplicaciones</string>
   <string name="perf_profile_title">Modo de batería</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplicaciones iniciadas en el arranque</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tono de notificación</string>
   <!-- Advanced reboot options -->
@@ -727,6 +792,7 @@
   <string name="voice_wakeup_retrain_title">Entrenar tu voz</string>
   <string name="voice_wakeup_activity_title">Actividad para iniciar</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">La activación por voz debe tener permisos de llamada para seleccionar un contacto directo.</string>
   <string name="picker_activities">Actividades</string>
   <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
   <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
@@ -795,12 +861,14 @@
   <string name="menu_hidden_apps_delete">Restablecer</string>
   <string name="menu_hidden_apps_reset_lock">Restablecer patrón de bloqueo</string>
   <string name="protected_apps">Aplicaciones protegidas</string>
+  <string name="protected_apps_summary">Administrar cuáles aplicaciones se ocultan detrás del bloqueo seguro</string>
   <string name="saving_protected_components">Guardar el estado del componente\u2026</string>
   <string name="pa_login_username_hint">Usuario (correo electrónico)</string>
   <string name="pa_login_password_hint">Contraseña</string>
   <string name="pa_login_submit_button">Iniciar sesión</string>
   <string name="pa_login_checking_password">Comprobando cuenta\u2026</string>
   <string name="pa_login_incorrect_login">El inicio de sesión fue incorrecto</string>
+  <string name="pa_pattern_or_fingerprint_header">Debes dibujar el patrón o utilizar huellas digitales para desbloquear</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Colaboradores</string>
   <string name="contributors_cloud_loading_message">Cargando datos de colaboradores\u2026</string>
@@ -811,6 +879,10 @@
                  <b>Apodo:</b><xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Contribuciones:</b><xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Información de las contribuciones</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Contribuyentes totales:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Contribuciones totales:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Última actualización:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Sonidos</string>
   <string name="notification_manager">Notificaciones</string>
   <string name="lockscreen_settings">Pantalla de bloqueo</string>
@@ -821,24 +893,44 @@
   <string name="title_general">General</string>
   <string name="advanced">Avanzado</string>
   <string name="link_volume_option_title">Enlazar volumen del tono de llamada y notificaciones</string>
+  <string name="lcd_density_prompt_message">Algunas aplicaciones pueden no funcionar con un DPI no estándar.\n\nEsto reiniciará tu teléfono.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Número de teléfono de APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN Duplicado</string>
+  <string name="duplicate_apn_error_message">Ya existe este APN. Deséchalo o cambia los parámetros.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> es <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
   <string name="sim_disabled">desactivada</string>
   <string name="sim_missing">ausente o defectuosa</string>
+  <string name="sim_enabler_need_disable_sim">La tarjeta SIM se desactivará. ¿Quieres continuar?</string>
+  <string name="sim_enabler_will_disable_sim_title">Atención</string>
+  <string name="sim_enabler_need_switch_data_service">Esta tarjeta SIM será desactivada y <xliff:g id="slotid">%1$s </xliff:g> y se utilizará para servicios de datos. ¿Estás seguro que deseas continuar?</string>
   <string name="sim_enabler_airplane_on">No se puede realizar la operación mientras esté activado el modo avión.</string>
   <string name="sim_enabler_in_call">No se puede realizar la operación mientras haya una llamada en curso.</string>
   <string name="sim_enabler_both_inactive">No es posible desactivar todas las tarjetas SIM</string>
+  <string name="sim_enabler_enabling">Activando\u2026</string>
+  <string name="sim_enabler_disabling">Desactivando\u2026</string>
+  <string name="sub_activate_success">SIM activada.</string>
+  <string name="sub_activate_failed">Error de activación.</string>
+  <string name="sub_deactivate_success">SIM desactivada.</string>
+  <string name="sub_deactivate_failed">Error de desactivación.</string>
   <string name="primary_sub_select_title">Suscripción 3G/LTE por defecto</string>
+  <string name="select_sim_card">Seleccionar tarjeta SIM</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Estado de SIM %d</string>
   <string name="sim_card_lock_settings_title">Ajustes de bloqueo de SIM %d</string>
   <string name="sim_card_summary_empty">Tarjeta SIM no insertada</string>
+  <string name="sim_mobile_network_settings_category_title">Ajustes de red móvil</string>
   <string name="sim_mobile_network_settings_title">Ajustes de la tarjeta SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">recordatorios</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">personas que llaman</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -848,8 +940,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Timbre de llamada para SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Última vez utilizado:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Tiempo de uso:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Esto borrará todos los datos del <b>almacenamiento interno</b> del tablet, incluyendo:\n\n<li>Tus cuentas de dispositivo</li>\n<li>Ajustes del sistema y datos de las aplicaciones</li>\n<li>Aplicaciones descargadas</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -866,16 +961,36 @@
   <string name="factory_reset_warning_text_reset_now">RESTABLECER AHORA</string>
   <string name="factory_reset_warning_text_message">Todas tus cuentas, aplicaciones, datos de aplicaciones y ajustes del sistema se eliminarán del dispositivo. Esto no se puede revertir.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Otros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tiempo de espera del punto de acceso Wi\u2011Fi</string>
   <string name="hotstpot_inactivity_timeout_never">Nunca</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minuto</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">El punto de acceso portable Wi\u2011Fi no se apagará nunca</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">El punto de acceso portable Wi\u2011Fi se apagará después de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Pantalla de bloqueo animada</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Activar y configurar pantallas de bloqueo animadas</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Ajustes</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Para ver las pantallas de bloqueo animadas disponibles, activa la opción de pantallas de bloqueo.</string>
   <string name="interruptions_ignore_while_media_title">Prevenir reducción de audio</string>
   <string name="interruptions_ignore_while_media_summary">No reducir el volumen de reproducción cuando llegue una notificación</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Licencia de CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Restablecer estadísticas</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Las estadísticas de la batería serán restablecidas</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Batería de la base no encontrada</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Cargando en base de CA</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 94c0cd5..0c48dd0 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -862,4 +862,14 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="interruptions_ignore_while_media_summary">Ära alanda meedia helitugevust teavituse saabumisel</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod juriidiline info</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Nulli statistika</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Aku statistika ajalugu nullitakse</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Doki aku puudub</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Laen doki AC-ga</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Laen üle doki USB</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 69bb9f6..ef038f9 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Ez gutxiagotu multimedia erreprodukzioaren bolumena jakinarazpen bat jasotzean</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod lizentzia</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Ezabatu estatistikak</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Bateriaren historia estatistikak ezabatuko dira</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Oinarriaren bateria falta da</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Oinarriaren kargadorearekin kargatzen</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Oinarriaren USBaren bitartez kargatzen</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index b4156b9..cd30416 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -870,4 +870,14 @@
   <string name="interruptions_ignore_while_media_summary">میزان صدای رسانه هنگام دریافت اعلان کم نشود</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">موارد حقوقی سایانوژن‌مود</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">تنظیم مجدد آمار</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">آمار تاریخچه باتری در شرف تنظیم مجدد هستند</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">داک باتری وجود ندارد</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">در حال شارژ در داک AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">در حال شارژ در داک یواس‌بی</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index baee189..de2708b 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Älä hiljennä median toiston äänenvoimakkuutta ilmoituksen saapuessa</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenModin lakiasiat</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Nollaa tilastot</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Akun historiatilastot nollataan</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Telakan akku puuttuu</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Ladataan telakan laturilla</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Ladataan telakan USB:n kautta</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 3f71341..8e7259d 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -254,8 +254,10 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="notification_light_missed_call_title">Appel manqué</string>
   <string name="notification_light_voicemail_title">Messagerie vocale</string>
   <string name="notification_light_screen_on">Voyants avec écran allumé</string>
+  <string name="notification_light_zen_mode">S\'allume en mode « Ne pas déranger »</string>
   <string name="notification_light_use_multiple_leds">Plusieurs LED</string>
   <string name="keywords_lights_brightness_level">atténuer la luminosité des LED</string>
+  <string name="notification_light_automagic">Couleurs automatiques</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Paramètres du voyant</string>
   <string name="led_notification_text">LED activée par les paramètres</string>
@@ -289,6 +291,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_ops_summaries_read_call_log">voir le journal d\'appel</string>
   <string name="app_ops_summaries_modify_call_log">modifier le journal des appels</string>
   <string name="app_ops_summaries_read_calendar">lire l\'agenda</string>
+  <string name="app_ops_summaries_modify_calendar">modifier l\'agenda</string>
   <string name="app_ops_summaries_wifi_scan">Recherche du Wi-Fi</string>
   <string name="app_ops_summaries_notification">notification/toast</string>
   <string name="app_ops_summaries_cell_scan">scanner le réseau cellulaire</string>
@@ -346,6 +349,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_ops_summaries_toggle_bluetooth">activer/désactiver le Bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">démarrer au lancement</string>
   <string name="app_ops_summaries_toggle_nfc">activer/désactiver le NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">activer/désactiver les données mobiles</string>
   <string name="app_ops_summaries_superuser">accès root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Position approximative</string>
@@ -356,6 +360,8 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_ops_labels_modify_contacts">Modifier les contacts</string>
   <string name="app_ops_labels_read_call_log">Lire le journal d\'appels</string>
   <string name="app_ops_labels_modify_call_log">Modifier le journal d\'appels</string>
+  <string name="app_ops_labels_read_calendar">Lire l\'agenda</string>
+  <string name="app_ops_labels_modify_calendar">Modifier l\'agenda</string>
   <string name="app_ops_labels_wifi_scan">Recherche du Wi-Fi</string>
   <string name="app_ops_labels_notification">Notification/Toast</string>
   <string name="app_ops_labels_cell_scan">Recherche mobile</string>
@@ -413,6 +419,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_ops_labels_toggle_bluetooth">Activer/désactiver le Bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Démarrer au lancement</string>
   <string name="app_ops_labels_toggle_nfc">Activer/désactiver le NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Activer/désactiver les données mobiles</string>
   <string name="app_ops_labels_superuser">Accès root</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Autorisé</string>
@@ -757,6 +764,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="autoperf_summary">Choisir automatiquement le mode batterie le plus approprié pour les différentes applications</string>
   <string name="perf_profile_title">Mode batterie</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Applications lancées au démarrage</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Son de notification</string>
   <!-- Advanced reboot options -->
@@ -854,12 +862,14 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="menu_hidden_apps_delete">Réinitialiser</string>
   <string name="menu_hidden_apps_reset_lock">Réinitialiser schéma de déverrouillage</string>
   <string name="protected_apps">Applications protégées</string>
+  <string name="protected_apps_summary">Gérer les applications sécurisées</string>
   <string name="saving_protected_components">Enregistrement de l\'état du composant\u2026</string>
   <string name="pa_login_username_hint">Nom d\'utilisateur (e-mail)</string>
   <string name="pa_login_password_hint">Mot de passe</string>
   <string name="pa_login_submit_button">Connexion</string>
   <string name="pa_login_checking_password">Vérification du compte\u2026</string>
   <string name="pa_login_incorrect_login">Le nom d\'utilisateur est incorrect</string>
+  <string name="pa_pattern_or_fingerprint_header">Dessiner le schéma ou utiliser les empreintes digitales pour déverrouiller</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Contributeurs</string>
   <string name="contributors_cloud_loading_message">Chargement des infos des contributeurs\u2026</string>
@@ -888,11 +898,14 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Numéro de téléphone APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN dupliqué</string>
+  <string name="duplicate_apn_error_message">Cet APN existe déjà. Annuler ou modifier les paramètres.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> est <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">désactivée</string>
   <string name="sim_missing">manquante ou défectueuse</string>
   <string name="sim_enabler_need_disable_sim">La carte SIM va être désactivée. Voulez-vous continuer ?</string>
   <string name="sim_enabler_will_disable_sim_title">Attention</string>
+  <string name="sim_enabler_need_switch_data_service">Cette carte SIM sera désactivée et la SIM <xliff:g id="slotid">%1$s </xliff:g> sera utilisée pour les services de données. Êtes-vous sûr de vouloir continuer ?</string>
   <string name="sim_enabler_airplane_on">Impossible d\'effectuer l\'opération tant que le mode avion est activé.</string>
   <string name="sim_enabler_in_call">Impossible d\'effectuer l\'opération pendant un appel.</string>
   <string name="sim_enabler_both_inactive">Impossible de désactiver toutes les cartes SIM</string>
@@ -949,19 +962,36 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="factory_reset_warning_text_reset_now">RÉINITIALISER MAINTENANT</string>
   <string name="factory_reset_warning_text_message">Tous vos comptes, applications, données d\'applications ainsi que les paramètres système seront effacés de cet appareil. Cette action est irréversible.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Autre</string>
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_text">Délai de réponse du point d\'accès Wi\u2011Fi dépassé</string>
   <string name="hotstpot_inactivity_timeout_never">Jamais</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minute</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutes</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutes</string>
   <string name="hotstpot_inactivity_timeout_never_summary_text">Délai de réponse du point d\'accès Wi\u2011Fi n\'expirera jamais</string>
   <string name="hotstpot_inactivity_timeout_summary_text">Le délai de réponse du point d\'accès Wi\u2011Fi portable expirera après <xliff:g id="timeout">%1$s </xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Écran de verrouillage animé</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Activer et configurer les écrans de verrouillage animés</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Paramètres</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Pour afficher les écrans de verrouillage animés disponibles, activez-les.</string>
   <string name="interruptions_ignore_while_media_title">Empêcher l\'atténuation audio</string>
   <string name="interruptions_ignore_while_media_summary">Ne pas réduire le volume de lecture de médias lors d\'une notification</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Infos légales CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Réinitialiser les statistiques</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Les statistiques de la batterie vont être réinitialisées</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dock de batterie absent</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Chargement sur secteur du dock</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Chargement par l\'USB du dock</string>
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 247b457..6863f68 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -183,4 +183,9 @@
   <string name="live_lock_screen_settings_button">Ynstellingen</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-fy-rNL/strings.xml b/res/values-fy-rNL/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-fy-rNL/strings.xml
+++ b/res/values-fy-rNL/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-gd-rGB/strings.xml b/res/values-gd-rGB/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-gd-rGB/strings.xml
+++ b/res/values-gd-rGB/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 7651685..1eee349 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -429,4 +429,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-gu-rIN/cm_plurals.xml b/res/values-gu-rIN/cm_plurals.xml
new file mode 100644
index 0000000..dace938
--- /dev/null
+++ b/res/values-gu-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> સેકંડ</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> સેકન્ડ્સ</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">એક વખત</item>
+    <item quantity="other">%d વખત</item>
+  </plurals>
+</resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 5fd19c8..c7b400a 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">હવે તમે ડેવેલપમેન્ટ સેટિંગ્સ સક્ષમ કરવાથી <xliff:g id="step_count">%1$d</xliff:g> પગલા દૂર છો.</item>
+    <item quantity="other">હવે તમે ડેવેલપમેન્ટ સેટિંગ્સ સક્ષમ કરવાથી <xliff:g id="step_count">%1$d</xliff:g> પગલાં દૂર છો.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">તમે ડેવેલપમેન્ટ સેટિંગ્સ સક્ષમ કર્યું!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">જરૂર નથી, તમે ડેવેલપમેન્ટ સેટિંગ્સ સક્ષમ કરી ચુક્યા છો.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">વિકાસ સાધનો</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">ડેવેલપમેન્ટ શોર્ટકટ</string>
+  <string name="development_shortcut_summary">રિસન્ટ એપ્લિકેશન્સ સૂચીમાં એપ્લિકેશન મેનેજમેન્ટ શોર્ટકટ સક્ષમ કરો</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">રૂટ ઍક્સેસ</string>
+  <string name="root_access_warning_title">રૂટ ઍક્સેસની છૂટ આપવી છે?</string>
+  <string name="root_access_warning_message">ઍપ્સને રૂટ ઍક્સેસની છૂટ આપવી અતિશય ભયજનક છે જેનાથી તમારી સિસ્ટમની સુરક્ષા નબળી પડી શકે!</string>
+  <string name="root_access_none">અક્ષમ</string>
+  <string name="root_access_apps">ફકત એપ્લિકેશન્સ</string>
+  <string name="root_access_adb">ફક્ત ADB</string>
+  <string name="root_access_all">એપ્લિકેશન્સ અને ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">CyanogenMod સંસ્કરણ</string>
+  <string name="mod_version_default">અજાણ્યો</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">ડિવાઇસ મૉડેલ</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">ઉપકરણનું નામ</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API સ્તર</string>
+  <string name="mod_api_level_default">અજાણ્યો</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">બિલ્ડ તારીખ</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">CyanogenMod અપડેટો</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Cyanogen રિકવરી અપડેટ કરો</string>
+  <string name="update_recovery_summary">સિસ્ટમ અપડેટ્સથી રિકવરી અપડેટ કરો</string>
+  <string name="update_recovery_on_warning">સૂચના: જ્યારે આ લક્ષણ સક્ષમ કરવામાં આવે ત્યારે તમારી ઇન્સ્ટૉલ કરેલી રિકવરીની અવેજીમાં તે મૂકાશે જેમાં રનિંગ OS.\n\n ના વર્તમાન સંસ્કરણનો સમાવેશ હશે તમારી સિસ્ટમના અપગ્રેડની સાથે તમારી રિકવરી અપડેટ કરાશે જેથી ભાવિ સંસ્કરણો સાથેની સુસંગતતાની ખાતરી રહે.\n\nશું તમારે આ લક્ષણ સક્ષમ કરવું છે?</string>
+  <string name="update_recovery_off_warning">ચેતવણી: જ્યારે આ લક્ષણ અક્ષમ કરવામાં આવે ત્યારે તમારી ઇન્સ્ટૉલ કરેલ રિકવરી OS અપગ્રેડથી અપડેટ કરાશે નહીં.\n\nભાવિ OS અપડેટ વખતે આઉટડેટ થયેલ અથવા કસ્ટમ રિકવરી સંસ્કરણોથી ઇન્સ્ટૉલ થશે નહીં.\n\nશું તમારે ખરેખર આ લક્ષણ અક્ષમ કરવું છે?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">થીમ્સ</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">રિંગ મોડ</string>
+  <string name="ring_mode_normal">સામાન્ય</string>
+  <string name="ring_mode_vibrate">વાઇબ્રેટ</string>
+  <string name="ring_mode_mute">મ્યૂટ કરો</string>
+  <string name="settings_reset_button">ફરીથી સેટ કરો</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">સિસ્ટમ પ્રોફાઇલ્સ</string>
+  <string name="profiles_add">ઉમેરો</string>
+  <string name="profile_menu_delete">હટાવો</string>
+  <string name="profile_settings_title">પ્રોફાઇલ</string>
+  <string name="profile_empty_list_profiles_off">સિસ્ટમ પ્રોફાઇલ્સ કન્ફિગર કરવા અને ઉપયોગ કરવા, પ્રોફાઇલ્સ ચાલુ કરો.</string>
+  <string name="profile_trigger_configure">કન્ફિગર ટ્રિગર</string>
+  <string name="profile_write_nfc_tag">NFC ટેગ પર લખો</string>
+  <string name="profile_write_touch_tag">લખવા માટે ટૅગને ટચ કરો</string>
+  <string name="profile_write_success">સફળતાપૂર્વક ટૅગ લખાયો</string>
+  <string name="profile_write_failed">ટૅગ લખવામાં નિષ્ફળ થયા!</string>
+  <string name="profile_selected">પસંદ કરેલ પ્રોફાઇલ: %1$s</string>
+  <string name="profile_nfc_text">NFC ટૅગ પર પ્રોફાઇલ લખવાથી ટૅગ ઉપર ટૅપ કરવાથી પ્રોફાઇલ પસંદ કરવાની છૂટ મળે છે. બીજી વાર ટૅપ કરવાથી અગાઉ પસંદ કરેલ પ્રોફાઇલ પસંદ થાય છે.</string>
+  <string name="profile_unknown_nfc_tag">અજાણ્યો પ્રોફાઇલ</string>
+  <string name="profile_add_nfc_text">આ NFC ટૅગ અજાણી પ્રોફાઇલનો સંદર્ભ આપે છે. આ NFC ટૅગને હાજર પ્રોફાઇલ સાથે જોડવાથી ભવિષ્યમાં પ્રોફાઇલ પસંદ કરવાની છૂટ મળે છે.</string>
+  <string name="profile_select">પ્રોફાઇલ પસંદ કરો</string>
+  <string name="profile_remove_dialog_message">શું પ્રોફાઇલ %1$s દૂર કરવી છે?</string>
+  <string name="profile_populate_profile_from_state">શું હાલનાં ડિવાઇસ સેટિંગ્સનો ઉપયોગ કરીને પ્રોફાઇલ કન્ફિગર કરવી છે?</string>
+  <string name="profile_menu_fill_from_state">હાલનાં ડિવાઇસ સેટિંગ્સ આયાત કરો</string>
+  <string name="profile_remove_current_profile">હાલની પ્રોફાઇલ ભૂંસી ન શકાઇ!</string>
+  <string name="profile_app_group_category_title">સૂચના ઓવરરાઇડ</string>
+  <string name="profile_app_group_item_instructions">જૂથ ઍડ કરો અથવા કાઢી નાંખો</string>
+  <string name="profile_app_group_item_instructions_summary">આ પ્રોફાઇલ પરથી સૂચના ઓવરરાઇડ એપ્લિકેશન જૂથ ઍડ કરો અથવા કાઢી નાંખો</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">ચાલુ</string>
+  <string name="profile_entries_off">બંધ</string>
+  <string name="profile_entries_no_override">કોઇ ઓવરરાઇડ નહીં</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">નામ</string>
+  <string name="new_profile_name">&lt;નવી પ્રોફાઇલ&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">નામ બદલો</string>
+  <string name="rename_dialog_message">નવું નામ દાખલ કરો</string>
+  <string name="duplicate_appgroup_name">ડુપ્લીકેટ એપ્લિકેશન જૂથ નામ!</string>
+  <string name="rename_dialog_hint">પ્રોફાઇલ નામ દાખલ કરો</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">ફરીથી સેટ કરો</string>
+  <string name="profile_reset_message">તમામ ઉપયોગકર્તા દ્વારા સર્જિત પ્રોફાઇલો ભૂંસીને શું તે ડિફૉલ્ટ તરીકે પુન:સ્થાપિત કરવી છે?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">શું આ એપ્લિકેશન દૂર કરવું છે?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">વૉલ્યુમ ઓવરરાઇડ્સ</string>
+  <string name="connection_state_enabled">સક્ષમ કરો</string>
+  <string name="volume_override_summary">%1$s/%2$s પર સેટ કરો</string>
+  <string name="profile_volume_override_checkbox_label">ઓવરરાઇડ વૉલ્યુમ</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">પ્રોફાઇલ્સ</string>
+  <string name="profile_profile_manage">પ્રોફાઇલ વ્યવસ્થાપન કરો</string>
+  <string name="profile_appgroups_manage">એપ્લિકેશન જૂથો</string>
+  <string name="profile_appgroup_manage">એપ્લિકેશન સમૂહનું સંચાલન કરો</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">પ્રોફાઇલ સેટિંગ્સ</string>
+  <string name="profile_trigger_connect">ઑન કનેક્ટ કરો</string>
+  <string name="profile_trigger_disconnect">ઑન ડિસકનેક્ટ કરો</string>
+  <string name="profile_trigger_notrigger">કોઇ ટ્રિગર નહીં</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">સૂચના મોડ</string>
+  <string name="ringer_mode">રિંગ મોડ</string>
+  <string name="lights_mode">લાઇટ્સ મોડ</string>
+  <string name="vibrate_mode">વાઇબ્રેટ મોડ</string>
+  <string name="choose_soundtone">સૂચના ટોન પસંદ કરો</string>
+  <string name="choose_ringtone">રીંગટોન પસંદ કરો</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">સૂચના ટોન</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">એપ્લિકેશન જૂથો</string>
+  <string name="profile_applist_title">એપ્લિકેશન્સ</string>
+  <string name="profile_new_appgroup">નવું એપ્લિકેશન જૂથ</string>
+  <string name="profile_delete_appgroup">શું આ એપ્લિકેશન જૂથ ભૂંસવું છે?</string>
+  <string name="profile_appgroup_name_prompt">નવા એપ્લિકેશન જૂથ માટે નામ દાખલ કરો</string>
+  <string name="profile_appgroup_name_title">નામ</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">એપની પસંદગી કરો</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">સિસ્ટમ સેટિંગ્સ</string>
+  <string name="profile_lockmode_title">લૉક સ્ક્રીન મોડ</string>
+  <string name="profile_lockmode_policy_disabled_summary">ડિવાઇસ વ્યવસ્થાપક નીતિ દ્વારા આ પ્રોફાઇલ વિકલ્પ અક્ષમ કરવામાં આવ્યો છે</string>
+  <string name="profile_lockmode_insecure_summary">PIN અથવા પાસવર્ડ માટે પૂછશો નહીં</string>
+  <string name="profile_lockmode_disabled_summary">લૉક સ્ક્રીન અક્ષમ કરો</string>
+  <string name="profile_airplanemode_title">એરપ્લેન મોડ</string>
+  <string name="profile_brightness_title">સ્ક્રીન બ્રાઇટનેસ</string>
+  <string name="profile_brightness_override_summary">%1$d%% પર સેટ કરો</string>
+  <string name="profile_brightness_override_checkbox_label">ઓવરરાઇડ બ્રાઇટનેસ</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi-Fi</string>
+  <string name="toggleWifiAp">પોર્ટેબલ Wi-Fi હોટસ્પોટ</string>
+  <string name="toggleBluetooth">Bluetooth</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">ડેટા જોડાણો</string>
+  <string name="toggleSync">ડેટાને સ્વતઃ-સમન્વયિત કરો</string>
+  <string name="toggle2g3g4g">પસંદગીનો નેટવર્ક પ્રકાર</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi પ્રાંત કોડ</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fi માટે પ્રાંત કોડ વિશિષ્ટપણે જણાવો</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">પ્રાંત કોડ સેટ કરવામાં સમસ્યા થઈ.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">હટાવો</string>
+  <string name="profile_action_none">અપરિવર્તિત રહેવા દો</string>
+  <string name="profile_action_system">તંત્ર મૂળભુત</string>
+  <string name="profile_action_disable">બંધ કરો</string>
+  <string name="profile_action_enable">ચાલુ કરો</string>
+  <string name="profile_trigger_a2dp_connect">ઑન A2DP કનેક્ટ</string>
+  <string name="profile_trigger_a2dp_disconnect">ઑન A2DP ડિસકનેક્ટ</string>
+  <string name="profile_tabs_wifi">Wi-Fi</string>
+  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ટ્રિગર્સ જે આ પ્રોફાઇલ સક્રિય કરશે</string>
+  <string name="profile_setup_setup_triggers_title">પગલું 1: ટ્રિગર્સ ઍડ કરો</string>
+  <string name="profile_setup_setup_triggers_title_config">ટ્રિગર્સ બદલો: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">પગલું 2: સેટઅપ ક્રિયાઓ</string>
+  <string name="profile_setup_actions_title_config">ક્રિયાઓ પુન:કન્ફિગર કરો</string>
+  <string name="profile_appgroups_manage">એપ્લિકેશન જૂથો</string>
+  <string name="profile_appgroup_manage">એપ્લિકેશન સમૂહનું સંચાલન કરો</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">એપ્લિકેશન જૂથો</string>
+  <string name="profile_new_appgroup">નવું એપ્લિકેશન જૂથ</string>
+  <string name="profile_delete_appgroup">શું આ એપ્લિકેશન જૂથ ભૂંસવું છે?</string>
+  <string name="profile_appgroup_name_prompt">નવા એપ્લિકેશન જૂથ માટે નામ દાખલ કરો</string>
+  <string name="profile_appgroup_name_title">નામ</string>
+  <string name="duplicate_appgroup_name">ડુપ્લીકેટ એપ્લિકેશન જૂથ નામ!</string>
+  <string name="profile_app_delete_confirm">શું આ એપ્લિકેશન દૂર કરવું છે?</string>
+  <string name="no_bluetooth_triggers">કોઇ Bluetooth ડિવાઇસેસ પૅર થયા નથી.\nટ્રિગર કન્ફિગર કરતા પહેલાં Bluetooth ડિવાઇસ પૅર કરવા માટે ટૅપ કરો.</string>
+  <string name="no_wifi_triggers">કોઇ Wi\u2011Fi ઍક્સેસ પોઇન્ટ કન્ફિગર થયા નથી.\nટ્રિગર કન્ફિગર કરતા પહેલા Wi\u2011Fi ને જોડવા માટે ટૅપ કરો.</string>
+  <string name="no_triggers_configured">કોઇ ટ્રિગરો કન્ફિગર થયા નથી. વધુ ઉમેરવા માટે ટૅપ કરો.</string>
+  <string name="no_triggers_configured_nfc">નવું NFC ટ્રિગર સેટઅપ કરવા માટે ટૅપ કરો.</string>
+  <string name="profile_setup_setup_triggers_description">કૃપા કરીને ટ્રિગર્સ પસંદ કરો જે આ પ્રોફાઇલ સક્રિય કરશે</string>
+  <string name="profile_setup_actions_description">જ્યારે પ્રોફાઇલ સક્રિય થશે ત્યારે શું થશે તે કન્ફિગર કરો</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">નેવિગેશન પટ્ટી</string>
+  <string name="navigation_bar_left_title">ડાબોડી મોડ</string>
+  <string name="navigation_bar_left_summary">લૅન્ડસ્કેપ મોડમાં નેવિગેશન પટ્ટીને સ્ક્રીનની ડાબી બાજુ પર મૂકો</string>
+  <string name="navigation_bar_title">બટન્સ અને લેઆઉટ</string>
+  <string name="navigation_bar_help_text">એડિટિંગ માટે નેવિગેશન પટ્ટી અનલૉક કરવું શરૂ થાય તે માટે એડિટ આઇકૉન ટૅપ કરો.\n\nઆઇકૉનનાં શોર્ટકટને પરિવર્તન કરવા માટે તમે એના પર ટૅપ કરી શકો અથવા આઇકૉન ઉપર લાંબુ દબાણ આપવાથી લેઆઉટ પુન:ગોઠવી શકો.\n\nતમારા ફેરફારો કાયમી કરવા \'સેવ\' પર ટૅપ કરો અથવા લેઆઉટને ડિફૉલ્ટ સેટિંગ્સ પર રિસેટ કરવા \'રિસ્ટોર ડિફૉલ્ટ્સ\' પર ટૅપ કરો.</string>
+  <string name="navigation_restore_button_text">ડિફૉલ્ટ્સ\nપુન:સ્થાપિત કરો</string>
+  <string name="navigation_edit_button_text">સંપાદિત કરો</string>
+  <string name="navigation_save_button_text">સાચવો</string>
+  <string name="navigation_bar_reset_message">શું હાલનાં સેટિંગ્સ ભૂંસીને ડિફૉલ્ટ લેઆઉટ પુન:સ્થાપિત કરવું છે?</string>
+  <string name="navigation_bar_arrow_keys_title">ટાઇપ કરતી વખતે ઍરો કી દર્શાવો</string>
+  <string name="navigation_bar_arrow_keys_summary">ટાઇપ કરતી વખતે ડાબા અને જમણાં કર્સર બટનો દર્શાવો IME સ્વિચર ઓવરરાઇડ થશે.</string>
+  <string name="navigation_bar_recents_title">રિસન્ટ લાંબી દબાણ ક્રિયા</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">લાઇટ સેટિંગ્સ એડિટ કરો</string>
+  <string name="pulse_speed_title">પલ્સ લંબાઇ અને ઝડપ</string>
+  <string name="default_time">સામાન્ય</string>
+  <string name="custom_time">કસ્ટમ</string>
+  <string name="dialog_delete_title">હટાવો</string>
+  <string name="dialog_delete_message">શું પસંદ કરેલ આઇટમ દૂર કરવી છે?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">હંમેશાં ચાલુ</string>
+  <string name="pulse_length_very_short">અતિ ટૂંકા</string>
+  <string name="pulse_length_short">ટુંકુ</string>
+  <string name="pulse_length_normal">સામાન્ય</string>
+  <string name="pulse_length_long">લાંબુ</string>
+  <string name="pulse_length_very_long">અતિ લાંબા</string>
+  <string name="pulse_speed_very_fast">ખૂબ ઝડપી</string>
+  <string name="pulse_speed_fast">ઝડપી</string>
+  <string name="pulse_speed_normal">સામાન્ય</string>
+  <string name="pulse_speed_slow">ધીમે</string>
+  <string name="pulse_speed_very_slow">ખૂબ ધીમું</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">બેટરી લાઇટ</string>
+  <string name="battery_low_pulse_title">બેટરી ઉતરી હોય તો પલ્સ</string>
+  <string name="battery_light_list_title">રંગો</string>
+  <string name="battery_light_low_color_title">ઉતરેલ બેટરી</string>
+  <string name="battery_light_medium_color_title">ચાર્જ થઈ રહ્યું છે</string>
+  <string name="battery_light_full_color_title">સંપૂર્ણપણે ચાર્જ થયેલ</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">સૂચના લાઇટ</string>
+  <string name="notification_light_general_title">સામાન્ય</string>
+  <string name="notification_light_applist_title">એપ્લિકેશન્સ</string>
+  <string name="notification_light_phonelist_title">ફોન</string>
+  <string name="notification_light_use_custom">કસ્ટમ મૂલ્યો વાપરો</string>
+  <string name="notification_light_default_value">ડિફોલ્ટ</string>
+  <string name="notification_light_missed_call_title">ચૂકાઇ ગયેલ કોલ</string>
+  <string name="notification_light_voicemail_title">વૉઇસમેઇલ</string>
+  <string name="notification_light_screen_on">લાઇટ્સ સહ: સ્ક્રીન ચાલુ</string>
+  <string name="notification_light_zen_mode">ખલેલ પાડશો નહીં સ્થિતિમાં પ્રકાશ</string>
+  <string name="notification_light_use_multiple_leds">બહુવિધ LEDs</string>
+  <string name="keywords_lights_brightness_level">તેજહીન led બ્રાઇટનેસ</string>
+  <string name="notification_light_automagic">રંગો આપમેળે પસંદ કરો</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">લાઇટ સેટિંગ્સ</string>
+  <string name="led_notification_text">સેટિંગ્સ દ્વારા LED લાઇટ સક્ષમ થઈ</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">એન્ડ્રૉઇડ ડિબગિંગ</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">એન્ડ્રૉઇડ ડિબગ બ્રિજ (adb) ઇન્ટરફેસ સક્ષમ કરો</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">નેટવર્ક પર ADB</string>
+  <string name="adb_over_network_summary">નેટવર્ક ઇન્ટરફેસિસ (Wi\u2011Fi, USB નેટવર્કસ) પર TCP/IP ડિબગિંગ સક્ષમ કરો. રિબૂટ કરવાથી આ સેટિંગ રિસેટ થાય છે</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">ચેતવણી: જ્યારે નેટવર્ક પર ADB સક્ષમ કરવામાં આવે, ત્યારે તમારો ફોન તમામ જોડાયેલ નેટવર્કો પરથી અતિક્રમણો મેળવવા ખુલ્લું પડે છે!\n\nઆ લક્ષણ ફક્ત ત્યારે જ વાપરો જ્યારે તમે વિશ્વસનીય નેટવર્કથી જોડાયેલા હોવ.\n\nશું તમારે ખરેખર આ ક્રિયા સક્ષમ કરવી છે?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">ડિબગિંગ સૂચન કરો</string>
+  <string name="adb_notify_summary">જ્યારે USB અથવા નેટવર્ક ડિબગિંગ સક્ષમ કરવામાં આવે ત્યારે સૂચનાઓ પ્રદર્શન કરો</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">સ્થાન</string>
+  <string name="app_ops_categories_personal">વ્યક્તિગત</string>
+  <string name="app_ops_categories_messaging">મેસેજિંગ</string>
+  <string name="app_ops_categories_media">મીડિયા</string>
+  <string name="app_ops_categories_device">ઉપકરણ</string>
+  <string name="app_ops_categories_bootup">બૂટઅપ</string>
+  <string name="app_ops_categories_su">રૂટ ઍક્સેસ</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">અવ્યવસ્થિત સ્થાન</string>
+  <string name="app_ops_summaries_fine_location">સુંદર સ્થળ</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">વાઇબ્રેટ</string>
+  <string name="app_ops_summaries_read_contacts">સંપર્કો વાંચો</string>
+  <string name="app_ops_summaries_modify_contacts">સંપર્કો બદલો</string>
+  <string name="app_ops_summaries_read_call_log">કૉલ લૉગ વાંચો</string>
+  <string name="app_ops_summaries_modify_call_log">કૉલ લૉગ બદલો</string>
+  <string name="app_ops_summaries_read_calendar">કૅલેન્ડર વાંચો</string>
+  <string name="app_ops_summaries_modify_calendar">કૅલેન્ડર બદલો</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi સ્કૅન</string>
+  <string name="app_ops_summaries_notification">સૂચના/ટોસ્ટ</string>
+  <string name="app_ops_summaries_cell_scan">કોલ સ્કેન</string>
+  <string name="app_ops_summaries_call_phone">કૉલ ફોન</string>
+  <string name="app_ops_summaries_read_sms">SMS વાંચો</string>
+  <string name="app_ops_summaries_write_sms">SMS લખો</string>
+  <string name="app_ops_summaries_receive_sms">SMS  મેળવો</string>
+  <string name="app_ops_summaries_receive_emergency_sms">તત્કાલીન SMS મેળવે છે</string>
+  <string name="app_ops_summaries_receive_mms">MMS મેળવે છે</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP પુશ મેળવો</string>
+  <string name="app_ops_summaries_send_sms">SMS મોકલો</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS વાંચો</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS લખો</string>
+  <string name="app_ops_summaries_modify_settings">સેટિંગ્સ બદલો</string>
+  <string name="app_ops_summaries_draw_on_top">ટોચ પર દોરો</string>
+  <string name="app_ops_summaries_access_notifications">ઍક્સેસ સૂચનાઓ</string>
+  <string name="app_ops_summaries_camera">કેમેરા</string>
+  <string name="app_ops_summaries_record_audio">ઑડિઓ રેકોર્ડ કરો</string>
+  <string name="app_ops_summaries_play_audio">ઓડિયો પ્લે કરો</string>
+  <string name="app_ops_summaries_read_clipboard">ક્લિપબોર્ડ વાંચો</string>
+  <string name="app_ops_summaries_modify_clipboard">ક્લિપબોર્ડ બદલો</string>
+  <string name="app_ops_summaries_media_buttons">મિડિયા બટનો</string>
+  <string name="app_ops_summaries_audio_focus">ઑડિયો ફોકસ</string>
+  <string name="app_ops_summaries_master_volume">માસ્ટર વૉલ્યુમ</string>
+  <string name="app_ops_summaries_voice_volume">વૉઇસ વૉલ્યુમ</string>
+  <string name="app_ops_summaries_ring_volume">રિંગ વૉલ્યુમ</string>
+  <string name="app_ops_summaries_media_volume">મિડિયા વૉલ્યુમ</string>
+  <string name="app_ops_summaries_alarm_volume">અલાર્મ વૉલ્યુમ</string>
+  <string name="app_ops_summaries_notification_volume">સૂચના વૉલ્યુમ</string>
+  <string name="app_ops_summaries_bluetooth_volume">bluetooth વોલ્યુમ</string>
+  <string name="app_ops_summaries_keep_awake">જાગતા રહો</string>
+  <string name="app_ops_summaries_monitor_location">સ્થાન દેખરેખ કરો</string>
+  <string name="app_ops_summaries_monitor_high_power_location">ઉચ્ચ શક્તિ સ્થાન દેખરેખ કરો</string>
+  <string name="app_ops_summaries_get_usage_stats">વપરાશ આંકડા મેળવો</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">માઇક્રોફોન મ્યુટ/અનમ્યુટ કરો</string>
+  <string name="app_ops_summaries_toast_window">ટોસ્ટ્સ દર્શાવો</string>
+  <string name="app_ops_summaries_project_media">પ્રોજેક્ટ મીડિયા</string>
+  <string name="app_ops_summaries_activate_vpn">VPN સક્રિય કરો</string>
+  <string name="app_ops_summaries_write_wallpaper">વૉલ પેપર લખો</string>
+  <string name="app_ops_summaries_assist_structure">અસિસ્ટ સ્ટ્રકચર</string>
+  <string name="app_ops_summaries_assist_screenshot">અસિસ્ટ સ્ક્રીનશૉટ</string>
+  <string name="app_ops_summaries_read_phone_state">ફોન સ્થિતિ વાંચો</string>
+  <string name="app_ops_summaries_add_voicemail">વૉઇસમેઇલ ઉમેરો</string>
+  <string name="app_ops_summaries_use_sip">SIP વાપરો</string>
+  <string name="app_ops_summaries_make_call">કૉલ કરો</string>
+  <string name="app_ops_summaries_use_fingerprint">ફિંગરપ્રિન્ટ વાપરો</string>
+  <string name="app_ops_summaries_use_body_sensors">બૉડિ સેન્સર્સ વાપરો</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">સેલ પ્રસારણો વાંચો</string>
+  <string name="app_ops_summaries_mock_location">કૃત્રિમ સ્થાન મૂકો</string>
+  <string name="app_ops_summaries_read_external_storage">બાહ્ય સંગ્રહ વાંચો</string>
+  <string name="app_ops_summaries_write_external_storage">બાહ્ય સંગ્રહ પર લખો</string>
+  <string name="app_ops_summaries_turn_screen_on">સ્ક્રીન ચાલુ કરો</string>
+  <string name="app_ops_summaries_get_accounts">ખાતા મેળવો</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi ટૉગલ કરો</string>
+  <string name="app_ops_summaries_toggle_bluetooth">bluetooth ટૉગલ કરો</string>
+  <string name="app_ops_summaries_start_at_boot">બૂટ પર શરૂ કરો</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC ટૉગલ કરો</string>
+  <string name="app_ops_summaries_toggle_mobile_data">મોબાઇલ ડેટા ટૉગલ કરો</string>
+  <string name="app_ops_summaries_superuser">રૂટ ઍક્સેસ</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">કોર્સ લોકેશન</string>
+  <string name="app_ops_labels_fine_location">ફાઇન લોકેશન</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">વાઇબ્રેટ</string>
+  <string name="app_ops_labels_read_contacts">સંપર્કો વાંચો</string>
+  <string name="app_ops_labels_modify_contacts">સંપર્કો ફેરફાર કરો</string>
+  <string name="app_ops_labels_read_call_log">કૉલ લૉગ વાંચો</string>
+  <string name="app_ops_labels_modify_call_log">કોલ વિગત ફેરફાર કરો</string>
+  <string name="app_ops_labels_read_calendar">કેલેન્ડર વાંચો</string>
+  <string name="app_ops_labels_modify_calendar">કેલેન્ડર ફેરફાર કરો</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi સ્કૅન</string>
+  <string name="app_ops_labels_notification">સૂચના/ટોસ્ટ</string>
+  <string name="app_ops_labels_cell_scan">સેલ સ્કૅન</string>
+  <string name="app_ops_labels_call_phone">ફોન કોલ કરો</string>
+  <string name="app_ops_labels_read_sms">SMS વાંચો</string>
+  <string name="app_ops_labels_write_sms">SMS લખો</string>
+  <string name="app_ops_labels_receive_sms">SMS મેળવો</string>
+  <string name="app_ops_labels_receive_emergency_sms">કટોકટી SMS મેળવો</string>
+  <string name="app_ops_labels_receive_mms">MMS મેળવો છે</string>
+  <string name="app_ops_labels_receive_wap_push">WAP પુશ પ્રાપ્ત કરો</string>
+  <string name="app_ops_labels_send_sms">SMS મોકલો</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS વાંચો</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS લખો</string>
+  <string name="app_ops_labels_modify_settings">સેટિંગ્સ ફેરફાર કરો</string>
+  <string name="app_ops_labels_draw_on_top">ઉપરની તરફ ખેંચો</string>
+  <string name="app_ops_labels_access_notifications">સૂચનાઓ ઍક્સેસ કરો</string>
+  <string name="app_ops_labels_camera">કૅમેરો</string>
+  <string name="app_ops_labels_record_audio">ઓડિયો રેકોર્ડ કરો</string>
+  <string name="app_ops_labels_play_audio">ઓડિયો પ્લે કરો</string>
+  <string name="app_ops_labels_read_clipboard">કલીપબોર્ડ વાંચો</string>
+  <string name="app_ops_labels_modify_clipboard">ક્લિપબોર્ડ ફેરફાર કરો</string>
+  <string name="app_ops_labels_media_buttons">મીડિયા બટનો</string>
+  <string name="app_ops_labels_audio_focus">ઓડિયો ફોકસ</string>
+  <string name="app_ops_labels_master_volume">માસ્ટર વોલ્યુમ</string>
+  <string name="app_ops_labels_voice_volume">વોઇઝ વોલ્યુમ</string>
+  <string name="app_ops_labels_ring_volume">રિંગ વોલ્યુમ</string>
+  <string name="app_ops_labels_media_volume">મીડિયા વોલ્યુમ</string>
+  <string name="app_ops_labels_alarm_volume">એલાર્મ વોલ્યુમ</string>
+  <string name="app_ops_labels_notification_volume">સૂચના વૉલ્યૂમ</string>
+  <string name="app_ops_labels_bluetooth_volume">Bluetooth વૉલ્યૂમ</string>
+  <string name="app_ops_labels_keep_awake">જાગૃત રહો</string>
+  <string name="app_ops_labels_monitor_location">લોકેશના મૉનિટર કરો</string>
+  <string name="app_ops_labels_monitor_high_power_location">હાઇ પાવર લોકેશન મૉનિટર કરો</string>
+  <string name="app_ops_labels_get_usage_stats">વપરાશ સ્થિતિ મેળવો</string>
+  <string name="app_ops_labels_mute_unmute_microphone">માઇક્રોફોન મૌન/ ચાલુ કરો</string>
+  <string name="app_ops_labels_toast_window">ટોસ્ટ્સ દર્શાવો</string>
+  <string name="app_ops_labels_project_media">પ્રકલ્પ માધ્યમ</string>
+  <string name="app_ops_labels_activate_vpn">VPN સક્રિય કરો</string>
+  <string name="app_ops_labels_write_wallpaper">વૉલ પેપર લખો</string>
+  <string name="app_ops_labels_assist_structure">અસિસ્ટ સ્ટ્રકચર</string>
+  <string name="app_ops_labels_assist_screenshot">અસિસ્ટ સ્ક્રીનશૉટ</string>
+  <string name="app_ops_labels_read_phone_state">ફોન સ્થિતિ વાંચો</string>
+  <string name="app_ops_labels_add_voicemail">વૉઇસમેઇલ ઍડ કરો</string>
+  <string name="app_ops_labels_use_sip">SIP વાપરો</string>
+  <string name="app_ops_labels_make_call">કૉલ કરો</string>
+  <string name="app_ops_labels_use_fingerprint">ફિંગરપ્રિન્ટ વાપરો</string>
+  <string name="app_ops_labels_use_body_sensors">બૉડિ સેન્સર્સ વાપરો</string>
+  <string name="app_ops_labels_read_cell_broadcasts">સેલ પ્રસારણો વાંચો</string>
+  <string name="app_ops_labels_mock_location">કૃત્રિમ સ્થાન મૂકો</string>
+  <string name="app_ops_labels_read_external_storage">બાહ્ય સંગ્રહ વાંચો</string>
+  <string name="app_ops_labels_write_external_storage">બાહ્ય સંગ્રહ પર લખો</string>
+  <string name="app_ops_labels_turn_screen_on">સ્ક્રીન ચાલુ કરો</string>
+  <string name="app_ops_labels_get_accounts">ખાતા મેળવો</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi ટૉગલ કરો</string>
+  <string name="app_ops_labels_toggle_bluetooth">bluetooth ટૉગલ કરો</string>
+  <string name="app_ops_labels_start_at_boot">બૂટ પર શરૂ કરો</string>
+  <string name="app_ops_labels_toggle_nfc">NFC ટૉગલ કરો</string>
+  <string name="app_ops_labels_toggle_mobile_data">મોબાઇલ ડેટા ટૉગલ કરો</string>
+  <string name="app_ops_labels_superuser">રૂટ ઍક્સેસ</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">અનુમતિ પ્રાપ્ત</string>
+  <string name="app_ops_permissions_ignored">અવગણવામાં આવ્યું</string>
+  <string name="app_ops_permissions_always_ask">હંમેશાં પૂછો</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (<xliff:g id="count">%2$s</xliff:g> વપરાયું)</string>
+  <string name="app_ops_allowed_count">મંજૂર <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">નકારાયું <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">મંજૂર <xliff:g id="count">%1$s</xliff:g>, નકારાયું <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">ઉપયોગકર્તા એપ્લિકેશન્સ દર્શાવો</string>
+  <string name="app_ops_show_system_apps">બિલ્ટ-ઇન એપ્લિકેશન્સ દર્શાવો</string>
+  <string name="app_ops_reset_counters">હકાર/નકાર કાઉન્ટરો રિસેટ કરો</string>
+  <string name="app_ops_reset_confirm_title">કાઉન્ટર રિસેટની પુષ્ટિ કરો</string>
+  <string name="app_ops_reset_confirm_mesg">શું તમને ખાતરી છે કે તમારે કાઉન્ટર રિસેટ કરવા છે?</string>
+  <string name="ok">ઑકે</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">ડિવાઇસ હોસ્ટનેમ</string>
+  <string name="unlock_scramble_pin_layout_title">લેઆઉટ આમતેમ કરો</string>
+  <string name="unlock_scramble_pin_layout_summary">ડિવાઇસ અનલૉક કરો ત્યારે PIN લેઆઉટ આમતેમ કરો</string>
+  <string name="button_pref_title">બટન્સ</string>
+  <string name="hardware_keys_power_key_title">પાવર બટન</string>
+  <string name="hardware_keys_home_key_title">હોમ બટન</string>
+  <string name="hardware_keys_back_key_title">બૅક બટન</string>
+  <string name="hardware_keys_menu_key_title">મેનુ બટન</string>
+  <string name="hardware_keys_assist_key_title">સર્ચ બટન</string>
+  <string name="hardware_keys_appswitch_key_title">રિસન્ટ બટન</string>
+  <string name="hardware_keys_camera_key_title">કેમેરા બટન</string>
+  <string name="hardware_keys_volume_keys_title">વોલ્યુમ બટનો</string>
+  <string name="hardware_keys_short_press_title">ટૂંકી દબાણ ક્રિયા</string>
+  <string name="hardware_keys_long_press_title">લાંબી દબાણ ક્રિયા</string>
+  <string name="hardware_keys_double_tap_title">બેવડી ટૅપ ક્રિયા</string>
+  <string name="hardware_keys_action_nothing">કોઇ કાર્યવાહી નહીં</string>
+  <string name="hardware_keys_action_menu">ખુલ્લું/બંધ મેન્યૂ</string>
+  <string name="hardware_keys_action_app_switch">તાજેતરની એપ્લિકેશન્સ સ્વિચર</string>
+  <string name="hardware_keys_action_search">સર્ચ સહાયક</string>
+  <string name="hardware_keys_action_voice_search">વૉઇસ શોધ</string>
+  <string name="hardware_keys_action_in_app_search">ઇન-એપ્લિકેશન સર્ચ</string>
+  <string name="hardware_keys_action_launch_camera">કેમેરા લૉન્ચ કરો</string>
+  <string name="hardware_keys_action_sleep">સ્ક્રીન બંધ કરો.</string>
+  <string name="hardware_keys_action_last_app">છેલ્લી એપ્લિકેશન</string>
+  <string name="camera_sleep_on_release_title">સ્ક્રીન ર્દષ્ટિપાત</string>
+  <string name="camera_sleep_on_release_summary">અડધું દબાણ આપવાથી બટન દબાવી રાખવામાં આવે ત્યાં સુધીજ સ્ક્રીન ચાલુ રહેશે</string>
+  <string name="camera_launch_title">કેમેરા લૉન્ચ કરો</string>
+  <string name="camera_launch_summary">લાંબુ દબાણ આપીને છોડી દેવાથી કેમેરા લોન્ચ થશે</string>
+  <string name="volbtn_music_controls_title">પ્લેબૅક નિયંત્રણ</string>
+  <string name="volbtn_music_controls_summary">જ્યારે સ્ક્રીન બંધ હોય ત્યારે વૉલ્યુમ કી પર લાંબુ દબાણ આપવાથી સંગીતના ટ્રૅક્સની શોધ થશે</string>
+  <string name="volbtn_cursor_control_title">કીબોર્ડ કર્સર નિયંત્રણ</string>
+  <string name="volbtn_cursor_control_off">અક્ષમ</string>
+  <string name="volbtn_cursor_control_on">વૉલ્યુમ ઉપર/નીચે તે કર્સરને ડાબે/જમણે કરશે</string>
+  <string name="volbtn_cursor_control_on_reverse">વૉલ્યુમ ઉપર/નીચે તે કર્સરને જમણે/ડાબે કરશે</string>
+  <string name="power_end_call_title">કૉલ સમાપ્ત કરો</string>
+  <string name="power_end_call_summary">પાવર બટન દબાવવાથી હાલના કૉલની સમાપ્તિ થશે</string>
+  <string name="swap_volume_buttons_title">પુન: સ્થિતિ સ્થાપન</string>
+  <string name="swap_volume_buttons_summary">જ્યારે સ્ક્રીન ફેરવવામાં આવે ત્યારે વૉલ્યુમ બટનોની અદલાબદલી કરો</string>
+  <string name="button_wake_title">વેક અપ ડિવાઇસ</string>
+  <string name="home_answer_call_title">કૉલનો જવાબ આપો</string>
+  <string name="home_answer_call_summary">હોમ બટન દબાવવાથી હાલના કૉલનો જવાબ આપી શકાશે</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">અનુકૂલનશીલ બૅકલાઇટ</string>
+  <string name="adaptive_backlight_summary">ઉપયોગિતાને જાળવી રાખીને બૅટરીની આવરદા મહત્તમ કરવા માટે પ્રદર્શનની બૅકલાઇટની બ્રાઇટનેસને ગતિશીલતાથી સમાયોજિત કરો</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">સનલાઇટ ઉન્નતિ</string>
+  <string name="sunlight_enhancement_summary">તેજ તડકામાં પ્રદર્શનની બ્રાઇટનેસ અને વંચાવાની ક્ષમતા વિસ્તૃત કરો</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">રંગ વર્ધન</string>
+  <string name="color_enhancement_summary">પ્રદર્શનના રંગ ગતિશીલતાથી વિસ્તૃત કરો</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">બેકલાઇટ</string>
+  <string name="button_backlight_enabled">બટનો પ્રકાશિત કરો</string>
+  <string name="keyboard_backlight_enabled">કિબોર્ડ પ્રકાશિત કરો</string>
+  <string name="button_backlight_seekbar_title">બટન બ્રાઇટનેસ</string>
+  <string name="keyboard_backlight_seekbar_title">કિબોર્ડ બ્રાઇટનેસ</string>
+  <string name="backlight_timeout_title">સમયસમાપ્તિ પ્રકાશિત કરો</string>
+  <string name="backlight_timeout_unlimited">બંધ કરશો નહીં</string>
+  <string name="backlight_summary_disabled">અક્ષમ</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g> માટે સક્ષમ કર્યું</string>
+  <string name="backlight_summary_enabled">સક્ષમ કરેલ</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">જેસ્ચર</string>
   <!-- Power menu -->
+  <string name="power_menu_title">પાવર મેન્યૂ</string>
+  <string name="power_menu_reboot_title">રિબુટ મેન્યૂ</string>
+  <string name="power_menu_screenshot_title">સ્ક્રિનશોટ</string>
+  <string name="power_menu_airplane_title">એરપ્લેન મોડ</string>
+  <string name="power_menu_users_title">ઉપયોગકર્તા સ્વિચર</string>
+  <string name="power_menu_settings_title">સેટિંગ્સ શૉર્ટકટ</string>
+  <string name="power_menu_lockdown_title">ડિવાઇસ લૉકડાઉન</string>
+  <string name="power_menu_bug_report_title">બગ રિપોર્ટ</string>
+  <string name="power_menu_sound_title">ધ્વનિ પૅનલ</string>
+  <string name="power_menu_bug_report_disabled">ડેવેલપમેન્ટ સેટિંગ્સમાં બગ અહેવાલીકરણ અક્ષમ કરવામાં આવ્યું છે</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">ઑન સ્ક્રીન નૅવ બાર સક્ષમ કરો</string>
+  <string name="disable_navkeys_summary">ઑન સ્ક્રીન નેવિગેશન પટ્ટી સક્ષમ કરો અને હાર્ડવેર બટન્સ અક્ષમ કરો</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">સ્લીપ માટે ડબલ-ટૅપ કરો</string>
+  <string name="double_tap_to_sleep_summary">પ્રદર્શન બંધ કરવા સ્ટેટસ બાર પર ડબલ-ટૅપ કરો</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">આકસ્મિક વેક અપ રોકો</string>
+  <string name="proximity_wake_summary">સ્ક્રીન જગાવતા પહેલાં પ્રોક્સિમિટી સેન્સર ચકાસો</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">વેક ઑન પ્લગ</string>
+  <string name="wake_when_plugged_or_unplugged_summary">પાવર સ્ત્રોત જોડો અથવા પરવાનગીું પાડો ત્યારે સ્ક્રીન ચાલુ કરો</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">નમૂનો</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">વૉલ્યુમ સમાયોજન ધ્વનિ</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">વાઇબ્રેટર તીવ્રતા</string>
+  <string name="vibrator_warning">%1$d કરતા વધુ મૂલ્યોની ભલામણ કરવામાં આવતી નથી</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">રંગ અનુમાપન</string>
+  <string name="color_calibration_summary">સ્ક્રીન રંગો પર અનુમાપન કરો</string>
+  <string name="color_red_title">લાલ</string>
+  <string name="color_green_title">લીલો</string>
+  <string name="color_blue_title">વાદળી</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">ગામા અનુમાપન</string>
+  <string name="gamma_tuning_summary_head">ગામા મૂલ્યો મરડો</string>
+  <string name="gamma_tuning_control_set_header">જૂથ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">વિપરીત</string>
+  <string name="gamma_tuning_brightness">તેજ</string>
+  <string name="gamma_tuning_saturation">સંતૃપ્તિ</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
+  <string name="headset_connect_player_summary">જ્યારે હેડસેટ જોડાયેલ હોય ત્યારે ડિફૉલ્ટ મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">સ્વયંચાલિત અગ્રતા</string>
+  <string name="auto_brightness_reset_button">ફરીથી સેટ કરો</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">પરિભ્રમણ</string>
+  <string name="display_rotation_disabled">અક્ષમ</string>
+  <string name="display_rotation_unit">અંશ</string>
+  <string name="display_lockscreen_rotation_title">લૉક સ્ક્રીન ફેરવો</string>
+  <string name="display_rotation_category_title">પરિભ્રમણ મોડ્સ</string>
+  <string name="display_rotation_0_title">0 અંશ</string>
+  <string name="display_rotation_90_title">90 અંશ</string>
+  <string name="display_rotation_180_title">180 અંશ</string>
+  <string name="display_rotation_270_title">270 અંશ</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">સ્ક્રીન રંગ</string>
+  <string name="screencolor_summary">સ્ક્રીનના રંગ, સંતૃપ્તિ, કૉન્ટ્રાસ્ટ અથવા તીવ્રતાને ટ્યુન કરો</string>
+  <string name="custom_screencolor">કસ્ટમ સ્ક્રીન રંગ</string>
+  <string name="screencolor_save">સાચવો</string>
+  <string name="screencolor_cancel">રદ કરો</string>
+  <string name="restore_preview">ડિફૉલ્ટ ચિત્ર જુઓ</string>
+  <string name="selectnewfile_menu">ગૅલરીમાંથી નવું ચિત્ર જુઓ</string>
+  <string name="selectfile_menu">ગૅલરીમાંથી ચિત્ર જુઓ</string>
+  <string name="restore_default_str">ફરીથી સેટ કરો</string>
+  <string name="hue_str">રંગ: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">સંતૃપ્તિ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">કૉન્ટ્રાસ્ટ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">ઉત્કટતા: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">વાંચન ક્ષમતામાં સુધારો લાવવા અને આંખો પરનો તાણ ઘટાડવા દિવસનો સમય અને વ્યાપક હવામાનનાં આધારે તમારા સ્ક્રીનને અનુકૂળ બનાવો</string>
+  <string name="live_display_mode">પ્રદર્શન મોડ</string>
+  <string name="live_display_color_temperature_title">રંગ તાપમાન</string>
+  <string name="live_display_color_temperature_summary">દિવસ: <xliff:g id="day_temperature">%1$d</xliff:g>K રાત્રિ: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">દિવસ</string>
+  <string name="live_display_night">રાત્રિ</string>
+  <string name="live_display_outdoor_mode_title">સ્વયંચાલિત આઉટડોર મોડ</string>
+  <string name="live_display_outdoor_mode_summary">તેજ તડકા હેઠળ સ્વયંચાલિત રીતે બ્રાઇટનેસ અને સંતૃપ્તિમાં વધારો કરો</string>
+  <string name="live_display_low_power_title">ઊર્જા વપરાશ ઘટાડો</string>
+  <string name="live_display_low_power_summary">ગુણવત્તાના ઘટાડા વિના પ્રદર્શનને સૌથી ઓછા ઊર્જા વપરાશ માટે સમાયોજિત કરો</string>
+  <string name="live_display_enhance_color_title">રંગ વિસ્તૃત કરો</string>
+  <string name="live_display_enhance_color_summary">ફ્લેશ ટોન, સિનરી અને અન્ય ચિત્રોની રંગ તેજસ્વિતામાં સુધારો કરો</string>
+  <string name="live_display_color_profile_title">રંગ પ્રોફાઇલ</string>
+  <string name="live_display_color_profile_standard_title">પ્રમાણભૂત</string>
+  <string name="live_display_color_profile_standard_summary">સચોટ રંગો અને તેજસ્વી સફેદ</string>
+  <string name="live_display_color_profile_natural_title">નેચરલ</string>
+  <string name="live_display_color_profile_natural_summary">વાસ્તવિક રંગો અને ફ્લેશ ટોન્સ</string>
+  <string name="live_display_color_profile_dynamic_title">ડાયનામિક</string>
+  <string name="live_display_color_profile_dynamic_summary">ઉન્નત રંગો અને તેજસ્વી સફેદ</string>
+  <string name="live_display_color_profile_cinema_title">સિનેમા</string>
+  <string name="live_display_color_profile_cinema_summary">વિડિયો માટે સચોટ રંગ પુન:નિર્મિતી</string>
+  <string name="live_display_color_profile_astronomy_title">ખગોળશાસ્ત્ર</string>
+  <string name="live_display_color_profile_astronomy_summary">નાઇટ વિઝન સાચવવા ઘાટો લાલ</string>
+  <string name="live_display_color_profile_photography_title">ફોટોગ્રાફિ</string>
+  <string name="live_display_color_profile_photography_summary">ફોટા માટે સચોટ રંગ પુન:નિર્મિતી</string>
+  <string name="live_display_color_profile_basic_title">બેઝિક</string>
+  <string name="live_display_color_profile_basic_summary">અનુમાપન કર્યા વિના પ્રદર્શનનો ઉપયોગ કરો</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">પસંદકર્તા આઇકૉન</string>
+  <string name="ime_switcher_notify_summary">ઇનપુટ પદ્ધતિ પસંદકર્તા આઇકૉન દર્શાવો</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">હેડ્સ અપ</string>
+  <string name="summary_heads_up_enabled">પૉપ-અપ સૂચનાઓ સક્ષમ કર્યા છે</string>
+  <string name="summary_heads_up_disabled">પૉપ-અપ સૂચનાઓ અક્ષમ કર્યા છે</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">તમામ ફાઇલ પ્રકારો સ્વીકારો</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">ઉચ્ચ ટચ સંવેદનશીલતા</string>
+  <string name="high_touch_sensitivity_summary">ટચસ્ક્રીન સંવેદનશીલતા વધારો જેથી હાથમોજા પહેરીને તેનો ઉપયોગ થઈ શકે</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD ઘનતા</string>
+  <string name="dialog_title_lcd_density">LCD ઘનતા</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (ડિફૉલ્ટ)</string>
+  <string name="restarting_ui">પુન: પ્રારંભ થાય છે UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">સ્ટાયલસનો ઉપયોગ કરો ત્યારે આઇકૉન દર્શાવો</string>
+  <string name="stylus_icon_enabled_summary">સ્ટાયલસ સાથે ભમો અથવા ચિત્ર દોરતી વખતે પોઇન્ટર આઇકૉન દર્શાવો</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">સ્ટાયલસ જેસ્ચર</string>
+  <string name="category_spen_title">સ્ટાયલસ જેસ્ચર</string>
+  <string name="enable_subcat_title">સ્ટાયલસ</string>
+  <string name="enable_spen_title_head">જેસ્ચર સક્ષમ કરો</string>
+  <string name="enable_spen_summary_head">સ્ટાયલસ બટનને દબાવી રાખી સ્વાઇપ અંગસ્થિતિઓનો ઉપયોગ કરો</string>
+  <string name="gestures_subcat_title">જેસ્ચર</string>
+  <string name="gestures_left_spen_title_head">ડાબી સ્વાઇપ</string>
+  <string name="gestures_right_spen_title_head">જમણી સ્વાઇપ</string>
+  <string name="gestures_up_spen_title_head">ઉપર સ્વાઇપ</string>
+  <string name="gestures_down_spen_title_head">નીચે સ્વાઇપ</string>
+  <string name="gestures_long_spen_title_head">લાંબું દબાણ</string>
+  <string name="gestures_double_spen_title_head">ડબલ ટૅપ</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">કોઇ કાર્યવાહી નહીં</string>
+  <string name="gestures_action_home">ઘર</string>
+  <string name="gestures_action_back">પાછળ</string>
+  <string name="gestures_action_menu">મેનુ</string>
+  <string name="gestures_action_search">સર્ચનું આહવાન કરો</string>
+  <string name="gestures_action_recent">તાજેતરની એપ્સ</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s ઇન્સ્ટૉલ થયું નહીં</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">ટચસ્ક્રીન ભમવું</string>
+  <string name="touchscreen_hovering_summary">વેબ બ્રાઉઝરો, રિમોટ ડેસ્કટૉપ વગેરેમાં માઉસ હોય તે પ્રમાણે તમને સ્ક્રીન પર ભમતાં રહેવાની છૂટ આપે છે</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">રિંગ વૉલ્યુમ વધારી રહ્યા છે</string>
+  <string name="increasing_ring_min_volume_title">શરૂઆતનું વૉલ્યુમ</string>
+  <string name="increasing_ring_ramp_up_time_title">રૅમ્પ-અપ સમય</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS સહાય હેઠળ ડેટા ડાઉનલોડ</string>
+  <string name="lto_download_data_wifi_only_on">કોઇ પણ નેટવર્ક પર</string>
+  <string name="lto_download_data_wifi_only_off">ફક્ત Wi\u2011Fi નેટવર્ક પર</string>
+  <string name="volume_keys_control_ring_stream_title">રિંગટોન વૉલ્યુમ નિયંત્રિત કરો</string>
+  <string name="volume_keys_control_ring_stream_summary_on">વૉલ્યુમ કિ રિંગટોન વૉલ્યુમનું નિયંત્રણ કરે છે</string>
+  <string name="volume_keys_control_ring_stream_summary_off">વૉલ્યુમ કિ મિડિયા વૉલ્યુમનું નિયંત્રણ કરે છે</string>
+  <string name="category_calibration">કેલીબ્રેશન</string>
+  <string name="display_and_lights">પ્રદર્શન અને લાઇટ્સ</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">ચાર્જિંગની ધ્વનિઓ</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">સક્ષમ કરો</string>
+  <string name="power_notifications_enable_summary">પાવર સ્ત્રોત જોડો અથવા પરવાનગીું પાડો ત્યારે ધ્વનિ વગાડો</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">વાઇબ્રેટ</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">સૂચના ધ્વનિ</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">શાંત</string>
   <!-- Status bar -->
+  <string name="status_bar_title">સ્ટેટ્સ બાર</string>
+  <string name="status_bar_toggle_brightness">બ્રાઇટનેસ નિયંત્રણ</string>
+  <string name="status_bar_toggle_brightness_summary">સ્ટેટસ બાર પર સરકાવીને બ્રાઇટનેસ સમાયોજિત કરો</string>
+  <string name="status_bar_notif_count_title">સૂચના સંખ્યા દર્શાવો</string>
+  <string name="status_bar_notif_count_summary">અનિર્ણિત સૂચનાઓની સંખ્યા દર્શાવો</string>
+  <string name="status_bar_quick_qs_pulldown_title">ઝડપી પુલડાઉન</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s સ્ટેટસ બારની કિનારી Quick Settings નીચે ખેંચે છે</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">ડાબું</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">સાચા</string>
+  <string name="status_bar_quick_qs_pulldown_off">બંધ</string>
+  <string name="status_bar_quick_qs_pulldown_left">ડાબું</string>
+  <string name="status_bar_quick_qs_pulldown_right">સાચા</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">ઘડિયાળ શૈલી</string>
+  <string name="status_bar_clock_style_right">સાચા</string>
+  <string name="status_bar_clock_style_left">ડાબું</string>
+  <string name="status_bar_clock_style_center">કેન્દ્ર</string>
+  <string name="status_bar_clock_style_hidden">છૂપું</string>
+  <string name="status_bar_am_pm_title">AM/PM શૈલી</string>
+  <string name="status_bar_am_pm_info">24-કલાક ઘડિયાળ સક્ષમ કરવામાં આવી</string>
+  <string name="status_bar_am_pm_normal">સામાન્ય</string>
+  <string name="status_bar_am_pm_small">નાનું</string>
+  <string name="status_bar_am_pm_hidden">છૂપું</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">બૅટરી સ્ટેટ્સ શૈલી</string>
+  <string name="status_bar_battery_style_icon_portrait">આઇકૉન પોર્ટ્રિટ</string>
+  <string name="status_bar_battery_style_icon_landscape">આઇકૉન લેન્ડસ્કેપ</string>
+  <string name="status_bar_battery_style_circle">વર્તુળ</string>
+  <string name="status_bar_battery_style_text">લખાણ</string>
+  <string name="status_bar_battery_style_hidden">છૂપું</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">બેટરી ટકાવારી</string>
+  <string name="status_bar_battery_percentage_default">છૂપું</string>
+  <string name="status_bar_battery_percentage_text_inside">આઇકૉનની અંદર</string>
+  <string name="status_bar_battery_percentage_text_next">આઇકૉનની બાજુમાં</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">સ્ટેટ્સ બાર આયકન્સ</string>
+  <string name="status_bar_icons_summary">કયા સ્ટેટ્સ બાર દર્શાવવામાં આવશે તે નિયંત્રિત કરો</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">બ્લૉક અંગસ્થિતિ ટચ ઇવેન્ટ્સ</string>
+  <string name="edge_gesture_service_summary">નૅવિગેશન માટે ટચ ઇવેન્ટ્સ અને સ્ટેટ્સ બાર અંગસ્થિતિઓને એપ્લિકેશન્સ પર મોકલવા નહીં</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">ક્યારેય નહીં</string>
+  <string name="keep_screen_on_debugging">USB ડિબગિંગ કરતી વખતે</string>
+  <string name="keep_screen_on_charging">ચાર્જિંગ થતી વખતે</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">ગોપનીયતા</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">ડિફૉલ્ટ મુજબ સક્ષમ કર્યું</string>
+  <string name="privacy_guard_default_summary">નવા-ઇન્સ્ટૉલ કરેલ એપ્લિકેશન્સ માટે ડિફૉલ્ટ મુજબ સક્ષમ કરો</string>
+  <string name="privacy_guard_manager_title">ગુપ્તતા ગાર્ડ</string>
+  <string name="privacy_guard_manager_summary">કઈ એપ્લિકેશન્સ તમારા અંગત ડેટા ઍક્સેસ કરી શકે તેનું વ્યવસ્થાપન કરો</string>
+  <string name="privacy_guard_no_user_apps">કોઇ એપ્લિકેશન્સ ઇન્સ્ટૉલ કરેલ નથી</string>
+  <string name="privacy_guard_help_title">સહાય</string>
+  <string name="privacy_guard_reset_title">ફરીથી સેટ કરો</string>
+  <string name="privacy_guard_reset_text">શું પરવાનગીઓ રિસેટ કરવી છે?</string>
+  <string name="privacy_guard_help_text">આ સ્ક્રીનમાં માત્ર તેના પર ટૅપ કરવાથી તમે પસંદ કરી શકશો કે ક્યા ઍપ્સમાં ગુપ્તતા ગાર્ડ સક્રિય હોવું જોઇએ. અમુક એપ્લિકેશન્સ તમારા અંગત ડેટાને ઍક્સેસ કરી શકશે નહીં જેમ કે સંપર્કો, સંદેશા અથવા કૉલ લૉગ્સ. ઍપની એન્ટ્રી પર લાંબુ દબાણ આપવાથી તેનું એપ્લિકેશન વિવરણ સ્ક્રીન ખુલે છે.\n\nબિલ્ટ-ઇન એપ્લિકેશન્સ ડિફૉલ્ટ તરીકે દર્શાવાતા નથી પરંતુ અનુક્રમે મેન્યૂ વિકલ્પ પસંદ કરવાથી જાહેર થઈ શકે છે.</string>
+  <string name="privacy_guard_manager_show_system_apps">બિલ્ટ-ઇન એપ્લિકેશન્સ દર્શાવો</string>
+  <string name="privacy_guard_advanced_settings_title">વિગતવાર</string>
+  <string name="privacy_guard_notification_title">સૂચના દર્શાવો</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">પૅટર્ન ખામી દર્શાવો</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">પૅટર્ન ડોટ્સ દર્શાવો</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">સીધી પાસવર્ડ એન્ટ્રી દર્શાવો</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">સીધું પૅટર્ન વ્યૂ દર્શાવો</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">સીધી PIN એન્ટ્રી દર્શાવો</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">મ્યુઝિક વિઝ્યુઅલાઇઝર દર્શાવો</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">ક્વિક સેટિંગ્સ ટાઇલ દ્વારા અક્ષમ થયું</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">લૉક સ્ક્રીન સક્ષમ કરવા માટે ટૅપ કરો</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">લૉક સ્ક્રીન સક્ષમ થયું છે!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">બેટરી સેવર મર્યાદા</string>
+  <string name="battery_saver_summary">કામગીરી ઘટાડો અને પૃષ્ઠભૂમિ ડેટા મર્યાદિત કરો</string>
+  <string name="battery_saver_summary_unavailable">ચાર્જિંગ થતું હોય ત્યારે ઉપલબ્ધ નથી</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">એપ્લિકેશન દીઠ પ્રોફાઇલો સક્ષમ કરો</string>
+  <string name="autoperf_summary">વિવિધ એપ્લિકેશન્સ માટે ઉચિત બૅટરી મોડ સ્વયંચાલિત રીતે પસંદ કરો</string>
+  <string name="perf_profile_title">બૅટરી મોડ</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">બૂટ પર એપ્લિકેશન્સ શરૂ થયા</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">સૂચના ટોન</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">એડવાન્સ્ડ રિબૂટ</string>
+  <string name="advanced_reboot_summary">જ્યારે અનલૉક હોય, ત્યારે રિકવરી, બૂટલોડરમાં રિબૂટ કરવા, અથવા સોફ્ટ રિબૂટ હાથ ધરવા માટે પાવર મેન્યૂમાં વિકલ્પો સામેલ કરો</string>
+  <string name="category_interface">ઇન્ટરફેસ</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">વિસ્તારિત ડેસ્કટોપ</string>
+  <string name="expanded_hide_nothing">કોઇ બાબત છુપાવવી નહીં</string>
+  <string name="expanded_hide_status">સ્ટેટ્સ બાર છુપાવો</string>
+  <string name="expanded_hide_navigation">નેવિગેશન પટ્ટી છુપાવો</string>
+  <string name="expanded_hide_both">બન્ને છુપાવો</string>
+  <string name="expanded_nothing_to_show">વિસ્તારિત સ્થિતિ માટે કસ્ટમ પર-એપ્લિકેશન કન્ફિગ્યુરેશન ઉમેરવા માટે, \'Enabled for all\' ને ઑફ સ્થિતિમાં સેટ કરી દો</string>
+  <string name="expanded_enabled_for_all">તમામ માટે સક્ષમ</string>
+  <string name="expanded_desktop_style">વિસ્તારિત ડેસ્કટોપ શૈલી</string>
+  <string name="expanded_desktop_style_description">ડિફૉલ્ટ વિસ્તારિત ડેસ્કટોપ શૈલી પસંદ કરો</string>
+  <string name="expanded_desktop_title">વિસ્તારિત ડેસ્કટોપ વિકલ્પો</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">સંપૂર્ણપણે એપ્લિકેશન બંધ કરવાનું બૅક બટન</string>
+  <string name="kill_app_longpress_back_summary">અગ્રભૂમિ પર રહેલ ઍપને સંપૂર્ણપણે બંધ કરવા માટે લંબાંણપૂર્વક બૅક બટન દબાવો</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">રિસન્ટ મેન્યૂમાં સર્ચ બાર દર્શાવો</string>
+  <string name="keywords_recents_show_searchbar">રિસન્ટ રિસન્ટ્સ ‌અક્ષમ સક્ષમ દર્શાવો છૂપાવો સર્ચ બાર સર્ચબાર</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">વૉઇસ વેકઅપ</string>
+  <string name="voice_wakeup_retrain_title">તમારા વૉઇસને પુન:તાલીમ આપો</string>
+  <string name="voice_wakeup_activity_title">લોન્ચ કરવાની પ્રવૃત્તિ</string>
+  <string name="voice_wakeup_default_activity">હવે Google કરો</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Direct Dial સંપર્ક પસંદ કરવા માટે Voice Wakeupને ફોન કૉલ પરવાનગીઓની આવશ્યકતા છે.</string>
+  <string name="picker_activities">પ્રવૃત્તિઓ</string>
+  <string name="select_custom_app_title">કસ્ટમ એપ્લિકેશન પસંદ કરો</string>
+  <string name="select_custom_activity_title">કસ્ટમ પ્રવૃત્તિ પસંદ કરો</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">બ્લોક કરેલ કૉલર સૂચી</string>
+  <string name="blacklist_edit_dialog_title">બ્લૉક કરેલ ફોન નંબર સંપાદન કરો</string>
+  <string name="blacklist_prefs">સેટિંગ્સ</string>
+  <string name="blacklist_button_delete">હટાવો</string>
+  <string name="blacklist_empty_text">તમારા કોઇ બ્લૉક કરેલ નંબરો નથી ઍડ કરો (+) બટન પર ટચ કરીને એન્ટ્રી ઍડ કરો.</string>
+  <string name="blacklist_disabled_empty_text">ફોન નંબરોને તમને કૉલ કરતા કે સંદેશા મોકલતા રોકવા માટે બ્લૉક કરેલ કૉલરોની સૂચી સક્ષમ કરો.</string>
+  <string name="blacklist_summary_disabled">અક્ષમ</string>
+  <string name="blacklist_summary">તમારી બ્લૉક કરેલ કૉલર સૂચી પર રહેલ ફોન નંબરો પરથી ઇનકમિંગ કૉલ્સ અથવા સંદેશા તમે મેળવશો નહીં</string>
+  <string name="blacklist_notify">સૂચના દર્શાવો</string>
+  <string name="blacklist_private_numbers_title">ખાનગી નંબરો</string>
+  <string name="blacklist_private_numbers_summary_disabled">ખાનગી નંબરો તરફથી આવતા કૉલ બ્લૉક ન કરશો</string>
+  <string name="blacklist_private_numbers_summary">ખાનગી નંબરોના ઇનકમિંગ <xliff:g id="type">%s</xliff:g> બ્લૉક કરો</string>
+  <string name="blacklist_unknown_numbers_title">અજાણ્યા નંબરો</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">સંપર્ક સૂચીમાં ન હોય તેવા નંબરો તરફથી આવતા કૉલ અથવા સંદેશા બ્લૉક કરશો નહીં</string>
+  <string name="blacklist_unknown_numbers_summary">સંપર્ક સૂચિમાં ન હોય તેવા નંબરો પરથી ઇન્કમિંગ<xliff:g id="type">%s</xliff:g> બ્લૉક કરો</string>
+  <string name="blacklist_summary_type_calls_only">કૉલ્સ</string>
+  <string name="blacklist_summary_type_messages_only">સંદેશા</string>
+  <string name="blacklist_summary_type_calls_and_messages">કૉલ્સ અને સંદેશા</string>
+  <string name="blacklist_regex_title">વાઇલ્ડકાર્ડનો ઉપયોગ કરો</string>
+  <string name="blacklist_regex_summary">. નો વાઇલ્ડકાર્ડ તરીકે ઉપયોગ કરો અને * નો પુનરાવર્તન માટે દા.ત. 123.* તે 123 થી શરૂ થતા નંબરો બ્લૉક કરે છે અને .*123.* તે 123 થી શરૂ થતા નંબરો બ્લૉક કરે છે</string>
+  <string name="blacklist_policy_block_calls">આવક કોલ બ્લોક કરો</string>
+  <string name="blacklist_policy_block_messages">ઇનકમિંગ સંદેશા બ્લૉક કરો</string>
+  <string name="blacklist_bad_number_add">બ્લૉક કરેલ કૉલર સૂચીમાં અપ્રમાણિત ફોન નંબરનો ઍડ કરો કરવા અક્ષમ</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">નંબર કાઢી નાંખો</string>
+  <string name="remove_blacklist_entry">શું તમે આ બ્લૉક કરેલ ફોન નંબર દૂર કરવા માંગો છો?</string>
+  <string name="select_contact">સંપર્ક પસંદ કરો</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">એપ્લિકેશન સુરક્ષા</string>
+  <string name="sms_security_check_limit_title">SMS સંદેશ મર્યાદા</string>
+  <string name="sms_security_check_limit_summary">પુષ્ટિ આવશ્યક બને તેની 1 મિનિટ પહેલાં એપ્લિકેશન્સ %d સંદેશા મોકલી શકે છે</string>
+  <string name="sms_security_check_limit_summary_none">એપ્લિકેશન્સ પુષ્ટિ વિના કોઇપણ સંદેશા મોકલવાની છૂટ આપતા નથી</string>
+  <string name="sms_security_check_limit_none">કોઈ નહીં</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s ઉમેરવામાં આવ્યું</string>
+  <string name="spam_last_blocked_title">છેલ્લું બ્લૉક કરેલ %1$s</string>
+  <string name="block_notifications_title">સૂચનાઓ ફિલ્ટર કરો</string>
+  <string name="block_notifications_summary">અવગણેલ સૂચનાઓ અને ફિલ્ટરોનું વ્યવસ્થાપન કરો</string>
+  <string name="no_filters_title">કોઇ ફિલ્ટર સેટ કરેલ નથી</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod આંકડા</string>
+  <string name="anonymous_statistics_summary">CyanogenModને વધુ સારું કરવામાં મદદ કરવા અનામી આંકડા અહેવાલીકરણ પસંદ કરો</string>
+  <string name="anonymous_statistics_warning_title">વિશે</string>
+  <string name="anonymous_statistics_warning">CyanogenMod આંકડા પસંદ કરવાથી CyanogenModના ડેવેલપરોને બિન અંગત ડેટા સબમિટ કરવાની છૂટ મળશે જેથી તેઓ દરેક પ્રકારનાં ડિવાઇસેસના અનન્ય ઇન્સ્ટૉલેશનો ટ્રેક કરી શકે. સબમિટ કરેલ માહિતીમાં અનન્ય ઓળખકર્તાનો સમાવેશ છે જે તમારી ગોપનીયતા કે અંગત ડેટા સાથે તડજોડ કરતો નથી. પ્રત્યેક બૂટ દરમિયાનડેટા સબમિટ થાય છે.\n\nસબમિટ થયેલા ડેટાના ઉદાહરણ માટે પૂર્વાવલોકન ડેટા પર ટૅપ કરો.</string>
+  <string name="enable_reporting_title">રિપોર્ટિંગ સક્ષમ કરો</string>
+  <string name="preview_data_title">પૂર્વાવલોકન ડેટા</string>
+  <string name="view_stats_title">આંકડા જુઓ</string>
+  <string name="anonymous_learn_more">વધુ જાણો</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">અનન્ય ID</string>
+  <string name="preview_device_title">ઉપકરણ</string>
+  <string name="preview_version_title">સંસ્કરણ</string>
+  <string name="preview_country_title">દેશ</string>
+  <string name="preview_carrier_title">વાહક</string>
+  <string name="stats_collection_title">આંકડા એકત્રીકરણ</string>
+  <string name="stats_collection_summary">સક્ષમ કરવામાં આવે ત્યારે, મેટ્રિક્સ એકત્રીકરણની છૂટ</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">રિસેટ પૅટર્ન</string>
+  <string name="lockpattern_settings_reset_summary">પૅટર્ન લૉક રિસેટ કરવા પ્રથમ ઇમેલ અકાઉન્ટ અને તેની સાથે સંલગ્ન પાસવર્ડ દાખલ કરો</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">ફરીથી સેટ કરો</string>
+  <string name="menu_hidden_apps_reset_lock">પૅટર્ન લૉક રિસેટ કરો</string>
+  <string name="protected_apps">સુરક્ષિત એપ્લિકેશન્સ</string>
+  <string name="protected_apps_summary">સુરક્ષિત લૉક પાછળ કયા ઍપ્લિકેશનો છૂપાયેલ છે તે મેનેજ કરો</string>
+  <string name="saving_protected_components">કમ્પોનન્ટ સ્થિતિ સેવ થાય છે\u2026</string>
+  <string name="pa_login_username_hint">વપરાશકર્તાનામ (ઇમેઇલ)</string>
+  <string name="pa_login_password_hint">પાસવર્ડ</string>
+  <string name="pa_login_submit_button">સાઇન ઇન કરો</string>
+  <string name="pa_login_checking_password">એકાઉન્ટ તપાસી રહ્યું છે…</string>
+  <string name="pa_login_incorrect_login">લોગિન અયોગ્ય હતું</string>
+  <string name="pa_pattern_or_fingerprint_header">અનલૉક કરવા માટે પૅટર્ન દોરવી પડશે અથવા ફિંગરપ્રિન્ટનો ઉપયોગ કરવો પડશે</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">સહયોગકર્તાઓ</string>
+  <string name="contributors_cloud_loading_message">ફાળો આપનારના ડેટા લોડ થાય છે\u2026</string>
+  <string name="contributors_cloud_failed_message">ફાળો આપનારના ડેટા લોડ નથી થઈ શકતા</string>
+  <string name="contributor_info_menu">ફાળો આપનાર માહિતી</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>નામ:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>નિક:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>કમિટ્સ:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">ફાળો આપનાર માહિતી</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>કુલ ફાળો આપનારા:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>કુલ કમિટ્સ:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>છેલ્લું અપડેટ:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ધ્વનિ</string>
+  <string name="notification_manager">સૂચનાઓ</string>
+  <string name="lockscreen_settings">સ્ક્રીન લોક કરો</string>
+  <string name="category_lights">લાઇટ્સ</string>
+  <string name="category_volume">વૉલ્યૂમ</string>
+  <string name="category_vibrate">વાઇબ્રેટ</string>
+  <string name="category_misc">વિવિધ</string>
+  <string name="title_general">સામાન્ય</string>
+  <string name="advanced">વિગતવાર</string>
+  <string name="link_volume_option_title">રિંગટોન અને સૂચના વોલ્યુમ સાંકળો</string>
+  <string name="lcd_density_prompt_message">કેટલાક એપ્લિકેશન્સ બિન-માનક DPI પર કાર્ય ન પણ કરે.\n\nઆનાથી તમારું ડિવાઇસ પુનઃ શરૂ થશે.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ફોન નંબર</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">ડુપ્લીકેટ APN</string>
+  <string name="duplicate_apn_error_message">આ એપ્લિકેશન પહેલેથી હાજર છે. કાઢી નાખો અથવા પરિમાણો બદલો.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> તે <xliff:g id="status" example="disabled">%2$s</xliff:g> છે</string>
+  <string name="sim_disabled">અક્ષમ કર્યું છે</string>
+  <string name="sim_missing">ગુમ અથવા ખામીયુક્ત</string>
+  <string name="sim_enabler_need_disable_sim">SIM કાર્ડ નિષ્ક્રિય કરવામાં આવશે. શું તમે ચાલુ રહેવા માંગો છો ?</string>
+  <string name="sim_enabler_will_disable_sim_title">ધ્યાન આપો</string>
+  <string name="sim_enabler_need_switch_data_service">આ SIM અક્ષમ કરાશે અને SIM <xliff:g id="slotid">%1$s</xliff:g> નો ઉપયોગ ડેટા સેવાઓ માટે થશે. શું તમને ખાતરી છે કે તમારે ચાલુ રાખવું છે?</string>
+  <string name="sim_enabler_airplane_on">એરપ્લેન મોડ ચાલુ હોય ત્યારે ઑપરેશન કરવામાં અક્ષમ.</string>
+  <string name="sim_enabler_in_call">કૉલ ચાલુ હોય ત્યારે ઑપરેશન કરવામાં અક્ષમ.</string>
+  <string name="sim_enabler_both_inactive">તમામ SIM કાર્ડ અક્ષમ કરી શકાયા નહીં</string>
+  <string name="sim_enabler_enabling">\u2026 સક્રિય થઈ રહ્યુ છે</string>
+  <string name="sim_enabler_disabling">\u2026 નિષ્ક્રિય થઈ રહ્યુ છે</string>
+  <string name="sub_activate_success">SIM સક્રિય કરવામાં આવ્યું.</string>
+  <string name="sub_activate_failed">ઍક્ટિવેશન નિષ્ફળ.</string>
+  <string name="sub_deactivate_success">SIM નિષ્ક્રિય કરવામાં આવ્યું.</string>
+  <string name="sub_deactivate_failed">ડિઍક્ટિવેશન નિષ્ફળ.</string>
+  <string name="primary_sub_select_title">ડિફૉલ્ટ 3G/LTE લવાજમ</string>
+  <string name="select_sim_card">SIM કાર્ડ પસંદ કરો</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d સ્થિતિ</string>
+  <string name="sim_card_lock_settings_title">SIM %d લૉક સેટિંગ્સ</string>
+  <string name="sim_card_summary_empty">SIM દાખલ કરવામાં આવ્યો નથી</string>
+  <string name="sim_mobile_network_settings_category_title">મોબાઇલ નેટવર્ક સેટિંગ્સ</string>
+  <string name="sim_mobile_network_settings_title">SIM %d સેટિંગ્સ</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">રિમાઇન્ડરો</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ઇવેન્ટ્સ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">પસંદગીના કૉલરો</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">પસંદગીના સંદેશા</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">હેડ: %1$s W/kg</string>
+  <string name="maximum_body_level">બૉડિ: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">મોડેલઃ %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">SIM %d રિંગટોન</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">એપ્લિકેશન:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">છેલ્લો વપરાશ:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">વપરાશ સમય:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">આનાથી તમારા ટૅબ્લેટના <b>internal storage</b>ના તમામ ડેટા ભૂંસાઇ જશે, જેમાં સામેલ છે:\n\n<li>તમારા ડિવાઇસ ખાતા</li>\n<li>સિસ્ટમ અને એપ ડેટા અને સેટિંગ્સ</li>\n<li>ડાઉનલોડ થયેલ એપ્સ</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">આનાથી તમારા ફોનના <b>internal storage</b>ના તમામ ડેટા ભૂંસાઇ જશે, જેમાં સામેલ છે:\n\n<li>તમારા ડિવાઇસ ખાતા</li>\n<li>સિસ્ટમ અને એપ ડેટા અને સેટિંગ્સ</li>\n<li>ડાઉનલોડ થયેલ એપ્સ</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">અંગત ડેટા અને એપ્લિકેશન્સ</string>
+  <string name="factory_reset_instructions_summary">આનાથી તમારા ડિવાઇસ પર રહેલ તમામ ખાતા, એપ્લિકેશન્સ, એપ્લિકેશન ડેટા, અને સિસ્ટમ સેટિંગ્સ ભૂંસાઇ જશે</string>
+  <string name="factory_reset_personal_content">અંગત સામગ્રી</string>
+  <string name="factory_reset_erase_stored_content">સંગ્રહિત સામગ્રી રદ કરો</string>
+  <string name="factory_reset_erase_stored_content_summary">આ ડિવાઇસ પર સંગ્રહ કરેલ સંગીત, ફોટા, વિડિયોઝ, અને અન્ય ઉપયોગકર્તા ડેટા રદ કરો</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">આ ડિવાઇસ પર સંગ્રહ કરેલ સંગીત, ફોટા, વિડિયોઝ, અને અન્ય ઉપયોગકર્તા ડેટા રદ કરો. \n\n<b>ડિવાઇસ એનક્રિપ્શનને કારણે સામગ્રી સેવ થઈ શકશે નહીં.</b></string>
+  <string name="factory_reset_erase_sd_card">SD કાર્ડ ફોર્મેટ કરીએ?</string>
+  <string name="factory_reset_erase_sd_card_summary">સંગીત અને ફોટા સહિત તમામ ડેટા SD કાર્ડ પરથી રદ કરો</string>
+  <string name="factory_reset_warning_text_reset_now">હવે રિસેટ કરો</string>
+  <string name="factory_reset_warning_text_message">તમારા તમામ ખાતા, એપ્લિકેશન્સ, એપ્લિકેશન ડેટા, અને સિસ્ટમ સેટિંગ્સ આ ડિવાઇસમાંથી દૂર કરવામાં આવશે. આ ઊલટાવી શકાશે નહીં.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">અન્ય</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi હોટસ્પોટ સમયસમાપ્તિ</string>
+  <string name="hotstpot_inactivity_timeout_never">ક્યારેય નહીં</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 મિનીટ</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 મિનીટ્સ</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 મિનીટ્સ</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">પોર્ટેબલ Wi\u2011Fi હોટસ્પોટ સમય સમાપ્ત ક્યારેય નહીં થાય</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">પોર્ટેબલ Wi\u2011Fi હોટસ્પોટ પછી સમય સમાપ્ત કરશે <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">લાઇવ લોક સ્ક્રીન</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">લાઈવ લોક સ્ક્રીન ને સક્ષમ અને રૂપરેખાંકિત કરો</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">સેટિંગ્સ</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ઉપલબ્ધ જીવંત લોક સ્ક્રીન જોવા માટે, લાઈવ લોક સ્ક્રીન ચાલુ કરો.</string>
+  <string name="interruptions_ignore_while_media_title">ઑડિયો ડકિંગ રોકો</string>
+  <string name="interruptions_ignore_while_media_summary">અધિસૂચનનું આગમન થાય ત્યારે મિડિયા પ્લેબૅક વોલ્યુમ ઘટાડો નહીં</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">CyanogenMod lકાયદાકીય</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">આંકડા રિસેટ કરો</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">બૅટરી ઇતિહાસના આંકડા રિસેટ થવાના છે</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ડૉક બૅટરી હાજર નથી</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ડૉક AC પર ચાર્જિંગ નથી</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">ડૉક USB પર ચાર્જિંગ થાય છે</string>
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 560a0fb..115d448 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -835,4 +835,14 @@
   <string name="interruptions_ignore_while_media_summary">जब कोई अधिसूचना आए, तो माध्यम प्लेबैक वोल्यूम को कम नहीं करें</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">सियानोजेनमोड क़ानूनी</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">आँकड़े रीसेट करें</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">बैटरी इतिहास आँकड़ा रीसेट किया जाने वाला है</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">बैटरी को डॉक करें अनुपस्थित है</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">डॉक एसी पर चार्ज हो रहा है</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">डॉक यूएसबी पर चार्ज हो रहा है</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index d4f66c3..0e1320a 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -984,4 +984,14 @@
   <string name="interruptions_ignore_while_media_summary">Nemoj utišati glasnoću reprodukcije medija kada pristigne obavijest</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod licenca</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Resetiraj statistiku</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistika povijesti baterije će biti resetirana</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Usidrena baterija nije prisutna</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Punjenje na AC punjaču</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Punjenje preko USB-a</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 81aaa5d..370fc6b 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Ne csökkentse a lejátszott média hangerejét értesítés érkezésekor</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod jogi nyilatkozat</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Statisztika törlése</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Akkumulátor használati statisztika törlésre kerül</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dokkoló akkumulátor hiányzik</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Töltés dokkolón (AC)</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Töltés dokkolón (USB)</string>
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index d2ea4fe..773f7bc 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -834,4 +834,14 @@
   <string name="interruptions_ignore_while_media_summary">Tidak mengurangi volume media pemutar ketika datang pemberitahuan</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Hukum CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Set ulang statistik</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistik sejarah baterai akan diset ulang</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Baterai dudukan tidak ada</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Mengisi dengan AC dudukan</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Mengisi melalui USB dudukan</string>
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index f29674c..ef07951 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -985,4 +985,14 @@
   <string name="interruptions_ignore_while_media_summary">Non ridurre il volume di riproduzione multimediale quando arriva una notifica</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Note legali CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Reimposta statistiche</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Le statistiche delle batteria saranno reimpostate</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Batteria dock non presente</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Ricarica su Dock AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Ricarica su Dock USB</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index c1455a4..a508df1 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -18,8 +18,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
-    <item quantity="one">אתם נמצאים במרחק צעד <xliff:g id="step_count">%1$d</xliff:g> מהפעלת אפשרויות מפתח.</item>
-    <item quantity="other">אתם נמצאים במרחק <xliff:g id="step_count">%1$d</xliff:g> צעדים מהפעלת אפשרויות מפתח.</item>
+    <item quantity="one">רק עוד צעד <xliff:g id="step_count">%1$d</xliff:g> מהפעלת אפשרויות מפתח.</item>
+    <item quantity="other">רק עוד <xliff:g id="step_count">%1$d</xliff:g> צעדים מהפעלת אפשרויות מפתח.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">אפשרויות מפתח פעילות!</string>
@@ -33,11 +33,11 @@
   <!-- Setting checkbox title for root access -->
   <string name="root_access">גישת שורש (Root)</string>
   <string name="root_access_warning_title">לאפשר גישת שורש?</string>
-  <string name="root_access_warning_message">מתן האפשרות ליישומים לבקש גישת שורש הנו מסוכן מאוד, ועלול לסכן את אבטחת המערכת שלך!</string>
+  <string name="root_access_warning_message">מתן האפשרות ליישומים לבקש גישת שורש הוא מסוכן מאוד ועלול לסכן את אבטחת המערכת שלך!</string>
   <string name="root_access_none">מושבת</string>
-  <string name="root_access_apps">אפליקציות בלבד</string>
+  <string name="root_access_apps">יישומים בלבד</string>
   <string name="root_access_adb">ADB בלבד</string>
-  <string name="root_access_all">אפליקציות ו-ADB</string>
+  <string name="root_access_all">יישומים ו-ADB</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -55,10 +55,10 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">עדכוני CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">עדכן את ה-Recovery של Cyanogen</string>
-  <string name="update_recovery_summary">עדכן את ה-Recovery יחד עם עדכוני מערכת</string>
-  <string name="update_recovery_on_warning">שים לב: כשתכונה זו מופעלת, ה-Recovery הנוכחי שלך יוחלף ב-Recovery הכלול בגרסה הנוכחית של מערכת ההפעלה שלך.\n\nה-Recovery הנוכחי שלך יתעדכן יחד עם עדכונים למערכת שלך, כדי להבטיח תאימות עם גרסאות עתידיות.\n\nהאם להפעיל את תכונה זו?</string>
-  <string name="update_recovery_off_warning">אזהרה: כשתכונה זו לא מופעלת, ה-Recovery הנוכחי לא יתעדכן עם עדכוני מערכת.\n\nעדכוני מערכת עתידיים לא יותקנו עם גרסה לא עדכנית של ה-Recovery.\n\nהאם לכבות את תכונה זו?</string>
+  <string name="update_recovery_title">עדכן את השחזור של Cyanogen</string>
+  <string name="update_recovery_summary">עדכן את השחזור יחד עם עדכוני מערכת</string>
+  <string name="update_recovery_on_warning">שים לב: כשתכונה זו מופעלת, השחזור הנוכחי שלך יוחלף ב-Recovery הכלול בגרסה הנוכחית של מערכת ההפעלה שלך.\n\nהשחזור הנוכחי שלך יתעדכן יחד עם עדכונים למערכת שלך, כדי להבטיח תאימות עם גרסאות עתידיות.\n\nהאם להפעיל את תכונה זו?</string>
+  <string name="update_recovery_off_warning">אזהרה: כשתכונה זו מושבתת, השחזור הנוכחי לא יתעדכן עם עדכוני מערכת.\n\nעדכוני מערכת עתידיים לא יותקנו עם גרסה לא עדכנית של השחזור.\n\nהאם להשבית תכונה זו?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">ערכות עיצוב</string>
@@ -74,17 +74,17 @@
   <string name="profile_menu_delete">מחק</string>
   <string name="profile_settings_title">פרופיל</string>
   <string name="profile_empty_list_profiles_off">כדי להגדיר ולהשתמש במערכת הפרופילים, הפעל את הפרופילים.</string>
-  <string name="profile_trigger_configure">להגדיר את הגורם המפעיל</string>
-  <string name="profile_write_nfc_tag">לכתוב לתווית NFC</string>
+  <string name="profile_trigger_configure">הגדר גורם המפעיל</string>
+  <string name="profile_write_nfc_tag">כתוב לתווית NFC</string>
   <string name="profile_write_touch_tag">גע בתווית לכתיבה</string>
-  <string name="profile_write_success">תווית נכתבה בהצלחה</string>
+  <string name="profile_write_success">התווית נכתבה בהצלחה</string>
   <string name="profile_write_failed">כתיבת תווית נכשלה!</string>
   <string name="profile_selected">הפרופיל שנבחר: %1$s</string>
-  <string name="profile_nfc_text">כתיבת פרופיל לתג NFC יאפשר הפעלת הפרופיל על ידי נגיעה בתג. נגיעה חוזרת תחזיר לפרופיל הקודם.</string>
+  <string name="profile_nfc_text">כתיבת פרופיל לתג NFC תאפשר את הפעלת הפרופיל על ידי נגיעה בתג. נגיעה שנייה תחזיר לפרופיל הקודם.</string>
   <string name="profile_unknown_nfc_tag">פרופיל לא ידוע</string>
-  <string name="profile_add_nfc_text">תג ה-NFC הזה מחובר לפרופיל לא ידוע. חיבור תג זה לפרופיל קיים יאפשר הפעלתו בעתיד.</string>
+  <string name="profile_add_nfc_text">תג NFC זה מחובר לפרופיל לא ידוע. חיבור תג זה לפרופיל קיים יאפשר את הפעלתו בעתיד.</string>
   <string name="profile_select">בחר פרופיל</string>
-  <string name="profile_remove_dialog_message">למחוק את הפרופיל %1$s?</string>
+  <string name="profile_remove_dialog_message">להסיר את הפרופיל %1$s?</string>
   <string name="profile_populate_profile_from_state">להגדיר פרופיל לפי הגדרות המכשיר הנוכחיות?</string>
   <string name="profile_menu_fill_from_state">ייבא את הגדרות המכשיר הנוכחיות</string>
   <string name="profile_remove_current_profile">אין אפשרות למחוק את הפרופיל הנוכחי!</string>
@@ -92,7 +92,7 @@
   <string name="profile_app_group_item_instructions">הוסף או הסר קבוצות</string>
   <string name="profile_app_group_item_instructions_summary">הוסף או הסר קבוצות יישומים בעלי התראה עוקפת לפרופיל זה</string>
   <!-- Profile mode options. -->
-  <string name="profile_entries_on">פעיל</string>
+  <string name="profile_entries_on">מופעל</string>
   <string name="profile_entries_off">כבוי</string>
   <string name="profile_entries_no_override">ללא עקיפה</string>
   <!-- Add Profile -->
@@ -115,10 +115,10 @@
   <string name="profile_networkmode_2g3g">2G/3G</string>
   <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
-  <string name="profile_volumeoverrides_title">עקיפת עוצמת שמע</string>
+  <string name="profile_volumeoverrides_title">עקיפת עוצמת קול</string>
   <string name="connection_state_enabled">הפעל</string>
   <string name="volume_override_summary">הגדר ל-%1$s/%2$s</string>
-  <string name="profile_volume_override_checkbox_label">עקוף עוצמת שמע</string>
+  <string name="profile_volume_override_checkbox_label">עקוף עוצמת קול</string>
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">פרופילים</string>
   <string name="profile_profile_manage">נהל פרופיל</string>
@@ -140,7 +140,7 @@
   <string name="soundtone_title">צליל התראה</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">קבוצות יישומים</string>
-  <string name="profile_applist_title">אפליקציות</string>
+  <string name="profile_applist_title">יישומים</string>
   <string name="profile_new_appgroup">קבוצת יישומים חדשה</string>
   <string name="profile_delete_appgroup">האם למחוק קבוצת יישומים זו?</string>
   <string name="profile_appgroup_name_prompt">הזן שם עבור קבוצת היישומים החדשה</string>
@@ -150,9 +150,9 @@
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">הגדרות מערכת</string>
   <string name="profile_lockmode_title">מצב מסך הנעילה</string>
-  <string name="profile_lockmode_policy_disabled_summary">אפשרות פרופיל זאת מושבתת עקב מדיניות מנהל ההתקן</string>
+  <string name="profile_lockmode_policy_disabled_summary">אפשרות פרופיל זאת מושבתת עקב מדיניות מנהל המכשיר</string>
   <string name="profile_lockmode_insecure_summary">אל תבקש PIN או סיסמה</string>
-  <string name="profile_lockmode_disabled_summary">ביטול מסך הנעילה</string>
+  <string name="profile_lockmode_disabled_summary">בטל מסך נעילה</string>
   <string name="profile_airplanemode_title">מצב טיסה</string>
   <string name="profile_brightness_title">בהירות מסך</string>
   <string name="profile_brightness_override_summary">הגדר ל-%1$d%%</string>
@@ -185,7 +185,7 @@
   <string name="profile_tabs_nfc">NFC</string>
   <string name="profile_triggers_header">גורמים שיפעילו את הפרופיל הזה</string>
   <string name="profile_setup_setup_triggers_title">שלב 1: הוספת גורמים מפעילים</string>
-  <string name="profile_setup_setup_triggers_title_config">שנה גורמי הפעלה: <xliff:g id="profile_name">%1$s </xliff:g></string>
+  <string name="profile_setup_setup_triggers_title_config">שנה גורמי מפעילים: <xliff:g id="profile_name">%1$s </xliff:g></string>
   <string name="profile_setup_actions_title">שלב 2: הגדרת פעולות</string>
   <string name="profile_setup_actions_title_config">הגדר פעולות מחדש</string>
   <string name="profile_appgroups_manage">קבוצות יישומים</string>
@@ -207,7 +207,7 @@
   <!-- Navigation Bar -->
   <string name="navigation_bar_category">סרגל ניווט</string>
   <string name="navigation_bar_left_title">מצב לשמאליים</string>
-  <string name="navigation_bar_left_summary">מקם את שורת ההפעלה בצד השמאלי של המסך במצב שכיבה</string>
+  <string name="navigation_bar_left_summary">מקם את שורת ההפעלה בצד השמאלי של המסך במצב רוחב</string>
   <string name="navigation_bar_title">לחצנים ופריסה</string>
   <string name="navigation_bar_help_text">כדי להתחיל לחץ על כפתור העריכה כדי לפתוח את סרגל הניווט לעריכה.\n\nאתה יכול ללחוץ על סמל כדי לשנות את קיצור הדרך שלו, או ללחוץ לחיצה ארוכה על סמל כדי לשנות את הסידור.\n\nלחץ \"שמור\" כדי להחיל את השינויים שלך, או \"שחזר\" כדי לאפס את הסידור להגדרות ברירת המחדל.</string>
   <string name="navigation_restore_button_text">שחזור\nברירת מחדל</string>
@@ -223,7 +223,7 @@
   <string name="default_time">רגיל</string>
   <string name="custom_time">מותאם אישית</string>
   <string name="dialog_delete_title">מחק</string>
-  <string name="dialog_delete_message">האם להסיר את הפריט הנבחר?</string>
+  <string name="dialog_delete_message">להסיר את הפריט הנבחר?</string>
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_always_on">תמיד דלוק</string>
   <string name="pulse_length_very_short">קצר מאוד</string>
@@ -384,13 +384,13 @@
   <string name="app_ops_labels_modify_clipboard">שינוי לוח העתקה</string>
   <string name="app_ops_labels_media_buttons">לחצני מדיה</string>
   <string name="app_ops_labels_audio_focus">מיקוד שמע</string>
-  <string name="app_ops_labels_master_volume">עוצמת השמע הראשית</string>
+  <string name="app_ops_labels_master_volume">עוצמת הקול הראשית</string>
   <string name="app_ops_labels_voice_volume">עוצמת השיחה</string>
   <string name="app_ops_labels_ring_volume">עוצמת הצלצול</string>
   <string name="app_ops_labels_media_volume">עוצמת המדיה</string>
   <string name="app_ops_labels_alarm_volume">עוצמת השעון המעורר</string>
   <string name="app_ops_labels_notification_volume">עוצמת ההתראה</string>
-  <string name="app_ops_labels_bluetooth_volume">עוצמת השמע של ה-Bluetooth</string>
+  <string name="app_ops_labels_bluetooth_volume">עוצמת הקול של ה-Bluetooth</string>
   <string name="app_ops_labels_keep_awake">שמירה במצב פעיל</string>
   <string name="app_ops_labels_monitor_location">מעקב אחר מיקום</string>
   <string name="app_ops_labels_monitor_high_power_location">מעקב אחר מיקום עם צריכת סוללה גבוהה</string>
@@ -439,11 +439,11 @@
   <!-- Hostname setting -->
   <string name="device_hostname">שם הרשת עבור ההתקן</string>
   <string name="unlock_scramble_pin_layout_title">ערבב פריסה</string>
-  <string name="unlock_scramble_pin_layout_summary">ערבב מבנה כשמבטלים נעילת מכשיר</string>
+  <string name="unlock_scramble_pin_layout_summary">ערבב פריסת PIN בעת פתיחת המכשיר</string>
   <string name="button_pref_title">מקשים</string>
   <string name="hardware_keys_power_key_title">לחצן הפעלה</string>
   <string name="hardware_keys_home_key_title">לחצן הבית</string>
-  <string name="hardware_keys_back_key_title">לחצן \"הקודם\"</string>
+  <string name="hardware_keys_back_key_title">לחצן \'הקודם\'</string>
   <string name="hardware_keys_menu_key_title">לחצן התפריט</string>
   <string name="hardware_keys_assist_key_title">לחצן חיפוש</string>
   <string name="hardware_keys_appswitch_key_title">לחצן יישומים אחרונים</string>
@@ -451,36 +451,36 @@
   <string name="hardware_keys_volume_keys_title">לחצני עוצמת קול</string>
   <string name="hardware_keys_short_press_title">פעולה בלחיצה קצרה</string>
   <string name="hardware_keys_long_press_title">פעולה בלחיצה ארוכה</string>
-  <string name="hardware_keys_double_tap_title">פעולה בלחיצה כפולה</string>
+  <string name="hardware_keys_double_tap_title">פעולה בנגיעה כפולה</string>
   <string name="hardware_keys_action_nothing">ללא פעולה</string>
-  <string name="hardware_keys_action_menu">פתיחת/סגירת תפריט</string>
+  <string name="hardware_keys_action_menu">פתח/סגור תפריט</string>
   <string name="hardware_keys_action_app_switch">מחליף יישומים אחרונים</string>
-  <string name="hardware_keys_action_search">עוזרת חיפוש</string>
+  <string name="hardware_keys_action_search">עוזר-חיפוש</string>
   <string name="hardware_keys_action_voice_search">חיפוש קולי</string>
   <string name="hardware_keys_action_in_app_search">חיפוש ביישום</string>
   <string name="hardware_keys_action_launch_camera">הפעלת מצלמה</string>
   <string name="hardware_keys_action_sleep">כיבוי המסך</string>
   <string name="hardware_keys_action_last_app">יישום אחרון</string>
   <string name="camera_sleep_on_release_title">הצצה מהמסך</string>
-  <string name="camera_sleep_on_release_summary">חצי לחיצה תשמור את המסך דלוק כל עוד הכפתור לחוץ</string>
+  <string name="camera_sleep_on_release_summary">חצי לחיצה תשאיר את המסך פעיל כל עוד הכפתור לחוץ</string>
   <string name="camera_launch_title">הפעלת מצלמה</string>
   <string name="camera_launch_summary">לחיצה ארוכה ושחרור תפעיל את המצלמה</string>
-  <string name="volbtn_music_controls_title">מעביר מוזיקה</string>
+  <string name="volbtn_music_controls_title">שליטה על ניגון</string>
   <string name="volbtn_music_controls_summary">כאשר המסך כבוי, לחיצה ארוכה על לחצני עוצמת הקול תחליף את רצועת המוזיקה</string>
   <string name="volbtn_cursor_control_title">שליטה בסמן עם מקלדת</string>
   <string name="volbtn_cursor_control_off">מושבת</string>
-  <string name="volbtn_cursor_control_on">עוצמה למעלה/למטה מעבירה את הסמן שמאלה/ימינה</string>
-  <string name="volbtn_cursor_control_on_reverse">עוצמה למעלה/למטה מעבירה את הסמן ימינה/שמאלה</string>
+  <string name="volbtn_cursor_control_on">עוצמת קול למעלה/למטה מעבירה את הסמן שמאלה/ימינה</string>
+  <string name="volbtn_cursor_control_on_reverse">עוצמת קול למעלה/למטה מעבירה את הסמן ימינה/שמאלה</string>
   <string name="power_end_call_title">סיום שיחה</string>
   <string name="power_end_call_summary">לחיצה על לחצן ההפעלה תסיים את השיחה הנוכחית</string>
   <string name="swap_volume_buttons_title">כיוון מחדש</string>
-  <string name="swap_volume_buttons_summary">החלפת כיוון לחצני העוצמה כאשר המסך מסובב</string>
+  <string name="swap_volume_buttons_summary">החלפת כיוון לחצני עוצמת הקול כאשר המסך מסובב</string>
   <string name="button_wake_title">הער את המכשיר</string>
   <string name="home_answer_call_title">מענה לשיחה</string>
-  <string name="home_answer_call_summary">לחיצה על כפתור הבית תענה לשיחה הנכנסת הנוכחית</string>
+  <string name="home_answer_call_summary">לחיצה על לחצן הבית תענה לשיחה הנכנסת הנוכחית</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">תאורה אחורית מסתגלת</string>
-  <string name="adaptive_backlight_summary">כוון דינאמית את בהירות המסך כדי להגדיל את חיי הסוללה תוך שמירה על שימושיות</string>
+  <string name="adaptive_backlight_summary">התאם באופן דינמי את בהירות המסך כדי להאריך את חיי הסוללה תוך שמירה על שימושיות</string>
   <!-- Sunlight readability enhancement screen -->
   <string name="sunlight_enhancement_title">שיפור לאור שמש</string>
   <string name="sunlight_enhancement_summary">שפר בהירות תצוגה וקריאות תחת אור שמש בהיר</string>
@@ -493,7 +493,7 @@
   <string name="keyboard_backlight_enabled">האר מקלדת</string>
   <string name="button_backlight_seekbar_title">בהירות לחצנים</string>
   <string name="keyboard_backlight_seekbar_title">בהירות לוח מקשים</string>
-  <string name="backlight_timeout_title">משך זמן תאורה</string>
+  <string name="backlight_timeout_title">זמן קצוב לתאורה</string>
   <string name="backlight_timeout_unlimited">אל תכבה</string>
   <string name="backlight_summary_disabled">מושבת</string>
   <string name="backlight_summary_enabled_with_timeout">פעיל למשך <xliff:g id="timeout">%s</xliff:g></string>
@@ -503,15 +503,15 @@
   <string name="gesture_settings_title">מחוות</string>
   <!-- Power menu -->
   <string name="power_menu_title">תפריט הפעלה</string>
-  <string name="power_menu_reboot_title">תפריט אתחול</string>
+  <string name="power_menu_reboot_title">תפריט אתחול מחדש</string>
   <string name="power_menu_screenshot_title">צילום מסך</string>
   <string name="power_menu_airplane_title">מצב טיסה</string>
   <string name="power_menu_users_title">מחליף משתמש</string>
-  <string name="power_menu_settings_title">קיצור דרך של הגדרות</string>
+  <string name="power_menu_settings_title">קיצור דרך להגדרות</string>
   <string name="power_menu_lockdown_title">נעילת המכשיר</string>
-  <string name="power_menu_bug_report_title">דיווח שגיאות</string>
+  <string name="power_menu_bug_report_title">דיווח באגים</string>
   <string name="power_menu_sound_title">לוח צלילים</string>
-  <string name="power_menu_bug_report_disabled">דיווח שגיאות אינו זמין בהגדרות מפתחים</string>
+  <string name="power_menu_bug_report_disabled">דיווח באגים מושבת בהגדרות מפתחים</string>
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">אפשר לחצני ניווט על המסך</string>
   <string name="disable_navkeys_summary">אפשר לחצני ניווט על המסך ובטל לחצנים פיזיים</string>
@@ -611,7 +611,7 @@
   <!-- Heads up -->
   <string name="heads_up_notifications">התראות קופצות</string>
   <string name="summary_heads_up_enabled">התראות קופצות פעילות</string>
-  <string name="summary_heads_up_disabled">התראות קופצות כבויות</string>
+  <string name="summary_heads_up_disabled">התראות קופצות מושבתות</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
   <string name="bluetooth_accept_all_files">התר את כל סוגי הקבצים</string>
   <!-- High touch sensitivity -->
@@ -659,9 +659,9 @@
   <string name="lto_download_data_wifi_only">הורדת נתוני סיוע ל-GPS</string>
   <string name="lto_download_data_wifi_only_on">דרך כל סוגי הרשתות</string>
   <string name="lto_download_data_wifi_only_off">דרך רשתות Wi\u2011Fi בלבד</string>
-  <string name="volume_keys_control_ring_stream_title">שליטה בעוצמת הצלצול</string>
-  <string name="volume_keys_control_ring_stream_summary_on">מקשי העוצמה שולטים בעוצמת הצלצול</string>
-  <string name="volume_keys_control_ring_stream_summary_off">מקשי העוצמה שולטים בעוצמת המדיה</string>
+  <string name="volume_keys_control_ring_stream_title">שליטה בעוצמת הרינגטון</string>
+  <string name="volume_keys_control_ring_stream_summary_on">מקשי העוצמה שולטים בעוצמת הרינגטון</string>
+  <string name="volume_keys_control_ring_stream_summary_off">מקשי עוצמת הקול שולטים בעוצמת המדיה</string>
   <string name="category_calibration">כיול</string>
   <string name="display_and_lights">תצוגה ואורות</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -679,7 +679,7 @@
   <!-- Status bar -->
   <string name="status_bar_title">שורת מצב</string>
   <string name="status_bar_toggle_brightness">בקרת הבהירות</string>
-  <string name="status_bar_toggle_brightness_summary">כיוונן את הבהירות על-ידי הזזה על שורת המצב</string>
+  <string name="status_bar_toggle_brightness_summary">התאם בהירות על-ידי החלקה על שורת המצב</string>
   <string name="status_bar_notif_count_title">הצג מספור הודעות</string>
   <string name="status_bar_notif_count_summary">הצג מספר הודעות ממתינות</string>
   <string name="status_bar_quick_qs_pulldown_title">משיכה מהירה</string>
@@ -702,8 +702,8 @@
   <string name="status_bar_am_pm_hidden">מוסתר</string>
   <!-- Status bar - Battery -->
   <string name="status_bar_battery_style_title">סגנון הצגת מצב סוללה</string>
-  <string name="status_bar_battery_style_icon_portrait">סמל עומד</string>
-  <string name="status_bar_battery_style_icon_landscape">סמל שוכב</string>
+  <string name="status_bar_battery_style_icon_portrait">סמל אורך</string>
+  <string name="status_bar_battery_style_icon_landscape">סמל רוחב</string>
   <string name="status_bar_battery_style_circle">עיגול</string>
   <string name="status_bar_battery_style_text">טקסט</string>
   <string name="status_bar_battery_style_hidden">מוסתר</string>
@@ -717,7 +717,7 @@
   <string name="status_bar_icons_summary">שלוט על אילו סמלים של שורת המצב יוצגו</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">חסום אירועי מחוות מגע</string>
-  <string name="edge_gesture_service_summary">אל תשלח נגיעות בסרגל הניווט ובשורת המצב לאפליקציות</string>
+  <string name="edge_gesture_service_summary">אל תשלח אירועי נגיעות בסרגל הניווט ובשורת המצב ליישומים</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">אף פעם</string>
   <string name="keep_screen_on_debugging">בעת איתור באגים דרך USB</string>
@@ -734,7 +734,7 @@
   <string name="privacy_guard_reset_title">איפוס</string>
   <string name="privacy_guard_reset_text">לאפס הרשאות?</string>
   <string name="privacy_guard_help_text">בחלון זה אתה יכול לבחור עבור אילו יישומים שומר הפרטיות יפעל. הייישומים הנבחרים לא יקבלו גישה למידע הפרטי שלך כמו אנשי קשר, הודעות ויומן שיחות. לחיצה ארוכה על יישום תפתח את פרטי ההרשאות שלו.\n\nיישומים מובנים לא מוצגים כברירת מחדל, אבל יכולים להיחשף על ידי בחירת ההגדרה המתאימה.</string>
-  <string name="privacy_guard_manager_show_system_apps">להראות אפליקציות מובנות</string>
+  <string name="privacy_guard_manager_show_system_apps">הצג יישומים מובנים</string>
   <string name="privacy_guard_advanced_settings_title">מתקדם</string>
   <string name="privacy_guard_notification_title">הצג התראה</string>
   <!-- Sizes for pattern lockscreen -->
@@ -768,7 +768,7 @@
   <string name="notification_ringtone_title_cm">צליל התראה</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">אתחול מתקדם</string>
-  <string name="advanced_reboot_summary">כאשר פתוח, מוסיף לתפריט ההפעלה אפשרויות לאתחול ל-Recovery, Bootloader או לבצע אתחול מהיר</string>
+  <string name="advanced_reboot_summary">כאשר פתוח, מוסיף לתפריט ההפעלה אפשרויות לאתחול לשחזור, תוכנת טעינה ראשונית או לביצוע אתחול מהיר</string>
   <string name="category_interface">ממשק</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">שולחן עבודה מורחב</string>
@@ -797,12 +797,12 @@
   <string name="select_custom_app_title">בחר יישום אחר</string>
   <string name="select_custom_activity_title">בחר הפעילות המותאמת אישית</string>
   <!-- Blacklist preferences -->
-  <string name="blacklist_title">רשימת המתקשרים החסומים</string>
+  <string name="blacklist_title">רשימת מתקשרים חסומים</string>
   <string name="blacklist_edit_dialog_title">ערוך מספר טלפון חסום</string>
   <string name="blacklist_prefs">הגדרות</string>
   <string name="blacklist_button_delete">מחק</string>
-  <string name="blacklist_empty_text">אין לך מספרים חסומים כלשהם. הוסיפו ערך על-ידי לחיצה על (+).</string>
-  <string name="blacklist_disabled_empty_text">כדי למנוע ממספרי טלפון להתקשר אליך, או לשלוח הודעות, הפעילו את רשימת המתקשרים החסומים.</string>
+  <string name="blacklist_empty_text">אין לך מספרים חסומים. הוסף ערך בלחיצה על הלחצן (+).</string>
+  <string name="blacklist_disabled_empty_text">כדי למנוע ממספרי טלפון להתקשר אליך, או לשלוח הודעות, הפעל את רשימת המתקשרים החסומים.</string>
   <string name="blacklist_summary_disabled">מושבת</string>
   <string name="blacklist_summary">לא יתקבלו שיחות נכנסות או הודעות ממספרי הטלפון הנמצאים ברשימת המתקשרים החסומים</string>
   <string name="blacklist_notify">הצג התראות</string>
@@ -811,12 +811,12 @@
   <string name="blacklist_private_numbers_summary">חסום <xliff:g id="type">%s</xliff:g> נכנסות ממספרים חסויים</string>
   <string name="blacklist_unknown_numbers_title">מספרים לא ידועים</string>
   <string name="blacklist_unknown_numbers_summary_disabled">אל תחסום שיחות או הודעות ממספרים שאינם ברשימת אנשי קשר</string>
-  <string name="blacklist_unknown_numbers_summary">חסום <xliff:g id="type">%s</xliff:g> נכנסות ממספרים שלא ברשימת אנשי קשר</string>
+  <string name="blacklist_unknown_numbers_summary">חסום <xliff:g id="type">%s</xliff:g> נכנסות ממספרים שאינם ברשימת אנשי קשר</string>
   <string name="blacklist_summary_type_calls_only">שיחות</string>
   <string name="blacklist_summary_type_messages_only">הודעות</string>
   <string name="blacklist_summary_type_calls_and_messages">שיחות והודעות</string>
   <string name="blacklist_regex_title">השתמש בתווים כלליים</string>
-  <string name="blacklist_regex_summary">השתמש בתו . כתו כולל, ובתו * כחזרה. לדוגמה: 123.* יחסום את כל המספרים שמתחילים ב-123, ו-.*123.* יחסום את כל המספרים שמכילים 123</string>
+  <string name="blacklist_regex_summary">השתמש בתו \'.\' כתו כולל, ובתו \'*\' כחזרה. לדוגמה: 123.* יחסום את כל המספרים שמתחילים ב-123, ו-.*123.* יחסום את כל המספרים שמכילים 123</string>
   <string name="blacklist_policy_block_calls">חסום שיחות נכנסות</string>
   <string name="blacklist_policy_block_messages">חסום הודעות נכנסות</string>
   <string name="blacklist_bad_number_add">לא ניתן להוסיף מספר טלפון לא חוקי לרשימת המתקשרים החסומים</string>
@@ -855,16 +855,16 @@
   <string name="stats_collection_title">אוסף סטטיסטיקות</string>
   <string name="stats_collection_summary">כאשר מופעל, מאפשר איסוף מדדים</string>
   <!-- Protected apps lockpattern reset button -->
-  <string name="lockpattern_reset_button">אפס דפוס</string>
-  <string name="lockpattern_settings_reset_summary">הזן חשבון דוא\"ל ראשי וסיסמה משויכת כדי לאפס את דפוס הנעילה</string>
+  <string name="lockpattern_reset_button">איפוס דפוס</string>
+  <string name="lockpattern_settings_reset_summary">הזן חשבון דוא\"ל ראשי וססמה משויכת כדי לאפס את דפוס הנעילה</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">איפוס</string>
-  <string name="menu_hidden_apps_reset_lock">אפס נעילת דפוס</string>
-  <string name="protected_apps">אפליקציות מוגן</string>
+  <string name="menu_hidden_apps_reset_lock">איפוס נעילת דפוס</string>
+  <string name="protected_apps">יישומים מוגנים</string>
   <string name="protected_apps_summary">נהל אילו יישומים מוחבאים מאחורי נעילה מאובטחת</string>
   <string name="saving_protected_components">שמירת מצב רכיב\u2026</string>
   <string name="pa_login_username_hint">שם משתמש (דוא\"ל)</string>
-  <string name="pa_login_password_hint">סיסמה</string>
+  <string name="pa_login_password_hint">ססמה</string>
   <string name="pa_login_submit_button">התחברות</string>
   <string name="pa_login_checking_password">בודק חשבון\u2026</string>
   <string name="pa_login_incorrect_login">התחברות נכשלה</string>
@@ -892,7 +892,7 @@
   <string name="category_misc">שונות</string>
   <string name="title_general">כללי</string>
   <string name="advanced">מתקדם</string>
-  <string name="link_volume_option_title">קשר את עוצמות הצלצול וההתראות</string>
+  <string name="link_volume_option_title">קשר את עוצמות הרינגטון וההתראות</string>
   <string name="lcd_density_prompt_message">ייתכן שמספר יישומים לא יתפקדו כראוי בשימוש ב-DPI לא סטנדרטי.\n\nמכשירך יבצע הפעלה מחדש.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP מספר טלפון</string>
@@ -900,7 +900,7 @@
   <string name="duplicate_apn_error_title">APN כפול</string>
   <string name="duplicate_apn_error_message">APN זה כבר קיים. מחק או שנה פרמטרים.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
-  <string name="sim_disabled">לא פעיל</string>
+  <string name="sim_disabled">מושבת</string>
   <string name="sim_missing">חסר או פגום</string>
   <string name="sim_enabler_need_disable_sim">כרטיס ה-SIM יפסיק לפעול. האם ברצונך להמשיך?</string>
   <string name="sim_enabler_will_disable_sim_title">שים לב</string>
@@ -948,7 +948,7 @@
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">פעולה זו תביא למחיקת כל התוכן מ<b>האחסון הפנימי</b> של הטאבלט שלך, כולל:\n\n<li>החשבונות המוגדרים במכשירך</li>\n<li>נתונים והגדרות של המערכת והיישומים הקיימים</li>\n<li>יישומים שהורדו</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">פעולה זו תביא למחיקת כל התוכן מ<b>האחסון הפנימי</b> של המכשיר שלך, כולל:\n\n<li>החשבונות המוגדרים במכשירך</li>\n<li>נתונים והגדרות של המערכת והיישומים הקיימים</li>\n<li>יישומים שהורדו</li></string>
+  <string name="master_clear_desc_cm" product="default">פעולה זו תביא למחיקת כל התוכן מ<b>האחסון הפנימי</b> של הטלפון שלך, כולל:\n\n<li>החשבונות המוגדרים במכשירך</li>\n<li>נתונים והגדרות של המערכת והיישומים הקיימים</li>\n<li>יישומים שהורדו</li></string>
   <!-- Factory reset strings -->
   <string name="factory_reset_instructions_title">נתונים אישיים ויישומים</string>
   <string name="factory_reset_instructions_summary">פעולה זאת תמחק את כל החשבונות, היישומים (כולל נתוניהם) והגדרות המערכת ממכשיר זה</string>
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">אל תנמיך את עוצמת המוזיקה כאשר התראה מגיעה</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod משפטי</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">איפוס סטטיסטיקות</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">היסטוריית הסוללה שלך הולכת להתאפס</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">סוללה חיצונית לא נוכחת</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">מטעין דרך חיבור AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">מטעין דרך חיבור USB</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index cbcee2e..e9d8bba 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -277,7 +277,7 @@
   <string name="app_ops_categories_messaging">メッセージ</string>
   <string name="app_ops_categories_media">メディア</string>
   <string name="app_ops_categories_device">端末</string>
-  <string name="app_ops_categories_bootup">ブート時の実行</string>
+  <string name="app_ops_categories_bootup">ブート</string>
   <string name="app_ops_categories_su">ルートアクセス</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_summaries_coarse_location">おおよその位置情報</string>
@@ -658,7 +658,7 @@
   <string name="lto_download_data_wifi_only">GPSアシストデータのダウンロード</string>
   <string name="lto_download_data_wifi_only_on">すべてのネットワーク経由</string>
   <string name="lto_download_data_wifi_only_off">Wi\u2011Fiネットワーク経由のみ</string>
-  <string name="volume_keys_control_ring_stream_title">着信音量の制御</string>
+  <string name="volume_keys_control_ring_stream_title">着信音量のコントロール</string>
   <string name="volume_keys_control_ring_stream_summary_on">音量キーで着信音量をコントロールする</string>
   <string name="volume_keys_control_ring_stream_summary_off">音量キーでメディア音量をコントロールする</string>
   <string name="category_calibration">キャリブレーション</string>
@@ -982,4 +982,14 @@
   <string name="interruptions_ignore_while_media_summary">通知が来たときにメディアの再生音量を下げないようにする</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod利用規約</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">統計をリセット</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">電池の利用統計がリセットされます</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ホルダーの電池が存在しません</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ACでホルダーを充電しています</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">USBでホルダーを充電しています</string>
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index d5aa3a4..efae01d 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -48,6 +48,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">ಸಾಧನ ಹೆಸರು</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">ಸೈನೋಜನ್ ಮೋಡ್ API ಮಟ್ಟ</string>
   <string name="mod_api_level_default">ಅಜ್ಞಾತ</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ನಿರ್ಮಾಣ ದಿನಾಂಕ</string>
@@ -104,6 +105,7 @@
   <string name="rename_dialog_hint">ಪ್ರೊಫೈಲ್ ಹೆಸರನ್ನು ಬರೆಯಿರಿ</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">ಮರುಹೊಂದಿಸು</string>
+  <string name="profile_reset_message">ಬಳಕೆದಾರ ಸೃಷ್ಟಿಸಿದ ಎಲ್ಲಾ ಪ್ರೊಫೈಲ್ ಗಳು ಮತ್ತು ಆಪ್ ಗುಂಪುಗಳನ್ನು ಅಳಿಸು ಮತ್ತು ಅವುಗಳನ್ನು ಡಿಫಾಲ್ಟ್ ಗೆ ಪುನಃಸ್ಥಾಪಿಸಲೇ?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">ಈ ಆಪನ್ನು ತೆಗೆ?</string>
   <!-- Profile network mode -->
@@ -251,9 +253,13 @@
   <string name="notification_light_missed_call_title">ತಪ್ಪಿಹೋದ ಕರೆ</string>
   <string name="notification_light_voicemail_title">ಧ್ವನಿಮೇಲ್</string>
   <string name="notification_light_screen_on">ಪರದೆ ಆನ್ ಜೊತೆ ಬೆಳಕು</string>
+  <string name="notification_light_zen_mode">ಲೈಟ್ಸ್ ಇನ್ ಡು ನಾಟ್ ಡಿಸ್ಟರ್ಬ್ ಮೋಡ್</string>
   <string name="notification_light_use_multiple_leds">ಬಹುವಿಧ ಎಲ್ಇಡಿಗಳು</string>
   <string name="keywords_lights_brightness_level">ಎಲ್ಇಡಿಗಳ ಪ್ರಖರತೆಯನ್ನು ಮಂದಗೊಳಿಸು</string>
+  <string name="notification_light_automagic">ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಬಣ್ಣಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ಲೈಟ್ ಸೆಟ್ಟಿಂಗ್ ಗಳು</string>
+  <string name="led_notification_text">LED ಲೈಟ್ ಶಕ್ತಗೊಂಡ ಸೆಟ್ಟಿಂಗ್ ಗಳು</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">ಆಂಡ್ರಾಯ್ಡ್ ಡೀಬಗ್ಗಿಂಗ್</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -285,6 +291,8 @@
   <string name="app_ops_summaries_modify_call_log">ಕರೆ ಲಾಗ್ ಮಾರ್ಪಡಿಸು</string>
   <string name="app_ops_summaries_read_calendar">ಕ್ಯಾಲೆಂಡರ್ ಓದು</string>
   <string name="app_ops_summaries_modify_calendar">ಕ್ಯಾಲೆಂಡರ್ ಮಾರ್ಪಡಿಸು</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi ಸ್ಕ್ಯಾನ್</string>
+  <string name="app_ops_summaries_notification">ಅಧಿಸೂಚನೆ/ಟೋಸ್ಟ್</string>
   <string name="app_ops_summaries_cell_scan">ಸೆಲ್ ಸ್ಕ್ಯಾನ್</string>
   <string name="app_ops_summaries_call_phone">ಸೆಲ್ ಫೋನ್</string>
   <string name="app_ops_summaries_read_sms">ಎಸ್ಎಂಎಸ್ ಓದು</string>
@@ -312,15 +320,39 @@
   <string name="app_ops_summaries_media_volume">ಮಾಧ್ಯಮ ವಾಲ್ಯೂಂ</string>
   <string name="app_ops_summaries_alarm_volume">ಅಲಾರಂ ವಾಲ್ಯೂಂ</string>
   <string name="app_ops_summaries_notification_volume">ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಂ</string>
+  <string name="app_ops_summaries_bluetooth_volume">Bluetooth ವಾಲ್ಯೂಮ್</string>
   <string name="app_ops_summaries_keep_awake">ಎಚ್ಚರವಾಗಿಡು</string>
   <string name="app_ops_summaries_monitor_location">ಸ್ಥಳವನ್ನು ಪರಿವೀಕ್ಷಿಸು</string>
   <string name="app_ops_summaries_monitor_high_power_location">ಅಧಿಕ ಪವರ್ ಸ್ಥಳವನ್ನು ಪರಿವೀಕ್ಷಿಸು</string>
+  <string name="app_ops_summaries_get_usage_stats">ಬಳಕೆಯ ಅಂಕಿಅಂಶ ಪಡೆ</string>
   <string name="app_ops_summaries_mute_unmute_microphone">ಧ್ವನಿಗ್ರಾಹಕವನ್ನು ಮೌನ/ಅಮೌನಿಸು</string>
   <string name="app_ops_summaries_toast_window">ಟೋಸ್ಟ್ ಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_ops_summaries_project_media">ಮಾಧ್ಯಮವನ್ನು ಪ್ರೊಜೆಕ್ಟ್ ಮಾಡು</string>
   <string name="app_ops_summaries_activate_vpn">ವಿಪಿಎನ್ ಸಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="app_ops_summaries_write_wallpaper">ವಾಲ್ ಪೇಪರ್ ಬರೆ</string>
+  <string name="app_ops_summaries_assist_structure">ರಚನೆ ಸಹಾಯ ಮಾಡು</string>
+  <string name="app_ops_summaries_assist_screenshot">ಸ್ಕ್ರೀನ್ ಶಾಟ್ ಗೆ ಸಹಾಯ ಮಾಡು</string>
+  <string name="app_ops_summaries_read_phone_state">ಫೋನ್ ಸ್ಟೇಟ್ ಓದು</string>
+  <string name="app_ops_summaries_add_voicemail">ಧ್ವನಿಮೇಲ್ ಸೇರಿಸಿ</string>
+  <string name="app_ops_summaries_use_sip">SIP ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_summaries_make_call">ಕರೆ ಮಾಡು</string>
+  <string name="app_ops_summaries_use_fingerprint">ಬೆರಳಚ್ಚು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_summaries_use_body_sensors">ಬಾಡಿ ಸೆನ್ಸರ್ ಗಳನ್ನು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">ಸೆಲ್ ಬ್ರಾಡ್ ಕ್ಯಾಸ್ಟ್ ಗಳನ್ನು ಓದು</string>
+  <string name="app_ops_summaries_mock_location">ಅಣಕು ಸ್ಥಳ</string>
+  <string name="app_ops_summaries_read_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹ ಓದು</string>
+  <string name="app_ops_summaries_write_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹಗೆ ಬರೆ</string>
+  <string name="app_ops_summaries_turn_screen_on">ಪರದೆ ಆನ್ ಮಾಡು</string>
+  <string name="app_ops_summaries_get_accounts">ಖಾತೆಗಳನ್ನು ಪಡೆ</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_summaries_toggle_bluetooth">ಬ್ಲೂಟೂತ್ ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_summaries_start_at_boot">ಬೂಟ್ ಆರಂಭಿಸು</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_summaries_toggle_mobile_data">ಮೊಬೈಲ್ ಡಾಟಾ ಟಾಗಲ್ ಮಾಡು</string>
   <string name="app_ops_summaries_superuser">ರೂಟ್ ಪ್ರವೇಶ</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">ಒರಟಾದ ಸ್ಥಳ</string>
+  <string name="app_ops_labels_fine_location">ಉತ್ತಮ ಸ್ಥಳ</string>
   <string name="app_ops_labels_gps">ಜಿಪಿಎಸ್</string>
   <string name="app_ops_labels_vibrate">ಕಂಪಿಸು</string>
   <string name="app_ops_labels_read_contacts">ಸಂಪರ್ಕಗಳನ್ನು ಓದು</string>
@@ -329,11 +361,19 @@
   <string name="app_ops_labels_modify_call_log">ಕರೆ ಲಾಗ್ ಮಾರ್ಪಡಿಸು</string>
   <string name="app_ops_labels_read_calendar">ಕ್ಯಾಲೆಂಡರ್ ಓದು</string>
   <string name="app_ops_labels_modify_calendar">ಕ್ಯಾಲೆಂಡರ್ ಮಾರ್ಪಡಿಸು</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi ಸ್ಕ್ಯಾನ್</string>
   <string name="app_ops_labels_notification">ಅಧಿಸೂಚನೆ/ಟೋಸ್ಟ್</string>
+  <string name="app_ops_labels_cell_scan">ಸೆಲ್ ಸ್ಕ್ಯಾನ್</string>
   <string name="app_ops_labels_call_phone">ದೂರವಾಣಿ ಕರೆಮಾಡು</string>
+  <string name="app_ops_labels_read_sms">SMS ಓದು</string>
+  <string name="app_ops_labels_write_sms">SMS ಬರೆ</string>
   <string name="app_ops_labels_receive_sms">ಎಸ್ಎಂಎಸ್ ಸ್ವೀಕರಿಸು</string>
+  <string name="app_ops_labels_receive_emergency_sms">ತುರ್ತು SMS ಸ್ವೀಕರಿಸು</string>
   <string name="app_ops_labels_receive_mms">ಎಂಎಂಎಸ್ ಸ್ವೀಕರಿಸು</string>
+  <string name="app_ops_labels_receive_wap_push">WAP ಪುಶ್ ಸ್ವೀಕರಿಸು</string>
   <string name="app_ops_labels_send_sms">ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸು</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS ಓದು</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS ಬರೆ</string>
   <string name="app_ops_labels_modify_settings">ಸೆಟ್ಟಿಂಗ್ಸ್ ಮಾರ್ಪಡಿಸು</string>
   <string name="app_ops_labels_draw_on_top">ಮೇಲೆ ಡ್ರಾ ಮಾಡು</string>
   <string name="app_ops_labels_access_notifications">ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರವೇಶಿಸು</string>
@@ -352,10 +392,33 @@
   <string name="app_ops_labels_notification_volume">ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಂ</string>
   <string name="app_ops_labels_bluetooth_volume">ಬ್ಲೂಟೂತ್ ವಾಲ್ಯೂಂ</string>
   <string name="app_ops_labels_keep_awake">ಎಚ್ಚರವಾಗಿಡು</string>
+  <string name="app_ops_labels_monitor_location">ಸ್ಥಳ ಮಾನಿಟರ್ ಮಾಡು</string>
+  <string name="app_ops_labels_monitor_high_power_location">ಅಧಿಕ ಪವರ್ ಸ್ಥಳ ಮಾನಿಟರ್ ಮಾಡು</string>
+  <string name="app_ops_labels_get_usage_stats">ಬಳಕೆಯ ಅಂಕಿಅಂಶ ಪಡೆ</string>
   <string name="app_ops_labels_mute_unmute_microphone">ಧ್ವನಿಗ್ರಾಹಕವನ್ನು ಮೌನ/ಅಮೌನಿಸು</string>
   <string name="app_ops_labels_toast_window">ಟೋಸ್ಟ್ ಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_ops_labels_project_media">ಮಾಧ್ಯಮ ಪ್ರೊಜೆಕ್ಟ್ ಮಾಡು</string>
   <string name="app_ops_labels_activate_vpn">ವಿ‍ಪಿಎನ್ ಸಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="app_ops_labels_write_wallpaper">ವಾಲ್ ಪೇಪರ್ ಬರೆ</string>
+  <string name="app_ops_labels_assist_structure">ರಚನೆಕ್ಕೆ ಸಹಾಯ ಮಾಡು</string>
+  <string name="app_ops_labels_assist_screenshot">ಸ್ಕ್ರೀನ್ ಶಾಟ್ ಗೆ ಸಹಾಯ ಮಾಡು</string>
+  <string name="app_ops_labels_read_phone_state">ಫೋನ್ ಸ್ಟೇಟ್ ಓದು</string>
+  <string name="app_ops_labels_add_voicemail">ಧ್ವನಿಮೇಲ್ ಸೇರಿಸಿ</string>
+  <string name="app_ops_labels_use_sip">SIP ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_labels_make_call">ಕರೆ ಮಾಡು</string>
+  <string name="app_ops_labels_use_fingerprint">ಬೆರಳಚ್ಚು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_labels_use_body_sensors">ಬಾಡಿ ಸೆನ್ಸರ್ ಗಳನ್ನು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_labels_read_cell_broadcasts">ಸೆಲ್ ಬ್ರಾಡ್ ಕ್ಯಾಸ್ಟ್ ಗಳನ್ನು ಓದು</string>
+  <string name="app_ops_labels_mock_location">ಅಣಕು ಸ್ಥಳ</string>
+  <string name="app_ops_labels_read_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹ ಓದು</string>
+  <string name="app_ops_labels_write_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹಗೆ ಬರೆ</string>
+  <string name="app_ops_labels_turn_screen_on">ಪರದೆ ಆನ್ ಮಾಡು</string>
+  <string name="app_ops_labels_get_accounts">ಖಾತೆಗಳನ್ನು ಪಡೆ</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_labels_toggle_bluetooth">ಬ್ಲೂಟೂತ್ ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_labels_start_at_boot">ಬೂಟ್ ಆರಂಭಿಸು</string>
+  <string name="app_ops_labels_toggle_nfc">NFC ಟಾಗಲ್ ಮಾಡು</string>
+  <string name="app_ops_labels_toggle_mobile_data">ಮೊಬೈಲ್ ಡಾಟಾ ಟಾಗಲ್ ಮಾಡು</string>
   <string name="app_ops_labels_superuser">ರೂಟ್ ಪ್ರವೇಶ</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">ಅನುಮತಿಸಿದೆ</string>
@@ -535,8 +598,13 @@
   <string name="live_display_color_profile_dynamic_title">ಕ್ರಿಯಾತ್ಮಕ</string>
   <string name="live_display_color_profile_dynamic_summary">ವರ್ಧಿತ ಬಣ್ಣಗಳು ಮತ್ತು ಪ್ರಖರ ಬಿಳಿಗಳು</string>
   <string name="live_display_color_profile_cinema_title">ಸಿನಿಮಾ</string>
+  <string name="live_display_color_profile_cinema_summary">ವೀಡಿಯೋಕ್ಕೆ ಪರಿಪೂರ್ಣ ಬಣ್ಣದ ಪುನರುತ್ಪಾದನೆ</string>
   <string name="live_display_color_profile_astronomy_title">ಖಗೋಳವಿಜ್ಞಾನ</string>
   <string name="live_display_color_profile_astronomy_summary">ರಾತ್ರಿ ವೀಕ್ಷಣೆಯನ್ನು ಕಾಪಾಡಲು ಕಡುಗೆಂಪು</string>
+  <string name="live_display_color_profile_photography_title">ಛಾಯಾಗ್ರಹಣ</string>
+  <string name="live_display_color_profile_photography_summary">ಫೊಟೋಗಳಿಗೆ ಪರಿಪೂರ್ಣ ಬಣ್ಣದ ಪುನರುತ್ಪಾದನೆ</string>
+  <string name="live_display_color_profile_basic_title">ಮೂಲಭೂತ</string>
+  <string name="live_display_color_profile_basic_summary">ಪ್ರದರ್ಶನವು ಅನ್ ಕ್ಯಾಲಿಬರೇಟೆಡ್ ಅನ್ನು ಉಪಯೋಗಿಸಿ</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">ಆಯ್ಕೆಮಾಡುವ ಐಕಾನ್</string>
   <string name="ime_switcher_notify_summary">ಇನ್ಪುಟ್ ವಿಧಾನ ಆಯ್ಕೆಮಾಡುವ ಐಕಾನ್ ಪ್ರದರ್ಶಿಸು</string>
@@ -645,6 +713,8 @@
   <string name="status_bar_battery_percentage_text_inside">ಐಕಾನ್‍ನ ಒಳಗೆ</string>
   <string name="status_bar_battery_percentage_text_next">ಐಕಾನ್‍ನ ನಂತರ</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">ಸ್ಥಿತಿ ಪಟ್ಟಿ ಐಕಾನ್ ಗಳು</string>
+  <string name="status_bar_icons_summary">ಸ್ಥಿತಿ ಪಟ್ಟಿ ಐಕಾನ್ ಗಳನ್ನು ತೋರಿಸುವುದನ್ನು ನಿಯಂತ್ರಿಸು</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">ಸನ್ನೆ ಸ್ಪರ್ಶ ಘಟನೆಗಳನ್ನು ನಿರ್ಬಂಧಿಸು</string>
   <string name="edge_gesture_service_summary">ನಾವಿಗೇಶನ್ ಮತ್ತು ಸ್ಟೇಟಸ್ ಬಾರ್ ಸೆನ್ನೆಗಳಿಗಾಗಿ ಆಪ್‍ಗಳಿಗೆ ಸ್ಪರ್ಶ ಘಟನೆಗಳನ್ನು ಕಳುಹಿಸಬೇಡ</string>
@@ -681,6 +751,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">ಸಂಗೀತ ದೃಶ್ಯೀಕರಣವನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">ಕ್ಷಿಪ್ರ ಸೆಟ್ಟಿಂಗ್ ಗಳ ಟೈಲ್ ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಸಕ್ರಿಯಗೊಳಿಸಲು ತಟ್ಟು</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">ಲಾಕ್ ಸ್ಕ್ರೀನ್ ಸಕ್ರಿಯಗೊಂಡಿದೆ!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಹೊಸ್ತಿಲು</string>
   <string name="battery_saver_summary">ಕಾರ್ಯನಿರ್ವಹಣೆ ಕಡಿಮೆಗೊಳಿಸು ಮತ್ತು ಹಿನ್ನೆಲೆ ಡೇಟಾವನ್ನು ಮಿತಿಗೊಳಿಸು</string>
@@ -690,6 +763,7 @@
   <string name="autoperf_summary">ವಿವಿಧ ಆಪ್‍ಗಳಿಗೆ ಸೂಕ್ತವಾದ ಬ್ಯಾಟರಿ ಮೋಡನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆರಿಸು</string>
   <string name="perf_profile_title">ಬ್ಯಾಟರಿ ಮೋಡ್</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">ಬೂಟ್ ಮೇಲೆ ಆಪ್ ಗಳು ಆರಂಭಗೊಂಡಿವೆ</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">ಅಧಿಸೂಚನೆ ಟೋನ್</string>
   <!-- Advanced reboot options -->
@@ -718,6 +792,7 @@
   <string name="voice_wakeup_retrain_title">ನಿಮ್ಮ ಧ್ವನಿಯನ್ನು ಪುನಃ ತರಬೇತಿಸಿ</string>
   <string name="voice_wakeup_activity_title">ಆರಂಭಿಸಲು ಚಟುವಟಿಕೆ</string>
   <string name="voice_wakeup_default_activity">ಗೂಗಲ್ ನೌ</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">ಧ್ವನಿ ಎಚ್ಚರಿಕೆಗೆ ನೇರ ಡಯಲ್ ಸಂಪರ್ಕಕ್ವನ್ನು ಆಯ್ಕೆ ಮಾಡಲು ಫೋನ್ ಕರೆ ಅನುಮತಿಗಳು ಬೇಕಾಗುತ್ತವೆ.</string>
   <string name="picker_activities">ಚಟುವಟಿಕೆಗಳು</string>
   <string name="select_custom_app_title">ಕಸ್ಟಮ್ ಆಪ್ ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="select_custom_activity_title">ಕಸ್ಟಮ್ ಚಟುವಟಿಕೆ ಆಯ್ಕೆಮಾಡಿ</string>
@@ -788,17 +863,23 @@
   <string name="menu_hidden_apps_delete">ಮರುಹೊಂದಿಸು</string>
   <string name="menu_hidden_apps_reset_lock">ನಮೂನೆ ಲಾಕ್ ಮರುಹೊಂದಿಸಿ</string>
   <string name="protected_apps">ಸಂರಕ್ಷಿತ ಆಪ್ಸ್</string>
+  <string name="protected_apps_summary">ಸುರಕ್ಷಿತ ಲಾಕ್ ಹಿಂದೆ ಅಡಗಿರುವ ಅಪ್ಲಿಕೇಶನ್ ನಿರ್ವಹಿಸು</string>
   <string name="saving_protected_components">ಘಟಕ ಸ್ಥಿತಿಯನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ\u2026</string>
   <string name="pa_login_username_hint">ಬಳಕೆದಾರಹೆಸರು (ಇಮೇಲ್)</string>
   <string name="pa_login_password_hint">ಪ್ರವೇಶಪದ</string>
   <string name="pa_login_submit_button">ಸೈನ್ ಇನ್</string>
   <string name="pa_login_checking_password">ಖಾತೆಯನ್ನು ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ\u2026</string>
   <string name="pa_login_incorrect_login">ಲಾಗಿನ್ ಸರಿಯಾಗಿಲ್ಲ</string>
+  <string name="pa_pattern_or_fingerprint_header">ಅನ್ ಲಾಕ್ ಮಾಡಲು ವಿಧವನ್ನು ಎಳೆ ಅಥವಾ ಬೆರಳಚ್ಚು ಉಪಯೋಗಿಸು</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">ಯೋಗದಾನೀತರು</string>
   <string name="contributors_cloud_loading_message">ಯೋಗದಾನೀತರ ಡೇಟಾ ಲೋಡಾಗುತ್ತಿದೆ\u2026</string>
   <string name="contributors_cloud_failed_message">ಯೋಗದಾನೀತರ ಡೇಟಾ ಲೋಡ್ ಮಾಡಲು ಆಗುತ್ತಿಲ್ಲ</string>
   <string name="contributor_info_menu">ಯೋಗದಾನೀತನ ಮಾಹಿತಿ</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Name:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Nick:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>"ಕಮಿಟ್ಸ್"</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">ಯೋಗದಾನಗಳ ಮಾಹಿತಿ</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>ಒಟ್ಟು ಯೋಗದಾನೀತರು:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -814,24 +895,44 @@
   <string name="title_general">ಸಾಮಾನ್ಯ</string>
   <string name="advanced">ಸುಧಾರಿತ</string>
   <string name="link_volume_option_title">ರಿಂಗ್‍ಟೋನ್ &amp; ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಂ ಜೋಡಿಸು</string>
+  <string name="lcd_density_prompt_message">ಸ್ಟಾಂಡರ್ಡೇತರ DPIನಲ್ಲಿ ಕೆಲವು ಆಪ್ ಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು.\n\nಇದು ನಿಮ್ಮ ಸಾಧನ ಅನ್ನು ಮರುಆರಂಭಿಸಲಿವೆ.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ಫಓನ್ ಸಂಖ್ಯೆ</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">ನಕಲು APN,</string>
+  <string name="duplicate_apn_error_message">ಈ ಅಪ್ಲಿಕೇಶನ್ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ. ತಿರಸ್ಕರಿಸಬಹುದು ಅಥವಾ ನಿಯತಾಂಕಗಳನ್ನು ಬದಲಾಯಿಸಿ.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> ಆಗಿದೆ <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ</string>
   <string name="sim_missing">ಕಾಣೆಯಾಗಿದೆ ಅಥವ ದೋಷಯುಕ್ತವಾಗಿದೆ</string>
+  <string name="sim_enabler_need_disable_sim">SIM ಕಾರ್ಡ್ ನಿಷ್ಕ್ರಿಯಗೊಳ್ಳಲಿದೆ. ನೀವು ಮುಂದುವರಿಯಲು ಬಯಸುತ್ತೀರಾ?</string>
+  <string name="sim_enabler_will_disable_sim_title">ಗಮನಿಸಿ</string>
+  <string name="sim_enabler_need_switch_data_service">ಈ SIM ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ ಮತ್ತು SIM <xliff:g id="slotid">%1$s</xliff:g> ಅನ್ನುಡಾಟಾ ಸೇವೆಗಳಿಗಾಗಿ ಉಪಯೋಗಿಸಲಾಗುತ್ತದೆ. ನೀವು ಮುಂದುವರಿಯಲು ಬಯಸುತ್ತೀರಾ?</string>
   <string name="sim_enabler_airplane_on">ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಏರೋಪ್ಲೇನ್ ಮೋಡ್ ಆನ್ ಇರುವಾಗ ನಿರ್ವಹಿಸಲು ಆಗುವುದಿಲ್ಲ.</string>
   <string name="sim_enabler_in_call">ಕಾರ್ಯಾಚರಣೆಯನ್ನು ಕರೆಯಲ್ಲಿರುವಾಗ ನಿರ್ವಹಿಸಲು ಆಗುವುದಿಲ್ಲ.</string>
   <string name="sim_enabler_both_inactive">ಎಲ್ಲಾ ಸಿಮ್ ಕಾರ್ಡ್‍ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ</string>
+  <string name="sim_enabler_enabling">ಸಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ \u2026</string>
+  <string name="sim_enabler_disabling">ನಿಷ್ಕ್ರಿಯಗೊಳ್ಳುತ್ತಿದೆ\u2026</string>
+  <string name="sub_activate_success">SIM ಸಕ್ರಿಯಗೊಂಡಿದೆ</string>
+  <string name="sub_activate_failed">ಸಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲಗೊಂಡಿದೆ.</string>
+  <string name="sub_deactivate_success">SIM ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ.</string>
+  <string name="sub_deactivate_failed">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಿಕೆ ವಿಫಲಗೊಂಡಿದೆ.</string>
   <string name="primary_sub_select_title">ಡೀಫಾಲ್ಟ್ 3G/LTE ಚಂದಾದಾರತ್ವ</string>
+  <string name="select_sim_card">ಸಿಮ್‌ ಕಾರ್ಡ್ ಆಯ್ಕೆಮಾಡಿ</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">ಸಿಮ್ %d ಸ್ಥಿತಿ</string>
   <string name="sim_card_lock_settings_title">ಸಿಮ್ %d ಲಾಕ್ ಸೆಟ್ಟಿಂಗ್ಸ್</string>
   <string name="sim_card_summary_empty">ಸಿಮ್ ಅಳವಡಿಸಲಾಗಿಲ್ಲ</string>
+  <string name="sim_mobile_network_settings_category_title">ಮೊಬೈಲ್ ನೆಟ್ ವರ್ಕ್ ಸೆಟ್ಟಿಂಗ್ ಗಳು</string>
   <string name="sim_mobile_network_settings_title">ಸಿಮ್ %d ಸೆಟ್ಟಿಂಗ್ಸ್</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">ರಿಮೈಂಡರ್</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ಈವೆಂಟ್‌ಗಳು</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">ಆಯ್ಕೆ ಮಾಡಿದ ಸಂದೇಶಗಳು</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Head: %1$s W/kg</string>
@@ -841,8 +942,11 @@
   <string name="ic_code_full">ಐಸಿ: %1$s</string>
   <string name="sim_ringtone_title">ಸಿಮ್ %d ರಿಂಗ್‍ಟೊನ್</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">ಅಪ್ಲಿಕೇಶನ್‌</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">ಕಳೆದ ಬಾರಿಯ ಬಳಕೆ</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">ಬಳಕೆ ಸಮಯ</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">ನಿದು ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‍ನ <b>ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ</b>ಯಲ್ಲಿರುವ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ, ಇದು:\n\n<li>ನಿಮ್ಮ ಸಾಧನ ಖಾತೆಗಳು</li>\n<li>ಸಿಸ್ಟಂ ಮತ್ತು ಆಪ್ ಡೇಟಾ ಹಾಗು ಸೆಟ್ಟಿಂಗ್ಸ್</li>\n<li>ಡೌನ್‍ಲೋಡ್ ಮಾಡಲಾದ ಆಪ್‍ಗಳನ್ನು ಒಳಗೊಂಡಿದೆ</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -859,16 +963,36 @@
   <string name="factory_reset_warning_text_reset_now">ಈಗ ಮರುಹೊಂದಿಸು</string>
   <string name="factory_reset_warning_text_message">ಈ ಸಾಧನದಲ್ಲಿರುವ ನಿಮ್ಮ ಎಲ್ಲಾ ಖಾತೆಗಳನ್ನು, ಆಪ್ಸ್, ಆಪ್ ಡೇಟಾ, ಮತ್ತು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಅಳಿಸಿಹಾಕುತ್ತದೆ. ಇದನ್ನು ಹಿಂದಿರುಗಿಸಲಾಗುವುದಿಲ್ಲ.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">ಇತರೆ</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi hotspot timeout</string>
   <string name="hotstpot_inactivity_timeout_never">ಎಂದಿಗೂ ಬೇಡ</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 ನಿಮಿಷ</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 ನಿಮಿಷಗಳು</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutes</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Portable Wi\u2011Fi hotspot will never timeout</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Portable Wi\u2011Fi hotspot will timeout after <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ಲೈವ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">ಸಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಲೈವ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ಗಳನ್ನು ಸಂರಚಿಸಿ</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">ಸೆಟ್ಟಿಂಗ್ಸ್</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ಲಭ್ಯವಿರುವ ಲೈವ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ಗಳನ್ನು ವೀಕ್ಷಿಸಲು,‌ ಲೈವ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ನನ್ನು ಆನ್ ಮಾಡಿ.</string>
   <string name="interruptions_ignore_while_media_title">ಆಡಿಯೋ ಮುಳುಗುವಿಕೆ ತಡೆಗಟ್ಟು</string>
   <string name="interruptions_ignore_while_media_summary">ಅಧಿಸೂಚನೆ ಆಗಮಿಸಿದಾಗ ಮಾಧ್ಯಮ ಪ್ಲೇ ಬ್ಯಾಕ್ ವಾಲ್ಯೂಂನ್ನು ಕಡಿಮೆ ಮಾಡಬೇಡ</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod ಕಾನೂನು</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">ಅಂಕಿಅಂಶಗಳನ್ನು ಮರುಹೊಂದಿಸಿ</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">ಬ್ಯಾಟರಿ ಇತಿಹಾಸ ಅಂಕಿಅಂಶಗಳನ್ನು ಮರುಹೊಂದಿಸಲಾಗುತ್ತದೆ</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ಡಾಕ್ ಬ್ಯಾಟರಿ ಉಪಸ್ಥಿತವಾಗಿಲ್ಲ</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ಡಾಕ್ ಎಸಿಯ ಮೇಲೆ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">ಡಾಕ್ ಯು‍ಎಸ್‍ಬಿಯ ಮೂಲಕ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index a6b84ab..90637a1 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -980,4 +980,14 @@
   <string name="interruptions_ignore_while_media_summary">알림시 미디어 재생 소리를 줄이지 않음</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod 법적 고지</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">통계 재설정</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">배터리 사용 데이터가 초기화됩니다</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">독 베터리 없음</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">독 AC로 충전중</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">독 USB로 충전중</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 8ce58fe..a220a47 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -761,4 +761,9 @@
   <string name="interruptions_ignore_while_media_summary">دەنگی میدیا دەنگ کەم مەکەرەوە کاتێک تێبینیەک دەگات</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">یاسای وەشانەکە</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ku/strings.xml b/res/values-ku/strings.xml
index 165e95c..a58ac91 100644
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -1950,6 +1950,7 @@
   <string name="call_settings_title">ڕێکخستنی تەلەفۆنکردنن</string>
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
   <string name="call_settings_summary">دانانی دەنگە ئیمەیڵ، تەلەفۆن .تەلەفۆنی چاوەڕوان، تەلەفۆنID</string>
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
   <string name="tether_settings_title_usb">USB ئەشكيل</string>
@@ -2284,6 +2285,7 @@
   <string name="ask_compatibility">پرسیاربکە کاتێک دامەزرا</string>
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <string name="enable_compatibility">هەڵسەنگاندنی بەرنامە</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <string name="unknown">نەناسراو</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
@@ -2467,6 +2469,7 @@
   <string name="memory">ڕام</string>
   <!-- Text to label a process entry with the process name. -->
   <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">بەکارهێنەر: <xliff:g id="user_name">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
@@ -3180,6 +3183,7 @@
   <string name="menu_stats_total">بەکارهێنانی گشتی</string>
   <!-- Menu label for refreshing with latest usage numbers -->
   <string name="menu_stats_refresh">بوژاندنه‌وه‌</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <string name="process_kernel_label">ئەندرۆید OS</string>
   <!-- Label for mediaserver process in battery usage -->
@@ -3988,8 +3992,10 @@
   <string name="data_usage_sweep_warning"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">ئاگەداری</font></string>
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
   <string name="data_usage_sweep_limit"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">سنور</font></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps">بەرنامەکە سڕایەوە</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps_users">بەرنامەکە سڕایەوە و بەکارهێنەریش</string>
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
@@ -4208,6 +4214,7 @@
   <string name="user_delete_user_description">سڕینەوەی بەکارهێنەر</string>
   <!-- Delete button text [CHAR LIMIT=25] -->
   <string name="user_delete_button">سڕینه‌وه‌</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -4572,6 +4579,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -4824,4 +4832,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index fa7b26e..d4a44c8 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -865,4 +865,14 @@
   <string name="interruptions_ignore_while_media_summary">Medielautstäerkt net reduzéiere wann eng Notifikatioun empfaange gëtt</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Rechtlech Hiweiser iwwer CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Statistiken zrécksetzen</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistiken iwwer den Akkuverlaf ginn zréckgesat</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dock-Akku net disponibel</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Gëtt mam Dock gelueden</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Luede mam USB-Dock</string>
 </resources>
diff --git a/res/values-lb/strings.xml b/res/values-lb/strings.xml
index 969c073..a75eacf 100644
--- a/res/values-lb/strings.xml
+++ b/res/values-lb/strings.xml
@@ -26,7 +26,9 @@
   <!-- Strings for Dialog deny button -->
   <string name="deny">Verweigeren</string>
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <string name="dlg_close">Zoumaachen</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <string name="dlg_switch">Wiesselen</string>
   <!-- Device Info -->
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Onbekannt</string>
@@ -197,6 +199,7 @@
   <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disconnect_all_profiles">D\'Connectioun gëtt ënnerbrach mat:&lt;br&gt;&lt;b&gt;<xliff:g id="device_name">%1$s</xliff:g>&lt;/b&gt;</string>
   <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <string name="bluetooth_empty_list_user_restricted">Du hues keng Berechtegung fir d\'Bluetooth-Astellungen z\'änneren.</string>
   <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
   <string name="bluetooth_is_visible_message"><xliff:g id="device_name">%1$s</xliff:g> ass fir d\'Apparater an der Géigend visibel soulaang d\'Bluetooth-Astellungen op sinn.</string>
   <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
@@ -2060,6 +2063,7 @@
   <string name="call_settings_title">Uruffastellungen</string>
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
   <string name="call_settings_summary">Mailbox, Uruffweiderleedung, Uklappen an Uruffer-Kennung ariichten</string>
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
   <string name="tether_settings_title_usb">USB-Tethering</string>
@@ -2409,6 +2413,7 @@
   <string name="ask_compatibility">Beim Start froen</string>
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <string name="enable_compatibility">App skaléieren</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <string name="unknown">Onbekannt</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
@@ -2589,6 +2594,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="memory">RAM</string>
   <!-- Text to label a process entry with the process name. -->
   <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">Benotzer: <xliff:g id="user_name">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
@@ -3364,6 +3370,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="menu_stats_total">Gesamtverbrauch</string>
   <!-- Menu label for refreshing with latest usage numbers -->
   <string name="menu_stats_refresh">Opfrëschen</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <string name="process_kernel_label">Android OS</string>
   <!-- Label for mediaserver process in battery usage -->
@@ -4227,8 +4234,10 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="data_usage_sweep_warning"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">Warnung</font></string>
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
   <string name="data_usage_sweep_limit"><font size="21"><xliff:g id="number" example="128">^1</xliff:g></font> <font size="9"><xliff:g id="unit" example="KB">^2</xliff:g></font>\n<font size="12">Limitt</font></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps">Geläscht Appen</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps_users">Geläscht Appen a Benotzer</string>
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
@@ -4463,6 +4472,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="user_delete_user_description">Benotzer läschen</string>
   <!-- Delete button text [CHAR LIMIT=25] -->
   <string name="user_delete_button">Läschen</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <string name="user_guest">Gaascht</string>
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
@@ -4837,6 +4847,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
   <string name="screen_locking_sounds_title">Téin beim Späre vum Schierm</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <string name="charging_sounds_title">Téin beim Oplueden</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
   <string name="docking_sounds_title">Téin beim Docken</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
@@ -4988,6 +4999,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <string name="screen_pinning_unlock_password">E Passwuert froe fir e Schierm fräizeginn</string>
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <string name="screen_pinning_unlock_none">Apparat beim Ofschloss spären</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <string name="managed_user_title">Aarbechtsprofil</string>
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
@@ -5273,4 +5285,7 @@ Fir d\'Performance ze verbesseren an de Späicherverbrauch ze reduzéiere stinn
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index f1c58f1..b2859bb 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -870,4 +870,14 @@
   <string name="interruptions_ignore_while_media_summary">Nesumažinti medijos atkūrimo garsumo, kai gaunamas pranešimas</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Teisinė „CyanogenMod“ informacija</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Nustatyti iš naujo statistiką</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Akumuliatoriaus istorijos statistika bus nustatyta iš naujo</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Nėra doko akumuliatoriaus</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Įkraunama ant doko AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Įkraunama per USB doką</string>
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index f835b28..2b67c9a 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -545,4 +545,9 @@
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod atbildība</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ml-rIN/cm_plurals.xml b/res/values-ml-rIN/cm_plurals.xml
new file mode 100644
index 0000000..f4f280a
--- /dev/null
+++ b/res/values-ml-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g>സെക്കന്റ്</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g>സെക്കന്റ്</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">ഒരിക്കല്</item>
+    <item quantity="other">%d പ്രാവശ്യം</item>
+  </plurals>
+</resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 5fd19c8..37427cd 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -17,161 +17,981 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കുന്നതിന് നിങ്ങള്‍ %1$d ഘട്ടം അകലെയാണ്.</item>
+    <item quantity="other">ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കുന്നതിന് നിങ്ങള്‍ <xliff:g id="step_count">%1$d</xliff:g> ഘട്ടങ്ങൾ അകലെയാണ്.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">നിങ്ങൾ ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കി!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">ആവശ്യമില്ല, നിങ്ങൾ ഇതിനകം ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കി.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">വികസന ഉപകരണങ്ങൾ</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">ഡെവലപ്പ്മെന്റ് ഷോര്‍ട്ട്കട്ട്</string>
+  <string name="development_shortcut_summary">സമീപകാല ആപ്ലിക്കേഷനുകളുടെ ലിസ്റ്റിൽ ആപ്ലിക്കേഷൻ മാനേജ്മെന്റ് ഷോര്‍ട്ട്കട്ടുകള്‍ പ്രാപ്തമാക്കുക</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">റൂട്ട് പ്രവേശനം</string>
+  <string name="root_access_warning_title">റൂട്ട് പ്രവേശനം അനുവദിക്കണോ?</string>
+  <string name="root_access_warning_message">റൂട്ട് പ്രവേശനം അഭ്യർത്ഥിക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കുന്നത് വളരെ അപകടകരവും നിങ്ങളുടെ സിസ്റ്റത്തിന്റെ സുരക്ഷയിൽ വിട്ടുവീഴ്ച ചെയ്യേണ്ടതായും വരുന്നതാണ്!</string>
+  <string name="root_access_none">പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="root_access_apps">ആപ്ലിക്കേഷനുകള്‍ മാത്രം</string>
+  <string name="root_access_adb">ADB മാത്രം</string>
+  <string name="root_access_all">അപ്ലിക്കേഷനുകളും ADB യും</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">CyanogenMod പതിപ്പ്</string>
+  <string name="mod_version_default">അജ്ഞാതം</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">ഉപകരണ മോഡൽ</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">ഉപകരണത്തിന്റെ പേര്</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API ലെവൽ</string>
+  <string name="mod_api_level_default">അജ്ഞാതം</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">ബിൽഡ് തീയതി</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">CyanogenMod അപ്ഡേറ്റുകൾ</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Cyanogen റിക്കവറി അപ്ഡേറ്റ് ചെയ്യുക</string>
+  <string name="update_recovery_summary">സിസ്റ്റം അപ്ഡേറ്റുകളിലൂടെ റിക്കവറി അപ്ഡേറ്റ് ചെയ്യുക</string>
+  <string name="update_recovery_on_warning">അറിയിപ്പ്: ഈ സവിശേഷത പ്രാപ്തമാക്കുമ്പോൾ, ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടുള്ള നിങ്ങളുടെ റിക്കവറി ഇപ്പോള്‍ പ്രവര്‍ത്തിക്കുന്ന OS ന്‍റെ നിലവിലെ പതിപ്പ് ഉള്‍പ്പെടുന്ന മറ്റൊന്ന് ഉപയോഗിച്ച് മാറ്റിസ്ഥാപിക്കുന്നതാണ്.\n\nഭാവിയിലെ പതിപ്പുകളുമായി അനുയോജ്യത ഉറപ്പുവരുത്താൻ സഹായിക്കുന്നതിന്, നവീകരണങ്ങള്‍ക്കൊപ്പം നിങ്ങളുടെ റിക്കവറി അപ്ഡേറ്റ് ചെയ്യുന്നതാണ്.\n\nഈ സവിശേഷത നിങ്ങള്‍ക്ക് പ്രാപ്തമാക്കണോ?</string>
+  <string name="update_recovery_off_warning">മുന്നറിയിപ്പ്: ഈ സവിശേഷത അപ്രാപ്തമാക്കിയിരിക്കുമ്പോള്‍, ഇന്‍സ്റ്റാള്‍ ചെയ്തിട്ടുള്ള നിങ്ങളുടെ റിക്കവറി OS നവീകരണങ്ങള്‍ക്കൊപ്പം അപ്ഡേറ്റ് ചെയ്യുന്നതല്ല.\n\nകാലഹരണപ്പെട്ട അല്ലെങ്കില്‍ ഇഷ്ടാനുസൃത റിക്കവറി പതിപ്പുകളില്‍ ഭാവിയിലെ OS അപ്ഡേറ്റുകള്‍ ഇന്‍സ്റ്റാള്‍ ചെയ്യുകയില്ല.\n\nഈ സവിശേഷത നിങ്ങള്‍ക്ക് ശരിക്കും അപ്രാപ്തമാക്കണോ?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">തീമുകൾ</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">റിംഗ് മോഡ്</string>
+  <string name="ring_mode_normal">സാധാരണ</string>
+  <string name="ring_mode_vibrate">വൈബ്രേറ്റുചെയ്യുക</string>
+  <string name="ring_mode_mute">മ്യൂട്ടുചെയ്യുക</string>
+  <string name="settings_reset_button">പുനഃസജ്ജമാക്കുക</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">സിസ്റ്റം പ്രൊഫൈലുകൾ</string>
+  <string name="profiles_add">ചേര്‍ക്കുക</string>
+  <string name="profile_menu_delete">ഇല്ലാതാക്കുക</string>
+  <string name="profile_settings_title">പ്രൊഫൈൽ</string>
+  <string name="profile_empty_list_profiles_off">കോണ്‍ഫിഗര്‍ ചെയ്യുന്നതിനും സിസ്റ്റം പ്രൊഫൈലുകൾ ഉപയോഗിക്കുന്നതിനും പ്രൊഫൈലുകൾ ഓണ്‍ ചെയ്യുക.</string>
+  <string name="profile_trigger_configure">ട്രിഗ്ഗർ കോണ്‍ഫിഗര്‍ ചെയ്യുക</string>
+  <string name="profile_write_nfc_tag">NFC ടാഗിലേക്ക് റൈറ്റുചെയ്യുക</string>
+  <string name="profile_write_touch_tag">റൈറ്റ് ചെയ്യാന്‍ ടാഗ് സ്പര്‍ശിക്കുക</string>
+  <string name="profile_write_success">ടാഗ് വിജയകരമായി റൈറ്റ് ചെയ്തു</string>
+  <string name="profile_write_failed">ടാഗ് റൈറ്റ് ചെയ്യുന്നത് പരാജയപ്പെട്ടു!</string>
+  <string name="profile_selected">തിരഞ്ഞെടുത്ത പ്രൊഫൈൽ: %1$s</string>
+  <string name="profile_nfc_text">ഒരു NFC ടാഗിലേക്ക് ഒരു പ്രൊഫൈൽ റൈറ്റ് ചെയ്യുന്നതിലൂടെ പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുന്നതിന് ടാഗ് സ്പര്‍ശിക്കുവാന്‍ അനുവദിക്കുന്നു. രണ്ടാമതും സ്പര്‍ശിക്കുന്നത് മുമ്പ് തിരഞ്ഞെടുത്ത പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുന്നതാണ്.</string>
+  <string name="profile_unknown_nfc_tag">അജ്ഞാത പ്രൊഫൈൽ</string>
+  <string name="profile_add_nfc_text">ഈ NFC ടാഗ് ഒരു അജ്ഞാത പ്രൊഫൈലിനെ സൂചിപ്പിക്കുന്നു. നിലവിലുള്ള ഒരു പ്രൊഫൈലിലേക്ക് ഈ NFC ടാഗ് അറ്റാച്ച് ചെയ്യുന്നത് ഭാവിയിൽ പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുന്നതിന് അനുവദിക്കുന്നതാണ്.</string>
+  <string name="profile_select">പ്രൊഫൈൽ തിരഞ്ഞെടുക്കുക</string>
+  <string name="profile_remove_dialog_message">%1$s പ്രൊഫൈൽ നീക്കം ചെയ്യണോ?</string>
+  <string name="profile_populate_profile_from_state">നിലവിലെ ഉപകരണ ക്രമീകരണങ്ങള്‍ ഉപയോഗിച്ച് പ്രൊഫൈല്‍ കോണ്‍ഫിഗര്‍ ചെയ്യണോ?</string>
+  <string name="profile_menu_fill_from_state">നിലവിലെ ഉപകരണ ക്രമീകരണങ്ങൾ ഇംപോർട്ട് ചെയ്യുക</string>
+  <string name="profile_remove_current_profile">നിലവിലെ പ്രൊഫൈൽ ഇല്ലാതാക്കാൻ കഴിയില്ല!</string>
+  <string name="profile_app_group_category_title">അറിയിപ്പ് ഓവറൈഡ്സ്</string>
+  <string name="profile_app_group_item_instructions">ഗ്രൂപ്പുകൾ ചേർക്കുക അല്ലെങ്കിൽ നീക്കം ചെയ്യുക</string>
+  <string name="profile_app_group_item_instructions_summary">അറിയിപ്പ് ഓവറൈഡ്സ് ആപ്ലിക്കേഷൻ ഗ്രൂപ്പുകൾ ഈ പ്രൊഫൈലിലേക്ക് ചേർക്കുക അല്ലെങ്കിൽ നീക്കം ചെയ്യുക</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">ഓണാക്കുക</string>
+  <string name="profile_entries_off">ഓഫാണ്</string>
+  <string name="profile_entries_no_override">ഓവറൈഡ്സ് ഇല്ല</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">പേര്</string>
+  <string name="new_profile_name">&lt;new profile&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">പേരുമാറ്റുക</string>
+  <string name="rename_dialog_message">ഒരു പുതിയ പേര് രേഖപ്പെടുത്തുക</string>
+  <string name="duplicate_appgroup_name">ആപ്ലിക്കേഷന്‍ ഗ്രൂപ്പിന്റെ പേര് ഡ്യൂപ്ലിക്കേറ്റ്</string>
+  <string name="rename_dialog_hint">പ്രൊഫൈൽ നാമം രേഖപ്പെടുത്തുക</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">പുനഃസജ്ജമാക്കുക</string>
+  <string name="profile_reset_message">ഉപയോക്താക്കള്‍ സൃഷിടിച്ച എല്ലാ പ്രൊഫൈലുകളും അപ്ലിക്കേഷൻ ഗ്രൂപ്പുകളും ഇല്ലാതാക്കി അവയെ ഡീഫോള്‍ട്ടിലേക്ക് പുനസ്ഥാപിക്കണോ?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">ഈ ആപ്ലിക്കേഷൻ നീക്കം ചെയ്യണോ?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE/4G</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">വോളിയം ഓവറൈഡ്സ്</string>
+  <string name="connection_state_enabled">പ്രവർത്തനക്ഷമമാക്കുക</string>
+  <string name="volume_override_summary">%1$s/%2$s ലേക്ക് സജ്ജമാക്കുക</string>
+  <string name="profile_volume_override_checkbox_label">വോളിയം ഓവറൈഡ് ചെയ്യുക</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">പ്രൊഫൈലുകൾ</string>
+  <string name="profile_profile_manage">പ്രൊഫൈൽ കൈകാര്യം ചെയ്യുക</string>
+  <string name="profile_appgroups_manage">ആപ്ലിക്കേഷൻ ഗ്രൂപ്പുകൾ</string>
+  <string name="profile_appgroup_manage">ആപ്പ് ഗ്രൂപ്പ് കൈകാര്യം ചെയ്യുക</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">പ്രൊഫൈൽ ക്രമീകരണങ്ങൾ</string>
+  <string name="profile_trigger_connect">ഓണ്‍ കണക്റ്റ്</string>
+  <string name="profile_trigger_disconnect">ഓണ്‍ ഡിസ്കണക്റ്റ്</string>
+  <string name="profile_trigger_notrigger">ട്രിഗ്ഗർ ഇല്ല</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">അറിയിപ്പ് മോഡ്</string>
+  <string name="ringer_mode">റിംഗ് മോഡ്</string>
+  <string name="lights_mode">ലൈറ്റ്സ് മോഡ്</string>
+  <string name="vibrate_mode">വൈബ്രേറ്റ് മോഡ്</string>
+  <string name="choose_soundtone">അറിയിപ്പ് ടോൺ തിരഞ്ഞെടുക്കുക</string>
+  <string name="choose_ringtone">റിംഗ്‌ടോൺ തിരഞ്ഞെടുക്കുക</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">അറിയിപ്പ് ടോൺ</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ആപ്ലിക്കേഷൻ ഗ്രൂപ്പുകൾ</string>
+  <string name="profile_applist_title">അപ്ലിക്കേഷനുകൾ</string>
+  <string name="profile_new_appgroup">പുതിയ ആപ്പ് ഗ്രൂപ്പ്</string>
+  <string name="profile_delete_appgroup">ഈ ആപ്ലിക്കേഷൻ ഗ്രൂപ്പ് ഇല്ലാതാക്കണോ?</string>
+  <string name="profile_appgroup_name_prompt">പുതിയ ആപ്ലിക്കേഷൻ ഗ്രൂപ്പിന് വേണ്ടി ഒരു പേര് രേഖപ്പെടുത്തുക</string>
+  <string name="profile_appgroup_name_title">പേര്</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">അപ്ലിക്കേഷൻതിരഞ്ഞെടുക്കുക</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">സിസ്റ്റം ക്രമീകരണങ്ങള്‍.</string>
+  <string name="profile_lockmode_title">ലോക്ക് സ്ക്രീൻ മോഡ്</string>
+  <string name="profile_lockmode_policy_disabled_summary">ഈ പ്രൊഫൈൽ ഐച്ഛികം ഉപകരണ അഡ്മിനിസ്ട്രേറ്റർ നയം പ്രകാരം അപ്രാപ്തമാക്കിയിരിക്കുന്നു</string>
+  <string name="profile_lockmode_insecure_summary">PIN അല്ലെങ്കിൽ പാസ്‌വേഡ് ചോദിക്കരുത്</string>
+  <string name="profile_lockmode_disabled_summary">ലോക്ക് സ്ക്രീൻ അപ്രാപ്തമാക്കുക</string>
+  <string name="profile_airplanemode_title">ഫ്ലൈറ്റ് മോഡ്</string>
+  <string name="profile_brightness_title">സ്ക്രീൻ തെളിച്ചം</string>
+  <string name="profile_brightness_override_summary">%1$d%% ലേക്ക് സജ്ജമാക്കി</string>
+  <string name="profile_brightness_override_checkbox_label">ഓവറൈഡ് തെളിച്ചം</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi‑Fi</string>
+  <string name="toggleWifiAp">പോർട്ടബിൾ Wi‑Fi ഹോട്ട്‌സ്പോട്ട്</string>
+  <string name="toggleBluetooth">ബ്ലൂടൂത്ത്</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">ഡാറ്റ കണക്ഷൻ</string>
+  <string name="toggleSync">ഡാറ്റ യാന്ത്രികമായി സമന്വയിപ്പിക്കുക</string>
+  <string name="toggle2g3g4g">തിരഞ്ഞെടുത്ത നെറ്റ്‌വർക്ക് തരം</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi മേഖലാ കോഡ്</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fi മേഖലാ കോഡ് വ്യക്തമാക്കുക</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">മേഖല കോഡ് സജ്ജമാക്കുന്നതിൽ ഒരു പ്രശ്നമുണ്ടായി.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">ഇല്ലാതാക്കുക</string>
+  <string name="profile_action_none">മാറ്റം വരുത്താതെ വിടുക</string>
+  <string name="profile_action_system">സിസ്റ്റം ഡിഫോൾട്ട്</string>
+  <string name="profile_action_disable">ഓഫ് ചെയ്യുന്നു</string>
+  <string name="profile_action_enable">ഓൺ ചെയ്യുക</string>
+  <string name="profile_trigger_a2dp_connect">A2DP കണക്റ്റ് ഓണ്‍</string>
+  <string name="profile_trigger_a2dp_disconnect">ഓണ്‍ A2DP ഡിസ്കണക്റ്റ്</string>
+  <string name="profile_tabs_wifi">Wi‑Fi</string>
+  <string name="profile_tabs_bluetooth">ബ്ലൂടൂത്ത്</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ഈ പ്രൊഫൈലിനെ സജീവമാക്കുന്ന ട്രിഗറുകള്‍</string>
+  <string name="profile_setup_setup_triggers_title">ഘട്ടം 1: ട്രിഗറുകൾ ചേർക്കുക</string>
+  <string name="profile_setup_setup_triggers_title_config">ട്രിഗറുകൾ പരിഷ്ക്കരിക്കുക: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">ഘട്ടം 2: സജ്ജീകരണ പ്രവർത്തനങ്ങൾ</string>
+  <string name="profile_setup_actions_title_config">നടപടികള്‍ റീകോണ്‍ഫിഗര്‍ ചെയ്യുക</string>
+  <string name="profile_appgroups_manage">ആപ്ലിക്കേഷൻ ഗ്രൂപ്പുകൾ</string>
+  <string name="profile_appgroup_manage">ആപ്പ് ഗ്രൂപ്പ് കൈകാര്യം ചെയ്യുക</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ആപ്ലിക്കേഷൻ ഗ്രൂപ്പുകൾ</string>
+  <string name="profile_new_appgroup">പുതിയ ആപ്പ് ഗ്രൂപ്പ്</string>
+  <string name="profile_delete_appgroup">ഈ ആപ്ലിക്കേഷൻ ഗ്രൂപ്പ് ഇല്ലാതാക്കണോ?</string>
+  <string name="profile_appgroup_name_prompt">പുതിയ ആപ്ലിക്കേഷൻ ഗ്രൂപ്പിന് വേണ്ടി ഒരു പേര് രേഖപ്പെടുത്തുക</string>
+  <string name="profile_appgroup_name_title">പേര്</string>
+  <string name="duplicate_appgroup_name">ആപ്ലിക്കേഷന്‍ ഗ്രൂപ്പിന്റെ പേര് ഡ്യൂപ്ലിക്കേറ്റ്</string>
+  <string name="profile_app_delete_confirm">ഈ ആപ്ലിക്കേഷൻ നീക്കം ചെയ്യണോ?</string>
+  <string name="no_bluetooth_triggers">Bluetooth ഉപകരണങ്ങൾ ജോഡിയാക്കിയിട്ടില്ല.\nട്രിഗറുകൾ കോണ്‍ഫിഗര്‍ ചെയ്യുന്നതിന് മുമ്പ് Bluetooth ഉപകരണം ജോടിയാക്കാൻ അമര്‍ത്തുക.</string>
+  <string name="no_wifi_triggers">Wi\u2011Fi ആക്സസ് പോയിന്റുകൾ കോണ്‍ഫിഗര്‍ ചെയ്തിട്ടില്ല.\nട്രിഗറുകൾ കോണ്‍ഫിഗര്‍ ചെയ്യുന്നതിന് മുമ്പ് Wi\u2011Fi കണക്റ്റ് ചെയ്യുന്നതിന് അമര്‍ത്തുക.</string>
+  <string name="no_triggers_configured">ട്രിഗറുകള്‍ കോൺഫിഗർ ചെയ്തിട്ടില്ല. കൂടുതൽ ചേർക്കുന്നതിന് അമര്‍ത്തുക</string>
+  <string name="no_triggers_configured_nfc">ഒരു പുതിയ NFC ട്രിഗർ സജ്ജമാക്കുന്നതിന് അമര്‍ത്തുക.</string>
+  <string name="profile_setup_setup_triggers_description">ഈ പ്രൊഫൈൽ സജീവമാക്കുന്ന ട്രിഗറുകൾ തിരഞ്ഞെടുക്കുക</string>
+  <string name="profile_setup_actions_description">പ്രൊഫൈൽ സജീവമായിരിക്കുമ്പോള്‍ എന്ത് സംഭവിക്കുന്നുവെന്ന് ഇപ്പോള്‍ കോണ്‍ഫിഗര്‍ ചെയ്യുക</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">നാവിഗേഷന്‍ ബാർ</string>
+  <string name="navigation_bar_left_title">ഇടംകൈയ്യൻ മോഡ്</string>
+  <string name="navigation_bar_left_summary">ലാൻഡ്സ്കേപ്പ് മോഡിൽ സ്ക്രീനിന്റെ ഇടത് വശത്ത് നാവിഗേഷൻ ബാർ സ്ഥാപിക്കുക</string>
+  <string name="navigation_bar_title">ബട്ടണുകളും ലേയൌട്ടും</string>
+  <string name="navigation_bar_help_text">എഡിറ്റ്‌ ചെയ്യുന്നതിനായി നാവിഗേഷന്‍ ബാര്‍ അണ്‍ലോക്ക് ചെയ്യുന്നതിന് എഡിറ്റ്‌ ഐക്കണ്‍ അമര്‍ത്തുക.\n\nഷോര്‍ട്ട്കട്ട് മാറ്റുന്നതിനായി നിങ്ങള്‍ക്കൊരു ഐക്കണില്‍ അമര്‍ത്താവുന്നതാണ് അല്ലെങ്കില്‍ ലേ-ഔട്ട്‌ പുനക്രമീകരിക്കുന്നതിന് ഒരു ഐക്കണില്‍ നീണ്ട അമര്‍ത്തല്‍ ചെയ്യാനാവുന്നതാണ്.\n\nനിങ്ങളുടെ മാറ്റങ്ങള്‍ നടപ്പിലാക്കുന്നതിന് \'സേവ്\' അമര്‍ത്തുക, അല്ലെങ്കില്‍ ഡിഫോള്‍ട്ട് ക്രമീകരണങ്ങളിലേക്ക് പുനക്രമീകരിക്കുന്നതിന് \'ഡിഫോള്‍ട്ടുകള്‍ പുനസ്ഥാപിക്കുക\' അമര്‍ത്തുക.</string>
+  <string name="navigation_restore_button_text">ഡിഫോള്‍ട്ടുകള്‍\nപുനഃസ്ഥാപിക്കുക</string>
+  <string name="navigation_edit_button_text">എഡിറ്റുചെയ്യുക</string>
+  <string name="navigation_save_button_text">സംരക്ഷിക്കുക</string>
+  <string name="navigation_bar_reset_message">നിലവിലെ ക്രമീകരണങ്ങൾ ഇല്ലാതാക്കുകയും ഡിഫോള്‍ട്ട് ലേയൌട്ട് പുനഃസ്ഥാപിക്കുകയും ചെയ്യണോ?</string>
+  <string name="navigation_bar_arrow_keys_title">ടൈപ്പ് ചെയ്യുമ്പോൾ അമ്പടയാള കീകള്‍ ദൃശ്യമാക്കുക</string>
+  <string name="navigation_bar_arrow_keys_summary">ടൈപ്പ് ചെയ്യുമ്പോള്‍, വലത്, ഇടത് കഴ്സർ ബട്ടണുകൾ ദൃശ്യമാക്കുക IME സ്വിച്ചർ ഓവറൈഡ്സ് ചെയ്യുന്നു.</string>
+  <string name="navigation_bar_recents_title">സമീപത്തുള്ളവ നീണ്ട അമർത്തല്‍ നടപടി</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">വെളിച്ചം ക്രമീകരണങ്ങൾ എഡിറ്റ് ചെയ്യുക</string>
+  <string name="pulse_speed_title">പള്‍സ് ദൈര്‍ഘ്യവും വേഗതയും</string>
+  <string name="default_time">സാധാരണ</string>
+  <string name="custom_time">ഇഷ്‌ടാനുസൃതം</string>
+  <string name="dialog_delete_title">ഇല്ലാതാക്കുക</string>
+  <string name="dialog_delete_message">തിരഞ്ഞെടുത്ത ഇനം നീക്കംചെയ്യണോ?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">എപ്പോഴും ഓണാക്കുക</string>
+  <string name="pulse_length_very_short">വളരെ ചെറിയ</string>
+  <string name="pulse_length_short">ചെറുത്</string>
+  <string name="pulse_length_normal">സാധാരണ</string>
+  <string name="pulse_length_long">നീണ്ട</string>
+  <string name="pulse_length_very_long">വളരെ നീണ്ട</string>
+  <string name="pulse_speed_very_fast">വളരെ വേഗത്തില്‍</string>
+  <string name="pulse_speed_fast">വേഗത്തില്‍</string>
+  <string name="pulse_speed_normal">സാധാരണ</string>
+  <string name="pulse_speed_slow">പതുക്കെ</string>
+  <string name="pulse_speed_very_slow">വളരെ പതുക്കെ</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">ബാറ്ററി വെളിച്ചം</string>
+  <string name="battery_low_pulse_title">ബാറ്ററി കുറവാണെങ്കില്‍ പള്‍സ്</string>
+  <string name="battery_light_list_title">വർണ്ണങ്ങൾ</string>
+  <string name="battery_light_low_color_title">ബാറ്ററി കുറവ്</string>
+  <string name="battery_light_medium_color_title">ചാർജ്ജുചെയ്യുന്നു</string>
+  <string name="battery_light_full_color_title">പൂർണ്ണമായും ചാർജ് ചെയ്തു</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">അറിയിപ്പ് വെളിച്ചം</string>
+  <string name="notification_light_general_title">പൊതുവായത്</string>
+  <string name="notification_light_applist_title">അപ്ലിക്കേഷനുകൾ</string>
+  <string name="notification_light_phonelist_title">ഫോണ്‍</string>
+  <string name="notification_light_use_custom">ഇഷ്ടാനുസൃത മൂല്യങ്ങൾ ഉപയോഗിക്കുക</string>
+  <string name="notification_light_default_value">സ്ഥിരമായത്</string>
+  <string name="notification_light_missed_call_title">മിസ്ഡ് കോൾ</string>
+  <string name="notification_light_voicemail_title">വോയ്സ് മെയില്‍</string>
+  <string name="notification_light_screen_on">സ്ക്രീൻ ഓണ്‍ ആയിരിക്കുമ്പോള്‍ പ്രകാശിക്കുക</string>
+  <string name="notification_light_zen_mode">ലൈറ്റ്സ് ശല്യപ്പെടുത്തരുത് മോഡിലാണ്</string>
+  <string name="notification_light_use_multiple_leds">ഒന്നിലധികം LEDകള്‍</string>
+  <string name="keywords_lights_brightness_level">ledകളുടെ മങ്ങിയ തെളിച്ചം</string>
+  <string name="notification_light_automagic">വർണ്ണങ്ങൾ യാന്ത്രികമായി തിരഞ്ഞെടുക്കുക</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">പ്രകാശ ക്രമീകരണങ്ങള്‍</string>
+  <string name="led_notification_text">ക്രമീകരണങ്ങളിലൂടെ LED വെളിച്ചം പ്രാപ്തമാക്കി</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">ആൻഡ്രോയിഡ് ഡീബഗ്ഗിംഗ്</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">ആൻഡ്രോയിഡ് ഡീബഗ് ബ്രിഡ്ജ് (adb) ഇന്റർഫേസ് പ്രാപ്തമാക്കുക</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">നെറ്റ്‌വർക്കിൽ ADB</string>
+  <string name="adb_over_network_summary">നെറ്റ്‌വര്‍ക്ക് ഇന്‍റര്‍ഫേസില്‍ (Wi\u2011Fi, USB , നെറ്റ്‌വര്‍ക്കുകള്‍) TCP/IP ഡീബഗ്ഗിംഗ് പ്രാപ്തമാക്കുക. ഈ ക്രമീകരണം റീബൂട്ടിൽ പുനഃക്രമീകരിക്കുന്നതാണ്</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">മുന്നറിയിപ്പ്: നെറ്റ്‌വർക്കിലൂടെയുള്ള ADB പ്രാപ്തമാക്കിയിരിക്കുമ്പോള്‍, ബന്ധിപ്പിച്ച എല്ലാ നെറ്റ്‌വർക്കുകളിൽ നിന്നും നുഴഞ്ഞുകയറുന്നതിനായി നിങ്ങളുടെ ഫോൺ തുറന്നിരിക്കുന്നതാണ്!\n\nഒരു വിശ്വസനീയ നെറ്റ്‌വര്‍ക്കില്‍ ബന്ധിപ്പിച്ചിരിക്കുമ്പോള്‍ മാത്രം നിങ്ങള്‍ ഈ സവിശേഷത ഉപയോഗിക്കുക.\n\nനിങ്ങള്‍ക്ക് ശരിക്കും ഈ സവിശേഷത പ്രാപ്തമാക്കണോ?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">ഡീബഗ്ഗിംഗ് അറിയിപ്പ്</string>
+  <string name="adb_notify_summary">USB അല്ലെങ്കിൽ നെറ്റ്‌വർക്ക് ഡീബഗ്ഗിംഗ് പ്രാപ്തമായിരിക്കുമ്പോള്‍ ഒരു അറിയിപ്പ് ദൃശ്യമാക്കുക</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">ലൊക്കേഷൻ</string>
+  <string name="app_ops_categories_personal">വ്യക്തിഗതം</string>
+  <string name="app_ops_categories_messaging">സന്ദേശമയയ്‌ക്കൽ</string>
+  <string name="app_ops_categories_media">മീഡിയ</string>
+  <string name="app_ops_categories_device">ഉപകരണം</string>
+  <string name="app_ops_categories_bootup">ബൂട്ടപ്പ്</string>
+  <string name="app_ops_categories_su">റൂട്ട് പ്രവേശനം</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">പരുപരുത്ത സ്ഥലം</string>
+  <string name="app_ops_summaries_fine_location">നല്ല സ്ഥാനം</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">വൈബ്രേറ്റ്‌</string>
+  <string name="app_ops_summaries_read_contacts">കോണ്‍ടാക്റ്റ് വായിക്കുക</string>
+  <string name="app_ops_summaries_modify_contacts">കോണ്‍ടാക്റ്റുകള്‍ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_summaries_read_call_log">കോൾ ലോഗ് റീഡുചെയ്യുക</string>
+  <string name="app_ops_summaries_modify_call_log">കോൾ ലോഗ് പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_summaries_read_calendar">കലണ്ടർ വായിക്കുക</string>
+  <string name="app_ops_summaries_modify_calendar">കലണ്ടർ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi സ്കാൻ</string>
+  <string name="app_ops_summaries_notification">അറിയിപ്പ് /ടോസ്റ്റ്</string>
+  <string name="app_ops_summaries_cell_scan">സെൽ സ്കാൻ</string>
+  <string name="app_ops_summaries_call_phone">കോൾ ഫോൺ</string>
+  <string name="app_ops_summaries_read_sms">SMS വായിക്കുക</string>
+  <string name="app_ops_summaries_write_sms">SMS റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_receive_sms">SMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_summaries_receive_emergency_sms">അടിയന്തര SMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_summaries_receive_mms">MMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP പുഷ് സ്വീകരിക്കുക</string>
+  <string name="app_ops_summaries_send_sms">SMS അയയ്ക്കുക</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS വായിക്കുക</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_modify_settings">ക്രമീകരണങ്ങൾ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_summaries_draw_on_top">മുകളിൽ വരയ്ക്കുക</string>
+  <string name="app_ops_summaries_access_notifications">അറിയിപ്പുകൾ ആക്‌സസ്സുചെയ്യുക</string>
+  <string name="app_ops_summaries_camera">ക്യാമറ</string>
+  <string name="app_ops_summaries_record_audio">ഓഡിയോ റെക്കോർഡ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_play_audio">ഓഡിയോ പ്ലേ ചെയ്യുക</string>
+  <string name="app_ops_summaries_read_clipboard">ക്ലിപ്ബോര്‍ഡ് റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_modify_clipboard">ക്ലിപ്ബോർഡ് പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_summaries_media_buttons">മീഡിയ ബട്ടണുകൾ</string>
+  <string name="app_ops_summaries_audio_focus">ഓഡിയോ ഫോക്കസ്</string>
+  <string name="app_ops_summaries_master_volume">മാസ്റ്റര്‍ വോളിയം</string>
+  <string name="app_ops_summaries_voice_volume">വോയ്സ് വോളിയം</string>
+  <string name="app_ops_summaries_ring_volume">റിംഗർ വോളിയം</string>
+  <string name="app_ops_summaries_media_volume">മീഡിയ വോളിയം</string>
+  <string name="app_ops_summaries_alarm_volume">അലാറം വോളിയം</string>
+  <string name="app_ops_summaries_notification_volume">അറിയിപ്പ് വോളിയം</string>
+  <string name="app_ops_summaries_bluetooth_volume">Bluetooth വോളിയം</string>
+  <string name="app_ops_summaries_keep_awake">സജീവമായി തുടരുക</string>
+  <string name="app_ops_summaries_monitor_location">മോണിറ്റർ സ്ഥാനം</string>
+  <string name="app_ops_summaries_monitor_high_power_location">ഉയർന്ന പവർ സ്ഥാനം നിരീക്ഷിക്കുക</string>
+  <string name="app_ops_summaries_get_usage_stats">ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ ലഭ്യമാക്കുക</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">മൈക്രോഫോൺ നിശ്ശബ്ദമാക്കുക / ശബ്ദമുള്ളതാക്കൂ ചെയ്യുക</string>
+  <string name="app_ops_summaries_toast_window">ടോസ്റ്റുകൾ പ്രദര്‍ശനം ചെയ്യുക</string>
+  <string name="app_ops_summaries_project_media">പ്രോജക്റ്റ് മീഡിയ</string>
+  <string name="app_ops_summaries_activate_vpn">VPN സജീവമാക്കുക</string>
+  <string name="app_ops_summaries_write_wallpaper">വാൾപേപ്പർ റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_assist_structure">അസിസ്റ്റ് ഘടന</string>
+  <string name="app_ops_summaries_assist_screenshot">അസിസ്റ്റ് സ്ക്രീൻഷോട്ട്</string>
+  <string name="app_ops_summaries_read_phone_state">ഫോൺ സ്ഥിതി റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_add_voicemail">വോയ്‌സ് മെയിൽ ചേർക്കുക</string>
+  <string name="app_ops_summaries_use_sip">SIP ഉപയോഗിക്കുക</string>
+  <string name="app_ops_summaries_make_call">കോൾ ചെയ്യുക</string>
+  <string name="app_ops_summaries_use_fingerprint">ഫിംഗര്‍പ്രിന്‍റ് ഉപയോഗിക്കുക</string>
+  <string name="app_ops_summaries_use_body_sensors">ശരീര സെൻസറുകൾ ഉപയോഗിക്കുക</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">സെൽ ബ്രോഡ്‌കാസ്റ്റുകള്‍ റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_mock_location">വ്യാജ സ്ഥാനം</string>
+  <string name="app_ops_summaries_read_external_storage">ബാഹ്യ സംഭരണം റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_write_external_storage">ബാഹ്യ സംഭരണത്തിലേക്ക് റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_summaries_turn_screen_on">സ്ക്രീൻ ഓൺ ചെയ്യുക</string>
+  <string name="app_ops_summaries_get_accounts">അക്കൗണ്ടുകൾ ലഭ്യമാക്കുക</string>
+  <string name="app_ops_summaries_toggle_wifi">ടോഗിൾ Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">ടോഗിൾ Bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">ബൂട്ടില്‍ അരംഭിക്കുക</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC ടോഗിൾ</string>
+  <string name="app_ops_summaries_toggle_mobile_data">ടോഗിൾ മൊബൈൽ ഡാറ്റ</string>
+  <string name="app_ops_summaries_superuser">റൂട്ട് പ്രവേശനം</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">പരുപരുത്ത സ്ഥലം</string>
+  <string name="app_ops_labels_fine_location">നല്ല സ്ഥലം</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">വൈബ്രേറ്റുചെയ്യുക</string>
+  <string name="app_ops_labels_read_contacts">കോണ്‍ടാക്റ്റ് വായിക്കുക</string>
+  <string name="app_ops_labels_modify_contacts">കോണ്‍ടാക്റ്റുകള്‍ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_labels_read_call_log">കോൾ ലോഗ് റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_labels_modify_call_log">കോൾ ലോഗ് പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_labels_read_calendar">കലണ്ടർ വായിക്കുക</string>
+  <string name="app_ops_labels_modify_calendar">കലണ്ടർ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi സ്കാൻ</string>
+  <string name="app_ops_labels_notification">അറിയിപ്പ്/ടോസ്റ്റ്</string>
+  <string name="app_ops_labels_cell_scan">സെൽ സ്കാൻ</string>
+  <string name="app_ops_labels_call_phone">കോൾ ഫോൺ</string>
+  <string name="app_ops_labels_read_sms">SMS വായിക്കുക</string>
+  <string name="app_ops_labels_write_sms">SMS റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_labels_receive_sms">SMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_labels_receive_emergency_sms">അടിയന്തര SMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_labels_receive_mms">MMS സ്വീകരിക്കുക</string>
+  <string name="app_ops_labels_receive_wap_push">WAP പുഷ് സ്വീകരിക്കുക</string>
+  <string name="app_ops_labels_send_sms">SMS അയയ്ക്കുക</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS വായിക്കുക</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_labels_modify_settings">ക്രമീകരണങ്ങൾ പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_labels_draw_on_top">മുകളിൽ വരയ്ക്കുക</string>
+  <string name="app_ops_labels_access_notifications">അറിയിപ്പുകൾ ആക്‌സസ്സുചെയ്യുക</string>
+  <string name="app_ops_labels_camera">ക്യാമറ</string>
+  <string name="app_ops_labels_record_audio">ഓഡിയോ റെക്കോർഡുചെയ്യുക</string>
+  <string name="app_ops_labels_play_audio">ഓഡിയോ പ്ലേ ചെയ്യുക</string>
+  <string name="app_ops_labels_read_clipboard">ക്ലിപ്ബോര്‍ഡ് റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_labels_modify_clipboard">ക്ലിപ്ബോർഡ് പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_labels_media_buttons">മീഡിയ ബട്ടണുകൾ</string>
+  <string name="app_ops_labels_audio_focus">ഓഡിയോ ഫോക്കസ്</string>
+  <string name="app_ops_labels_master_volume">മാസ്റ്റര്‍ വോളിയം</string>
+  <string name="app_ops_labels_voice_volume">വോയ്സ് വോളിയം</string>
+  <string name="app_ops_labels_ring_volume">റിംഗ് വോളിയം</string>
+  <string name="app_ops_labels_media_volume">മീഡിയ വോളിയം</string>
+  <string name="app_ops_labels_alarm_volume">അലാറം വോളിയം</string>
+  <string name="app_ops_labels_notification_volume">അറിയിപ്പ് വോളിയം</string>
+  <string name="app_ops_labels_bluetooth_volume">ബ്ലൂടൂത്ത് വോളിയം</string>
+  <string name="app_ops_labels_keep_awake">സജീവമായി തുടരുക</string>
+  <string name="app_ops_labels_monitor_location">മോണിറ്റർ സ്ഥലം</string>
+  <string name="app_ops_labels_monitor_high_power_location">ഉയർന്ന പവർ സ്ഥലം നിരീക്ഷിക്കുക</string>
+  <string name="app_ops_labels_get_usage_stats">ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ ലഭ്യമാക്കുക</string>
+  <string name="app_ops_labels_mute_unmute_microphone">മൈക്രോഫോൺ നിശ്ശബ്ദമാക്കുക / ശബ്ദമുള്ളതാക്കൂ ചെയ്യുക</string>
+  <string name="app_ops_labels_toast_window">ടോസ്റ്റുകൾ പ്രദര്‍ശനം ചെയ്യുക</string>
+  <string name="app_ops_labels_project_media">പ്രോജക്റ്റ് മീഡിയ</string>
+  <string name="app_ops_labels_activate_vpn">VPN സജീവമാക്കുക</string>
+  <string name="app_ops_labels_write_wallpaper">വാൾപേപ്പർ റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_labels_assist_structure">അസിസ്റ്റ് ഘടന</string>
+  <string name="app_ops_labels_assist_screenshot">അസിസ്റ്റ് സ്ക്രീൻഷോട്ട്</string>
+  <string name="app_ops_labels_read_phone_state">ഫോൺ സ്ഥിതി റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_labels_add_voicemail">വോയ്‌സ് മെയിൽ ചേർക്കുക</string>
+  <string name="app_ops_labels_use_sip">SIP ഉപയോഗിക്കുക</string>
+  <string name="app_ops_labels_make_call">കോൾ ചെയ്യുക</string>
+  <string name="app_ops_labels_use_fingerprint">ഫിംഗര്‍പ്രിന്‍റ് ഉപയോഗിക്കുക</string>
+  <string name="app_ops_labels_use_body_sensors">ശരീര സെൻസറുകൾ ഉപയോഗിക്കുക</string>
+  <string name="app_ops_labels_read_cell_broadcasts">സെൽ ബ്രോഡ്‌കാസ്റ്റുകള്‍ റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_labels_mock_location">വ്യാജ സ്ഥാനം</string>
+  <string name="app_ops_labels_read_external_storage">ബാഹ്യ സംഭരണം റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_labels_write_external_storage">ബാഹ്യ സംഭരണത്തിലേക്ക് റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_labels_turn_screen_on">സ്ക്രീൻ ഓൺ ചെയ്യുക</string>
+  <string name="app_ops_labels_get_accounts">അക്കൗണ്ടുകൾ ലഭ്യമാക്കുക</string>
+  <string name="app_ops_labels_toggle_wifi">ടോഗിൾ Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">ടോഗിള് Bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">ബൂട്ടില്‍ അരംഭിക്കുക</string>
+  <string name="app_ops_labels_toggle_nfc">NFC ടോഗിൾ</string>
+  <string name="app_ops_labels_toggle_mobile_data">മൊബൈൽ ഡാറ്റ ടോഗിൾ</string>
+  <string name="app_ops_labels_superuser">റൂട്ട് പ്രവേശനം</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">അനുവദനീയമായ</string>
+  <string name="app_ops_permissions_ignored">അവഗണിച്ചു</string>
+  <string name="app_ops_permissions_always_ask">എപ്പോഴും ചോദിക്കുക</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (<xliff:g id="count">%2$s</xliff:g> ഉപയോഗിച്ചു)</string>
+  <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> അനുവദിച്ചു</string>
+  <string name="app_ops_ignored_count">നിരസിച്ചു <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">അനുവദിച്ചത് <xliff:g id="count">%1$s</xliff:g>, നിരസിച്ചത് <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">ഉപയോക്തൃ ആപ്ലിക്കേഷനുകള്‍ ദൃശ്യമാക്കുക</string>
+  <string name="app_ops_show_system_apps">ബിൽറ്റ്-ഇൻ അപ്ലിക്കേഷനുകൾ ദൃശ്യമാക്കുക</string>
+  <string name="app_ops_reset_counters">കൗണ്ടറുകൾ പുനക്രമീകരിക്കുന്നത് അനുവദിക്കുക/നിരാകരിക്കുക</string>
+  <string name="app_ops_reset_confirm_title">കൗണ്ടറുകൾ പുനഃക്രമീകരിക്കുന്നത് സ്ഥിരീകരിക്കുക</string>
+  <string name="app_ops_reset_confirm_mesg">കൗണ്ടറുകൾ പുനഃക്രമീകരിക്കണമെന്ന് നിങ്ങള്‍ക്ക് ഉറപ്പാണോ?</string>
+  <string name="ok">ശരി</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">ഉപകരണ ഹോസ്റ്റ്നെയിം</string>
+  <string name="unlock_scramble_pin_layout_title">സ്ക്രാമ്പിള്‍ ചെയ്ത ലേഔട്ട്</string>
+  <string name="unlock_scramble_pin_layout_summary">ഉപകരണം അൺലോക്ക് ചെയ്യുമ്പോൾ PIN ലേയൌട്ട് സ്ക്രാമ്പിള്‍ ചെയ്യുക</string>
+  <string name="button_pref_title">ബട്ടണുകള്‍</string>
+  <string name="hardware_keys_power_key_title">പവർ ബട്ടൺ</string>
+  <string name="hardware_keys_home_key_title">ഹോം ബട്ടൺ</string>
+  <string name="hardware_keys_back_key_title">പിന്നിലേക്ക് ബട്ടൺ</string>
+  <string name="hardware_keys_menu_key_title">മെനു ബട്ടൺ</string>
+  <string name="hardware_keys_assist_key_title">തിരയൽ ബട്ടൺ</string>
+  <string name="hardware_keys_appswitch_key_title">സമീപകാലത്തുള്ളവ ബട്ടൺ</string>
+  <string name="hardware_keys_camera_key_title">ക്യാമറ ബട്ടൺ</string>
+  <string name="hardware_keys_volume_keys_title">വോളിയം ബട്ടണുകൾ</string>
+  <string name="hardware_keys_short_press_title">ഹ്രസ്വ അമർത്തല്‍ നടപടി</string>
+  <string name="hardware_keys_long_press_title">ദീര്‍ഘ അമർത്തല്‍ നടപടി</string>
+  <string name="hardware_keys_double_tap_title">ഇരട്ട അമർത്തല്‍ നടപടി</string>
+  <string name="hardware_keys_action_nothing">നടപടി ഇല്ല</string>
+  <string name="hardware_keys_action_menu">മെനു തുറക്കുക/അടയ്ക്കുക</string>
+  <string name="hardware_keys_action_app_switch">സമീപകാല അപ്ലിക്കേഷനുകൾ സ്വിച്ചർ</string>
+  <string name="hardware_keys_action_search">തിരയൽ അസിസ്റ്റന്റ്</string>
+  <string name="hardware_keys_action_voice_search">ശബ്ദ തിരയൽ</string>
+  <string name="hardware_keys_action_in_app_search">ഇൻ-ആപ് തിരയൽ</string>
+  <string name="hardware_keys_action_launch_camera">ക്യാമറ സമാരംഭിക്കുക</string>
+  <string name="hardware_keys_action_sleep">സ്ക്രീൻ ഓഫ് ചെയ്യുക</string>
+  <string name="hardware_keys_action_last_app">കഴിഞ്ഞ ആപ്ലിക്കേഷൻ</string>
+  <string name="camera_sleep_on_release_title">സ്ക്രീൻ പീക്ക്</string>
+  <string name="camera_sleep_on_release_summary">പകുതി അമര്‍ത്തുന്നത് ബട്ടണ്‍ അമര്‍ത്തിപ്പിടിക്കുമ്പോള്‍ മാത്രം സ്ക്രീന്‍ ഓണ്‍ ആയി നിലനിര്‍ത്തുന്നതാണ്</string>
+  <string name="camera_launch_title">ക്യാമറ സമാരംഭിക്കുക</string>
+  <string name="camera_launch_summary">നീണ്ട നേരം അമര്‍ത്തി സ്വതന്ത്രമാക്കുന്നതിലൂടെ ക്യാമറ ആരംഭിക്കുന്നതാണ്</string>
+  <string name="volbtn_music_controls_title">പ്ലേബാക്ക് നിയന്ത്രണം</string>
+  <string name="volbtn_music_controls_summary">സ്ക്രീന്‍ ഓഫ് ആയിരിക്കുമ്പോള്‍, വോളിയം കീകള്‍ ദീര്‍ഘനേരം അമര്‍ത്തുന്നത് സംഗീത ട്രാക്കുകള്‍ തേടുന്നതാണ്</string>
+  <string name="volbtn_cursor_control_title">കീബോർഡ് കഴ്സർ നിയന്ത്രണം</string>
+  <string name="volbtn_cursor_control_off">പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="volbtn_cursor_control_on">വോളിയം മുകളിലേക്ക്/താഴേക്ക് കഴ്സർ ഇടത്തേക്ക് / വലത്തേക്ക് നീക്കുന്നതാണ്</string>
+  <string name="volbtn_cursor_control_on_reverse">വോളിയം മുകളിലേക്ക്/താഴേക്ക് കഴ്സർ വലത്തേക്ക് / ഇടത്തേക്ക് നീക്കുന്നതാണ്</string>
+  <string name="power_end_call_title">കോൾ അവസാനിപ്പിക്കുക</string>
+  <string name="power_end_call_summary">പവർ ബട്ടൺ അമർത്തിയാൽ നിലവിലുള്ള കോൾ അവസാനിക്കുന്നതാണ്</string>
+  <string name="swap_volume_buttons_title">പുനര്‍വിന്യാസം</string>
+  <string name="swap_volume_buttons_summary">സ്ക്രീൻ തിരിക്കുമ്പോൾ വോളിയം ബട്ടണുകൾ സ്വാപ്പ് ചെയ്യുക</string>
+  <string name="button_wake_title">ഉപകരണം സജീവമാക്കുക</string>
+  <string name="home_answer_call_title">കോള്‍ മറുപടി</string>
+  <string name="home_answer_call_summary">ഹോം ബട്ടൺ അമർത്തിയാൽ ഇപ്പോഴുള്ള ഇൻകമിംഗ് കോളിന് മറുപടി നല്‍കുന്നതാണ്</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">യോജിച്ച ബാക്ക്‌ലൈറ്റ്</string>
+  <string name="adaptive_backlight_summary">ഉപയോഗക്ഷമത പരിപാലിക്കുമ്പോള്‍ ബാറ്ററിയുടെ ആയുസ്സ് വര്‍ദ്ധിപ്പിക്കുന്നതിന് ഡിസ്പ്ലേയുടെ ബാക്ക്‌ലൈറ്റിന്‍റെ തെളിച്ചം ഡൈനാമിക്കായി ക്രമീകരിക്കുക</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">സൂര്യപ്രകാശം മെച്ചപ്പെടുത്തൽ</string>
+  <string name="sunlight_enhancement_summary">തെളിഞ്ഞ സൂര്യപ്രകാശത്തില്‍ ഡിസ്പ്ലേ തെളിച്ചവും വായനക്ഷമതയും മെച്ചപ്പെടുത്തുക</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">നിറം മെച്ചപ്പെടുത്തൽ</string>
+  <string name="color_enhancement_summary">ഡിസ്പ്ലേയുടെ നിറം ഡൈനമിക്കായി മെച്ചപ്പെടുത്തുക</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">ബാക്ക്‌ലൈറ്റ്</string>
+  <string name="button_backlight_enabled">ബട്ടണുകൾ പ്രകാശിപ്പിക്കുക</string>
+  <string name="keyboard_backlight_enabled">കീബോർഡ് പ്രകാശിപ്പിക്കുക</string>
+  <string name="button_backlight_seekbar_title">ബട്ടൺ തെളിച്ചം</string>
+  <string name="keyboard_backlight_seekbar_title">കീബോർഡ് തെളിച്ചം</string>
+  <string name="backlight_timeout_title">പ്രകാശിപ്പിക്കല്‍ സമയപരിധി</string>
+  <string name="backlight_timeout_unlimited">ഓഫ് ചെയ്യരുത്</string>
+  <string name="backlight_summary_disabled">പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g>ന് വേണ്ടി പ്രാപ്തമാക്കി</string>
+  <string name="backlight_summary_enabled">പ്രവർത്തനക്ഷമമാക്കി</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">ഗസ്റ്ററുകൾ</string>
   <!-- Power menu -->
+  <string name="power_menu_title">പവർ മെനു</string>
+  <string name="power_menu_reboot_title">റീബൂട്ട് മെനു</string>
+  <string name="power_menu_screenshot_title">സ്ക്രീൻഷോട്ട്</string>
+  <string name="power_menu_airplane_title">ഫ്ലൈറ്റ് മോഡ്</string>
+  <string name="power_menu_users_title">ഉപയോക്തൃ സ്വിച്ചർ</string>
+  <string name="power_menu_settings_title">ക്രമീകരണങ്ങളിലേയ്ക്ക്</string>
+  <string name="power_menu_lockdown_title">ഉപകരണ ലോക്ക്ഡൗൺ</string>
+  <string name="power_menu_bug_report_title">ബഗ് റിപ്പോർട്ട്</string>
+  <string name="power_menu_sound_title">സൗണ്ട് പാനൽ</string>
+  <string name="power_menu_bug_report_disabled">ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങളില്‍ ബഗ് റിപ്പോര്‍ട്ടിംഗ് അപ്രാപ്തമാക്കിയിരിക്കുന്നു</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">ഓൺ-സ്ക്രീൻ നാവിഗേഷന്‍ ബാർ പ്രാപ്തമാക്കുക</string>
+  <string name="disable_navkeys_summary">ഓൺ-സ്ക്രീൻ നാവിഗേഷൻ ബാർ പ്രാപ്തമാക്കുകയും ഹാർഡ്‌വെയർ ബട്ടണുകൾ അപ്രാപ്തമാക്കുകയും ചെയ്യുക</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">നിഷ്ക്രിയമാക്കുന്നതിന് ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
+  <string name="double_tap_to_sleep_summary">ഡിസ്പ്ലേ ഓഫ് ചെയ്യുന്നതിന് സ്റ്റാറ്റസ് ബാറിൽ ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">യാദൃച്ഛികമായി സജീവമാകുന്നത് തടയുക</string>
+  <string name="proximity_wake_summary">സ്ക്രീൻ സജീവമാകുന്നതിന് മുമ്പ് പ്രോക്സിമിറ്റി സെൻസർ പരിശോധിക്കുക</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">വേക്ക് ഓൺ പ്ലഗ്</string>
+  <string name="wake_when_plugged_or_unplugged_summary">ഒരു ഊര്‍ജ്ജ സ്രോതസ്സില്‍ ബന്ധിപ്പിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ വിച്ഛേദിക്കുമ്പോൾ സ്ക്രീന്‍ ഓണ്‍ ചെയ്യുക</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">മാതൃക</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">വോളിയം ക്രമീകരണ ശബ്ദങ്ങൾ</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">വൈബ്രേറ്റർ തീവ്രത</string>
+  <string name="vibrator_warning">%1$d ല്‍ കൂടുതൽ ഉള്ള മൂല്യങ്ങൾക്ക് ശുപാർശ ചെയ്യപ്പെടുന്നില്ല</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">നിറം കാലിബ്രേഷൻ</string>
+  <string name="color_calibration_summary">ഓൺ-സ്ക്രീൻ നിറങ്ങൾ കാലിബ്രേറ്റ് ചെയ്യുക</string>
+  <string name="color_red_title">ചുവപ്പ്</string>
+  <string name="color_green_title">പച്ച</string>
+  <string name="color_blue_title">നീല</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">ഗാമാ കാലിബ്രേഷൻ</string>
+  <string name="gamma_tuning_summary_head">ഗാമാ മൂല്യങ്ങൾ വലിക്കുക</string>
+  <string name="gamma_tuning_control_set_header">ഗ്രൂപ്പ് <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">ദൃശ്യതീവ്രത</string>
+  <string name="gamma_tuning_brightness">തെളിച്ചം</string>
+  <string name="gamma_tuning_saturation">സാച്ചുറേഷൻ</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
+  <string name="headset_connect_player_summary">ഹെഡ്സെറ്റ് ഘടിപ്പിച്ചിരിക്കുമ്പോള്‍ ഡിഫോള്‍ട്ട് സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">സ്വപ്രേരിത മുൻഗണന</string>
+  <string name="auto_brightness_reset_button">പുനഃസജ്ജമാക്കുക</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">റൊട്ടേഷൻ</string>
+  <string name="display_rotation_disabled">പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="display_rotation_unit">ഡിഗ്രി</string>
+  <string name="display_lockscreen_rotation_title">ലോക്ക് സ്ക്രീൻ തിരിക്കുക</string>
+  <string name="display_rotation_category_title">തിരിയല്‍ മോഡുകൾ</string>
+  <string name="display_rotation_0_title">0 ഡിഗ്രി</string>
+  <string name="display_rotation_90_title">90 ഡിഗ്രി</string>
+  <string name="display_rotation_180_title">180 ഡിഗ്രി</string>
+  <string name="display_rotation_270_title">270 ഡിഗ്രി</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">സ്ക്രീൻ നിറം</string>
+  <string name="screencolor_summary">സ്ക്രീൻ ഹ്യൂ, സാച്ചുറേഷൻ, ദൃശ്യതീവ്രത അല്ലെങ്കിൽ തീവ്രത ട്യൂണ്‍ ചെയ്യുക</string>
+  <string name="custom_screencolor">ഇഷ്ടാനുസൃത സ്ക്രീൻ നിറം</string>
+  <string name="screencolor_save">സംരക്ഷിക്കുക</string>
+  <string name="screencolor_cancel">റദ്ദാക്കുക</string>
+  <string name="restore_preview">ഡിഫോള്‍ട്ട് ചിത്രം കാണുക</string>
+  <string name="selectnewfile_menu">ഗാലറിയിൽ നിന്നും പുതിയ ചിത്രം കാണുക</string>
+  <string name="selectfile_menu">ഗാലറിയിൽ നിന്നും ചിത്രം കാണുക</string>
+  <string name="restore_default_str">പുനഃസജ്ജമാക്കുക</string>
+  <string name="hue_str">ഹ്യൂ <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">സാച്ചുറേഷൻ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">ദൃശ്യതീവ്രത: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">തീവ്രത: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">വായനാക്ഷമത മെച്ചപ്പെടുത്തുന്നതിനും കണ്ണുകളുടെ സമ്മര്‍ദ്ദം കുറയ്ക്കാനും സമയത്തിന്‍റെയും ചുറ്റുപാടിന്റെ സാഹചര്യത്തിന്റെയും അടിസ്ഥാനത്തില്‍ നിങ്ങളുടെ സ്ക്രീന്‍ ഒപ്റ്റിമൈസ് ചെയ്യുക.</string>
+  <string name="live_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
+  <string name="live_display_color_temperature_title">നിറം താപനില</string>
+  <string name="live_display_color_temperature_summary">ദിവസം: <xliff:g id="day_temperature">%1$d</xliff:g>K രാത്രി: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">ദിവസം</string>
+  <string name="live_display_night">രാത്രി</string>
+  <string name="live_display_outdoor_mode_title">ഓട്ടോമാറ്റിക് ഔട്ട്‌ഡോര്‍ മോഡ്</string>
+  <string name="live_display_outdoor_mode_summary">തെളിഞ്ഞ സൂര്യപ്രകാശത്തില്‍ തെളിച്ചവും സാച്ചുറേഷനും സ്വപ്രേരിതമായി വർദ്ധിപ്പിക്കുക</string>
+  <string name="live_display_low_power_title">വൈദ്യുതി ഉപഭോഗം കുറയ്ക്കുക</string>
+  <string name="live_display_low_power_summary">കുറഞ്ഞ ഊര്‍ജ്ജ ഉപഭോഗത്തിനായി ഡീഗ്രഡേഷന്‍ ഇല്ലാതെ പ്രദര്‍ശനം ക്രമീകരിക്കുക</string>
+  <string name="live_display_enhance_color_title">മെച്ചപ്പെടുത്തിയ നിറങ്ങള്‍</string>
+  <string name="live_display_enhance_color_summary">തൊലിയുടെ നിറം, ദൃശ്യം, മറ്റ് ചിത്രങ്ങള്‍ എന്നിവയുടെ നിറങ്ങള്‍ മെച്ചപ്പെടുത്തുക</string>
+  <string name="live_display_color_profile_title">കളര്‍ പ്രൊഫൈൽ</string>
+  <string name="live_display_color_profile_standard_title">അടിസ്ഥാനം</string>
+  <string name="live_display_color_profile_standard_summary">കൃത്യമായ നിറങ്ങളും തെളിഞ്ഞ വെള്ളയും</string>
+  <string name="live_display_color_profile_natural_title">സ്വാഭാവികം</string>
+  <string name="live_display_color_profile_natural_summary">തന്മയത്തമുള്ള നിറങ്ങളും തൊലിയുടെ നിറവും</string>
+  <string name="live_display_color_profile_dynamic_title">ഡൈനാമിക്</string>
+  <string name="live_display_color_profile_dynamic_summary">മെച്ചപ്പെടുത്തിയ നിറങ്ങളും തെളിഞ്ഞ വെള്ളയും</string>
+  <string name="live_display_color_profile_cinema_title">സിനിമ</string>
+  <string name="live_display_color_profile_cinema_summary">വീഡിയോകള്‍ക്കായി സമ്പൂര്‍ണ്ണ കളര്‍ റീപ്രൊഡക്ഷന്‍</string>
+  <string name="live_display_color_profile_astronomy_title">ജ്യോതിശാസ്ത്രം</string>
+  <string name="live_display_color_profile_astronomy_summary">നൈറ്റ് വിഷന്‍ നിലനിർത്തുന്നതിനുള്ള കടുത്ത ചുവപ്പ്</string>
+  <string name="live_display_color_profile_photography_title">ഫോട്ടോഗ്രാഫി</string>
+  <string name="live_display_color_profile_photography_summary">ഫോട്ടോകൾക്കായി സമ്പൂര്‍ണ്ണ കളര്‍ റീപ്രൊഡക്ഷന്‍</string>
+  <string name="live_display_color_profile_basic_title">ബേസിക്</string>
+  <string name="live_display_color_profile_basic_summary">ഡിസ്പ്ലേ അണ്‍കാലിബറേറ്റഡ് ഉപയോഗിക്കുക</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">ഐക്കൺ സെലക്ടർ</string>
+  <string name="ime_switcher_notify_summary">ഇൻപുട്ട് മെത്തേഡ് സെലക്ടർ ഐക്കൺ ദൃശ്യമാക്കുക</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">മുന്നറിയിപ്പ്</string>
+  <string name="summary_heads_up_enabled">പോപ്പ്-അപ്പ് അറിയിപ്പുകൾ പ്രാപ്തമാണ്</string>
+  <string name="summary_heads_up_disabled">പോപ്പ്-അപ്പ് അറിയിപ്പുകൾ അപ്രാപ്തമാണ്</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">എല്ലാ ഫയൽ തരങ്ങളും അംഗീകരിക്കുക</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">ഉയര്‍ന്ന സ്പര്‍ശന സംവേദനക്ഷമത</string>
+  <string name="high_touch_sensitivity_summary">കയ്യുറകൾ ധരിച്ചിരിക്കുമ്പോള്‍ ഉപയോഗിക്കുന്നതിനായി ടച്ച്സ്ക്രീൻ സെന്‍സിറ്റിവിറ്റി വര്‍ദ്ധിപ്പിക്കുക</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD സാന്ദ്രത</string>
+  <string name="dialog_title_lcd_density">LCD സാന്ദ്രത</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (ഡിഫോൾട്ട്)</string>
+  <string name="restarting_ui">UI പുനരാരംഭിക്കുന്നു\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">സ്റ്റൈലസ് ഉപയോഗിക്കുമ്പോൾ ഐക്കൺ ദൃശ്യമാക്കുക</string>
+  <string name="stylus_icon_enabled_summary">സ്റ്റൈലസ് ഉപയോഗിച്ച് ഹോവര്‍ അല്ലെങ്കില്‍ ഡ്രോയിംഗ് ചെയ്യുമ്പോള്‍ പോയിന്റർ ഐക്കണ്‍ ദൃശ്യമാക്കുക</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">സ്റ്റൈലസ് ഗസ്റ്ററുകൾ</string>
+  <string name="category_spen_title">സ്റ്റൈലസ് ഗസ്റ്ററുകൾ</string>
+  <string name="enable_subcat_title">സ്റ്റൈലസ്</string>
+  <string name="enable_spen_title_head">ഗസ്റ്ററുകൾ പ്രാപ്തമാക്കുക</string>
+  <string name="enable_spen_summary_head">സ്റ്റൈലസ് ബട്ടൺ അമര്‍ത്തിപ്പിടിച്ച് സ്വൈപ്പ് ഗസ്റ്ററുകൾ ഉപയോഗിക്കുക</string>
+  <string name="gestures_subcat_title">ഗസ്റ്ററുകൾ</string>
+  <string name="gestures_left_spen_title_head">ഇടത്തേക്ക് സ്വൈപ്പ് ചെയ്യുക</string>
+  <string name="gestures_right_spen_title_head">വലത് സ്വൈപ്പ്</string>
+  <string name="gestures_up_spen_title_head">സ്വൈപ്പ് അപ്പ്</string>
+  <string name="gestures_down_spen_title_head">താഴേക്ക് സ്വൈപ്പ് ചെയ്യുക</string>
+  <string name="gestures_long_spen_title_head">ദീർഘനേരം അമർത്തുക</string>
+  <string name="gestures_double_spen_title_head">ഇരട്ട അമര്‍ത്തല്‍</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">നടപടി ഇല്ല</string>
+  <string name="gestures_action_home">ഹോം</string>
+  <string name="gestures_action_back">മടങ്ങുക</string>
+  <string name="gestures_action_menu">മെനു</string>
+  <string name="gestures_action_search">തിരയൽ അഭ്യര്‍ത്ഥിക്കുക</string>
+  <string name="gestures_action_recent">പുതിയ അപ്ലിക്കേഷനുകൾ</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">ടച്ച്സ്ക്രീൻ ഹോവറിംഗ്</string>
+  <string name="touchscreen_hovering_summary">വെബ് ബ്രൌസറുകള്‍, റിമോട്ട് ഡെസ്ക്ടോപ്പുകള്‍ തുടങ്ങിയവയിലെ മൌസ് എന്നപോലെ സ്ക്രീന്‍ ഹോവര്‍ ചെയ്യാന്‍ നിങ്ങളെ അനുവദിക്കുന്നു.</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">വര്‍ദ്ധിക്കുന്ന റിംഗ് വോളിയം</string>
+  <string name="increasing_ring_min_volume_title">വോളിയം ആരംഭിക്കുക</string>
+  <string name="increasing_ring_ramp_up_time_title">റാംപ്-അപ്പ് സമയം</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS അസിസ്റ്റഡ് ഡാറ്റ ഡൗൺലോഡ്</string>
+  <string name="lto_download_data_wifi_only_on">ഏതെങ്കിലും നെറ്റ്‌വർക്കുകളിലൂടെ</string>
+  <string name="lto_download_data_wifi_only_off">Wi\u2011Fi നെറ്റ്‌വർക്കുകൾ വഴി മാത്രം</string>
+  <string name="volume_keys_control_ring_stream_title">റിംഗ്ടോൺ വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="volume_keys_control_ring_stream_summary_on">വോളിയം കീകൾ റിംഗ്ടോൺ വോളിയം നിയന്ത്രിക്കുന്നു</string>
+  <string name="volume_keys_control_ring_stream_summary_off">വോളിയം കീകൾ മീഡിയ വോളിയം നിയന്ത്രിക്കുന്നു</string>
+  <string name="category_calibration">കാലിബ്രേഷൻ</string>
+  <string name="display_and_lights">ഡിസ്പ്ലേ &amp; ലൈറ്റ്സ്</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">ചാർജ്ജിംഗ് ശബ്‌ദം</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">പ്രവർത്തനക്ഷമമാക്കുക</string>
+  <string name="power_notifications_enable_summary">ഒരു ഊര്‍ജ്ജ സ്രോതസ്സില്‍ ബന്ധിപ്പിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ വിച്ഛേദിക്കുമ്പോൾ ഒരു ശബ്ദം പ്ലേ ചെയ്യുക</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">വൈബ്രേറ്റുചെയ്യുക</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">അറിയിപ്പ് ശബ്ദം</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">നിശബ്‌ദം</string>
   <!-- Status bar -->
+  <string name="status_bar_title">സ്റ്റാറ്റസ് ബാർ</string>
+  <string name="status_bar_toggle_brightness">തെളിച്ച നിയന്ത്രണം</string>
+  <string name="status_bar_toggle_brightness_summary">സ്റ്റാറ്റസ് ബാറിന് കുറുകെ സ്ലൈഡ് ചെയ്യുന്നതിലൂടെ തെളിച്ചം ക്രമീകരിക്കുക</string>
+  <string name="status_bar_notif_count_title">അറിയിപ്പ് എണ്ണം ദൃശ്യമാക്കുക</string>
+  <string name="status_bar_notif_count_summary">അവശേഷിക്കുന്ന അറിയിപ്പുകളുടെ എണ്ണം ദൃശ്യമാക്കുക</string>
+  <string name="status_bar_quick_qs_pulldown_title">ദ്രുത പുൾഡൌൺ</string>
+  <string name="status_bar_quick_qs_pulldown_summary">സ്റ്റാറ്റസ് ബാറിന്റെ %1$s എഡ്ജ് ദ്രുത ക്രമീകരണങ്ങൾ താഴേക്ക് കൊണ്ടുവരുന്നതാണ്</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">ഇടത്</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">വലത്</string>
+  <string name="status_bar_quick_qs_pulldown_off">ഓഫാണ്</string>
+  <string name="status_bar_quick_qs_pulldown_left">ഇടത്</string>
+  <string name="status_bar_quick_qs_pulldown_right">വലത്</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">ഘടികാരം ശൈലി</string>
+  <string name="status_bar_clock_style_right">വലത്</string>
+  <string name="status_bar_clock_style_left">ഇടത്</string>
+  <string name="status_bar_clock_style_center">കേന്ദ്രം</string>
+  <string name="status_bar_clock_style_hidden">മറച്ചത്</string>
+  <string name="status_bar_am_pm_title">AM/PM ശൈലി</string>
+  <string name="status_bar_am_pm_info">24 മണിക്കൂർ ക്ലോക്ക് പ്രാപ്തമാക്കി</string>
+  <string name="status_bar_am_pm_normal">സാധാരണ</string>
+  <string name="status_bar_am_pm_small">ചെറുത്</string>
+  <string name="status_bar_am_pm_hidden">മറച്ചത്</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">ബാറ്ററി സ്റ്റാറ്റസ് ശൈലി</string>
+  <string name="status_bar_battery_style_icon_portrait">ഐക്കൺ പോർട്രെയ്റ്റ്</string>
+  <string name="status_bar_battery_style_icon_landscape">ഐക്കൺ ലാൻഡ്സ്കേപ്പ്</string>
+  <string name="status_bar_battery_style_circle">വലയം</string>
+  <string name="status_bar_battery_style_text">ടെക്സ്റ്റ്</string>
+  <string name="status_bar_battery_style_hidden">മറച്ചത്</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">ബാറ്ററി ശതമാനം</string>
+  <string name="status_bar_battery_percentage_default">മറച്ചത്</string>
+  <string name="status_bar_battery_percentage_text_inside">ഐക്കണിന്റെ ഉള്ളില്‍</string>
+  <string name="status_bar_battery_percentage_text_next">അടുത്തത് ഐക്കണിലേക്ക്</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">സ്റ്റാറ്റസ് ബാർ ഐക്കണുകൾ</string>
+  <string name="status_bar_icons_summary">ഏത് സ്റ്റാറ്റസ് ബാർ ഐക്കണുകളാണ് ദൃശ്യമാക്കേണ്ടതെന്ന് നിയന്ത്രിക്കുക</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">ഗെസ്ച്വര്‍ സ്പര്‍ശന ഇവന്റുകൾ തടയുക</string>
+  <string name="edge_gesture_service_summary">നാവിഗേഷൻ, സ്റ്റാറ്റസ് ബാർ ആംഗ്യങ്ങൾക്കായുള്ള ടച്ച് ഇവന്റുകൾ ആപ്ലിക്കേഷനുകളിലേക്ക് അയയ്ക്കരുത്</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">ഒരിക്കലുമില്ല</string>
+  <string name="keep_screen_on_debugging">USB ഡീബഗ്ഗിംഗ് ചെയ്യുന്ന സമയത്ത്</string>
+  <string name="keep_screen_on_charging">ചാർജ്ജുചെയ്യുമ്പോൾ</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">സ്വകാര്യത</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">ഡിഫോള്‍ട്ട് അയി പ്രാപ്തമാണ്</string>
+  <string name="privacy_guard_default_summary">പുതുതായി ഇൻസ്റ്റാൾ ചെയ്ത അപ്ലിക്കേഷനുകൾക്കായി ഡിഫോള്‍ട്ട് അയി പ്രാപ്തമാണ്</string>
+  <string name="privacy_guard_manager_title">സ്വകാര്യത ഗാർഡ്</string>
+  <string name="privacy_guard_manager_summary">നിങ്ങളുടെ സ്വകാര്യ ഡാറ്റ ആക്സസ് ചെയ്യുന്നത് ഏത് ആപ്ലിക്കേഷന്‍ ആണെന്ന് കൈകാര്യം ചെയ്യുക</string>
+  <string name="privacy_guard_no_user_apps">അപ്ലിക്കേഷനുകൾ ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല</string>
+  <string name="privacy_guard_help_title">സഹായം</string>
+  <string name="privacy_guard_reset_title">പുനഃസജ്ജമാക്കുക</string>
+  <string name="privacy_guard_reset_text">അനുമതികൾ പുനക്രമീകരിക്കണോ?</string>
+  <string name="privacy_guard_help_text">ഈ സ്ക്രീനിൽ, എത് ആപ്ലിക്കേഷന്‍റെ പ്രൈവസി ഗാർഡ് ആണ് സജീവമാക്കേണ്ടത് എന്ന് ലളിതമായി അതില്‍ അമര്‍ത്തുന്നതിലൂടെ തിരഞ്ഞെടുക്കാന്‍ നിങ്ങള്‍ക്ക് സാധിക്കുന്നതാണ്. കോണ്‍ടാക്റ്റുകള്‍, സന്ദേശങ്ങള്‍ അല്ലെങ്കില്‍ കോള്‍ ലോഗുകള്‍ പോലുള്ള നിങ്ങളുടെ സ്വകാര്യ ഡാറ്റ ആക്സസ് ചെയ്യാൻ തിരഞ്ഞെടുത്ത ആപ്ലിക്കേഷനുകള്‍ക്ക് കഴിയില്ല. ഒരു ആപ്ലിക്കേഷൻ എൻട്രിയില്‍ നീണ്ട അമര്‍ത്തല്‍ നടത്തുന്നതിലൂടെ അതിന്റെ ആപ്ലിക്കേഷൻ വിശദാംശങ്ങൾ സ്ക്രീൻ തുറക്കുന്നു.\n\nബില്‍റ്റ്-ഇന്‍ ആപ്ലിക്കേഷനുകള്‍ ഡിഫോള്‍ട്ടായി ദൃശ്യമാകുന്നതല്ല, എന്നാല്‍ ബന്ധപ്പെട്ട മെനു ഐച്ഛികം തിരഞ്ഞെടുക്കുന്നതിലൂടെ ദൃശ്യമാക്കാന്‍ സാധിക്കുന്നതാണ്.</string>
+  <string name="privacy_guard_manager_show_system_apps">ബിൽറ്റ്-ഇൻ അപ്ലിക്കേഷനുകൾ ദൃശ്യമാക്കുക</string>
+  <string name="privacy_guard_advanced_settings_title">വിപുലം</string>
+  <string name="privacy_guard_notification_title">അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">പാറ്റേൺ പിശക് ദൃശ്യമാക്കുക</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">ഡോട്ടുകൾ പാറ്റേൺ ദൃശ്യമാക്കുക</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">പാസ്‌വേഡ് എന്‍ട്രി നേരിട്ട് ദൃശ്യമാക്കുക</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">പാറ്റേൺ വ്യൂ നേരിട്ട് ദൃശ്യമാക്കുക</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">PIN എന്‍ട്രി നേരിട്ട് ദൃശ്യമാക്കുക</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">സംഗീതം വിഷ്വലൈസർ പ്രദര്‍ശനം ചെയ്യുക</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">ദ്രുത ക്രമീകരണ ടൈലുകളിലൂടെ അപ്രാപ്തമാക്കി</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">ലോക്ക് സ്ക്രീൻ പ്രാപ്തമാക്കാന്‍ അമര്‍ത്തുക</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">ലോക്ക് സ്ക്രീൻ പ്രാപ്തമാക്കി!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">ബാറ്ററി സേവർ ത്രെഷോൾഡ്</string>
+  <string name="battery_saver_summary">പ്രകടനം കുറയ്ക്കുകയും പശ്ചാത്തല ഡാറ്റ പരിമിതപ്പെടുത്തുകയും ചെയ്യുക</string>
+  <string name="battery_saver_summary_unavailable">ചാർജ്ജ് ചെയ്യുമ്പോൾ ലഭ്യമല്ല</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">പെര്‍-ആപ് പ്രൊഫൈലുകൾ പ്രാപ്തമാക്കുക</string>
+  <string name="autoperf_summary">വിവിധ ആപ്ലിക്കേഷനുകൾക്ക് ഉചിതമായ ബാറ്ററി മോഡ് സ്വപ്രേരിതമായി തിരഞ്ഞെടുക്കുക</string>
+  <string name="perf_profile_title">ബാറ്ററി മോഡ്</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">ബൂട്ടില്‍ അപ്ലിക്കേഷനുകൾ ആരംഭിച്ചു</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">അറിയിപ്പ് ടോൺ</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">വിപുലമായ റീബൂട്ട്</string>
+  <string name="advanced_reboot_summary">അൺലോക്ക് ചെയ്തിരിക്കുമ്പോള്‍ റിക്കവറി, ബൂട്ട്ലോഡറിലേക്ക് റീബൂട്ട് ചെയ്യുന്നതിന് അല്ലെങ്കില്‍ ഒരു സോഫ്റ്റ്‌ റീബൂട്ട് ചെയ്യുന്നതിന് പവര്‍ മെനുവില്‍ ഐച്ഛികങ്ങള്‍ ഉള്‍പ്പെടുത്തുക</string>
+  <string name="category_interface">ഇന്റർഫേസ്</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">വിപുലീകരിച്ച ഡെസ്ക്ടോപ്പ്</string>
+  <string name="expanded_hide_nothing">ഒന്നും മറയ്ക്കരുത്</string>
+  <string name="expanded_hide_status">സ്റ്റാറ്റസ് ബാർ മറയ്ക്കുക</string>
+  <string name="expanded_hide_navigation">നാവിഗേഷൻ ബാർ മറയ്ക്കുക</string>
+  <string name="expanded_hide_both">രണ്ടും മറയ്ക്കുക</string>
+  <string name="expanded_nothing_to_show">വിപുലീകരിച്ച സ്ഥിതിയ്ക്കായി ഒരു ഇഷ്ടാനുസൃത പെര്‍-ആപ് കോൺഫിഗറേഷൻ ചേര്‍ക്കുന്നതിന്, \'എല്ലാത്തിനുമായി പ്രാപ്തമാക്കുക\' എന്നത് ഓഫ് സ്ഥാനത്ത് സജ്ജമാക്കുക</string>
+  <string name="expanded_enabled_for_all">എല്ലാത്തിനുമായി പ്രാപ്തമാക്കി</string>
+  <string name="expanded_desktop_style">ഡെസ്ക്ടോപ്പ് ശൈലി വിപുലീകരിച്ചു</string>
+  <string name="expanded_desktop_style_description">ഒരു ഡിഫോള്‍ട്ട് വിപുലീകരിച്ചു ഡെസ്ക്ടോപ്പ് ശൈലി തിരഞ്ഞെടുക്കുക</string>
+  <string name="expanded_desktop_title">വിപുലീകരിച്ചു ഡെസ്ക്ടോപ്പ് ഐച്ഛികങ്ങള്‍</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">ആപ്ലിക്കേഷൻ പിന്നിലേക്ക് ബട്ടൺ നശിപ്പിക്കുക</string>
+  <string name="kill_app_longpress_back_summary">ബാക്ക് ബട്ടൺ ദീര്‍ഘ നേരം അമര്‍ത്തി ആപ്ലിക്കേഷൻ നശിപ്പിക്കുക</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">സമീപകാലത്തുള്ളവയുടെ മെനുവിൽ തിരയൽ ബാർ ദൃശ്യമാക്കുക</string>
+  <string name="keywords_recents_show_searchbar">സമീപകാല സമീപകാലത്തുള്ളവ പ്രാപ്തമാക്കുക അപ്രാപ്തമാക്കുക ദൃശ്യമാക്കുക മറയ്ക്കുക തിരയൽ ബാർ തിരയൽബാർ</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">വോയ്സ് വേക്ക്അപ്പ്</string>
+  <string name="voice_wakeup_retrain_title">നിങ്ങളുടെ ശബ്ദം പരിശീലിക്കുക</string>
+  <string name="voice_wakeup_activity_title">സമാരംഭ പ്രവർത്തനം</string>
+  <string name="voice_wakeup_default_activity">Google ഇപ്പോൾ</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">ഒരു ഡയറക്റ്റ് ഡയൽ കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുന്നതിനായി വോയ്സ് വേക്കപ്പിന് ഫോണ്‍ കോള്‍ അനുമതികള്‍ ആവശ്യമാണ്‌.</string>
+  <string name="picker_activities">പ്രവർത്തനങ്ങൾ</string>
+  <string name="select_custom_app_title">ഇഷ്ടാനുസൃത ആപ്ലിക്കേഷൻ തിരഞ്ഞെടുക്കുക</string>
+  <string name="select_custom_activity_title">ഇഷ്ടാനുസൃത പ്രവർത്തനം തിരഞ്ഞെടുക്കുക</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">തടഞ്ഞ കോളർ ലിസ്റ്റ്</string>
+  <string name="blacklist_edit_dialog_title">തടഞ്ഞ ഫോൺ നമ്പർ എഡിറ്റ് ചെയ്യുക</string>
+  <string name="blacklist_prefs">ക്രമീകരണം</string>
+  <string name="blacklist_button_delete">ഇല്ലാതാക്കുക</string>
+  <string name="blacklist_empty_text">നിങ്ങൾക്ക് തടഞ്ഞ നമ്പറുകൾ ഇല്ല. ചേർക്കുക (+) ബട്ടൺ സ്പർശിച്ച് ഒരു എൻട്രി ചേർക്കുക.</string>
+  <string name="blacklist_disabled_empty_text">നിങ്ങളെ വിളിക്കുന്നതിന് അല്ലെങ്കില്‍ സന്ദേശം അയക്കുന്നതില്‍ നിന്നും ഫോൺ നമ്പറുകളെ തടയാൻ, തടഞ്ഞ കോളർ ലിസ്റ്റ് പ്രാപ്തമാക്കുക.</string>
+  <string name="blacklist_summary_disabled">പ്രവർത്തനരഹിതമാക്കി</string>
+  <string name="blacklist_summary">തടഞ്ഞ കോളർ ലിസ്റ്റിലെ ഫോൺ നമ്പറുകളില്‍ നിന്ന് ഇൻകമിംഗ് കോളുകൾ അല്ലെങ്കിൽ സന്ദേശങ്ങൾ നിങ്ങള്‍ക്ക് ലഭിക്കില്ല</string>
+  <string name="blacklist_notify">അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
+  <string name="blacklist_private_numbers_title">സ്വകാര്യ നമ്പറുകള്‍</string>
+  <string name="blacklist_private_numbers_summary_disabled">സ്വകാര്യ നമ്പറുകളില്‍ നിന്നുള്ള കോളുകൾ തടയരുത്</string>
+  <string name="blacklist_private_numbers_summary">സ്വകാര്യ നമ്പറുകളില്‍ നിന്നുള്ള ഇന്‍കമിംഗ് <xliff:g id="type">%s</xliff:g> തടയുക</string>
+  <string name="blacklist_unknown_numbers_title">അജ്ഞാത നമ്പറുകള്‍</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">കോൺടാക്റ്റ് ലിസ്റ്റിൽ ഇല്ലാത്ത നമ്പറുകളില്‍ നിന്നുള്ള കോളുകള്‍ അല്ലെങ്കില്‍ സന്ദേശങ്ങള്‍ തടയരുത്</string>
+  <string name="blacklist_unknown_numbers_summary">കോൺടാക്റ്റ് ലിസ്റ്റിൽ ഇല്ലാത്ത നമ്പറുകളില്‍ നിന്നുള്ള ഇന്‍കമിംഗ് <xliff:g id="type">%s</xliff:g> തടയരുത്</string>
+  <string name="blacklist_summary_type_calls_only">കോളുകൾ</string>
+  <string name="blacklist_summary_type_messages_only">സന്ദേശങ്ങൾ</string>
+  <string name="blacklist_summary_type_calls_and_messages">കോളുകളും സന്ദേശങ്ങളും</string>
+  <string name="blacklist_regex_title">വൈല്‍ഡ്കാര്‍ഡുകള്‍ ഉപയോഗിക്കുക</string>
+  <string name="blacklist_regex_summary">വൈല്‍ഡ്കാര്‍ഡ് ആയി . ഉം ആവര്‍ത്തനങ്ങള്‍ക്കായി * ഉം ഉപയോഗിക്കുക ഉദാ 123.*, 123 യില്‍ ആരംഭിക്കുന്ന നമ്പറുകളെ തടയുകയും .*123.* 123 ഉള്‍പ്പെടുന്ന നമ്പറുകളെ തടയുകയും ചെയ്യുന്നു</string>
+  <string name="blacklist_policy_block_calls">ഇൻകമിംഗ് കോളുകൾ തടയുക</string>
+  <string name="blacklist_policy_block_messages">ഇൻകമിംഗ് സന്ദേശങ്ങൾ തടയുക</string>
+  <string name="blacklist_bad_number_add">തടഞ്ഞ കോളർ ലിസ്റ്റിലേക്ക് അസാധുവായ ഫോൺ നമ്പർ ചേർക്കാൻ കഴിയുന്നില്ല</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">നമ്പർ നീക്കം ചെയ്യുക</string>
+  <string name="remove_blacklist_entry">നിങ്ങൾക്ക് തടഞ്ഞ ഈ ഫോൺ നമ്പർ നീക്കം ചെയ്യണോ?</string>
+  <string name="select_contact">കോൺടാക്റ്റ് തിരഞ്ഞെടുക്കുക</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">ആപ്ലിക്കേഷൻ സുരക്ഷ</string>
+  <string name="sms_security_check_limit_title">SMS സന്ദേശ പരിധി</string>
+  <string name="sms_security_check_limit_summary">സ്ഥിരീകരണം ആവശ്യപ്പെടുന്നതിന് മുമ്പ് 1 മിനിറ്റില്‍ %d സന്ദേശങ്ങൾ അയയ്ക്കാൻ അപ്ലിക്കേഷനുകള്‍ക്ക് കഴിയുന്നതാണ്</string>
+  <string name="sms_security_check_limit_summary_none">സ്ഥിരീകരണം ഇല്ലാതെ ഏതെങ്കിലും സന്ദേശങ്ങൾ അയക്കാൻ അപ്ലിക്കേഷനുകളെ അനുവദിക്കില്ല</string>
+  <string name="sms_security_check_limit_none">ആരിൽ നിന്നും വേണ്ട</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s ചേർത്തു</string>
+  <string name="spam_last_blocked_title">അവസാനം തടഞ്ഞത് %1$s</string>
+  <string name="block_notifications_title">ഫിൽറ്റർ അറിയിപ്പുകൾ</string>
+  <string name="block_notifications_summary">അവഗണിച്ച അറിയിപ്പുകളും ഫിൽട്ടറുകളും കൈകാര്യം ചെയ്യുക</string>
+  <string name="no_filters_title">ഫിൽറ്ററുകള്‍ സജ്ജീകരിച്ചിട്ടില്ല</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod സ്ഥിതിവിവരക്കണക്കുകൾ</string>
+  <string name="anonymous_statistics_summary">അജ്ഞാത സ്ഥിതിവിവരക്കണക്കുകൾ റിപ്പോർട്ട് ചെയ്യുന്നത് തിരഞ്ഞെടുത്ത് CyanogenMod മികച്ചതാക്കാൻ സഹായിക്കുക</string>
+  <string name="anonymous_statistics_warning_title">ആമുഖം</string>
+  <string name="anonymous_statistics_warning">CyanogenMod സ്റ്റാറ്റിസ്റ്റിക്സ് തിരഞ്ഞെടുക്കുന്നതിലൂടെ ഉപകരണങ്ങളില്‍ വിശിഷ്ടമായ ഇൻസ്റ്റലേഷനുകൾ ട്രാക്കുചെയ്യുന്നതിന് സ്വകാര്യമല്ലാത്ത ഡാറ്റ CyanogenMod ഡെവലപ്പര്‍മാര്‍ക്ക് സമര്‍പ്പിക്കുന്നതാണ്. സമര്‍പ്പിക്കപ്പെടുന്ന വിവരങ്ങളില്‍ നിങ്ങളുടെ സ്വകാര്യതയെ അല്ലെങ്കിൽ സ്വകാര്യ ഡാറ്റയെ വിട്ടുവീഴ്ച ചെയ്യാത്ത ഒരു വിശിഷ്ട ഐഡന്റിഫയർ ഉൾപ്പെടുന്നു. ഓരോ ബൂട്ട് സമയത്തും ഡാറ്റ സമര്‍പ്പിക്കുന്നു.\n\nസമര്‍പ്പിച്ച ഡാറ്റയ്ക്ക് ഉദാഹരണത്തിനായി, പ്രിവ്യൂ ഡാറ്റ അമര്‍ത്തുക.</string>
+  <string name="enable_reporting_title">റിപ്പോർട്ടിംഗ് പ്രാപ്തമാക്കുക</string>
+  <string name="preview_data_title">പ്രിവ്യൂ ഡാറ്റ</string>
+  <string name="view_stats_title">സ്ഥിതിവിവരക്കണക്കുകൾ കാണുക</string>
+  <string name="anonymous_learn_more">കൂടുതലറിയുക</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">വിശിഷ്ട ഐഡി</string>
+  <string name="preview_device_title">ഉപകരണം</string>
+  <string name="preview_version_title">പതിപ്പ്</string>
+  <string name="preview_country_title">രാജ്യം:</string>
+  <string name="preview_carrier_title">കാരിയര്‍</string>
+  <string name="stats_collection_title">സ്ഥിതിവിവരക്കണക്ക് ശേഖരം</string>
+  <string name="stats_collection_summary">പ്രാപ്തമാക്കിയിരിക്കുമ്പോൾ, മെട്രിക്സ് ശേഖരം അനുവദിക്കുന്നു</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">പാറ്റേൺ പുനഃക്രമീകരിക്കുക</string>
+  <string name="lockpattern_settings_reset_summary">ബന്ധപ്പെട്ട ലോക്ക് പാറ്റേൺ പുനഃക്രമീകരിക്കാൻ പ്രാഥമിക ഇമെയിൽ അക്കൗണ്ടും പാസ്‌വേഡും രേഖപ്പെടുത്തുക</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">പുനഃസജ്ജമാക്കുക</string>
+  <string name="menu_hidden_apps_reset_lock">ലോക്ക് പാറ്റേൺ പുനഃക്രമീകരിക്കുക</string>
+  <string name="protected_apps">സംരക്ഷിത ആപ്ലിക്കേഷനുകൾ</string>
+  <string name="protected_apps_summary">ഒരു സുരക്ഷിത ലോക്കിന് പിന്നിൽ ഏതൊക്കെ ആപ്ലിക്കേഷനുകളാണ് മറയ്ക്കേണ്ടതെന്ന് നിയന്ത്രിക്കുക</string>
+  <string name="saving_protected_components">ഘടകഭാഗത്തിന്റെ സ്ഥിതി സേവ് ചെയ്യുന്നു\u2026</string>
+  <string name="pa_login_username_hint">ഉപയോക്തൃനാമം (ഇമെയിൽ)</string>
+  <string name="pa_login_password_hint">പാസ്‌വേഡ്</string>
+  <string name="pa_login_submit_button">സൈൻ ഇൻ ചെയ്യുക</string>
+  <string name="pa_login_checking_password">അക്കൗണ്ട് പരിശോധിക്കുന്നു…</string>
+  <string name="pa_login_incorrect_login">ലോഗിൻ തെറ്റായിരുന്നു</string>
+  <string name="pa_pattern_or_fingerprint_header">അൺലോക്ക് ചെയ്യുന്നതിന് പാറ്റേൺ വരയ്ക്കുകയോ അല്ലെങ്കില്‍ ഫിംഗര്‍പ്രിന്‍റ് ഉപയോഗിക്കുകയോ ചെയ്യേണ്ടതാണ്</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">സംഭാവകർ</string>
+  <string name="contributors_cloud_loading_message">സംഭാവകർമാരെ ഡാറ്റ ലോഡ് ചെയ്യുന്നു\u2026</string>
+  <string name="contributors_cloud_failed_message">സംഭാവകർമാരുടെ ഡാറ്റ ലോഡ് ചെയ്യാൻ കഴിയില്ല</string>
+  <string name="contributor_info_menu">സംഭാവകർമാരുടെ വിവരം</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>പേര്:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>വിളിപ്പേര്:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>നടപ്പാക്കലുകള്‍:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">കോണ്‍ട്രിബ്യൂഷനുകളുടെ വിവരം</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>ആകെ സംഭാവകർ:</b> <xliff:g id="total_contributors"> %1$s</xliff:g><br/><br/>
+ <b>ആകെ നടപ്പാക്കലുകള്‍:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+ <b>അവസാനമായി അപ്ഡേറ്റ് ചെയ്തത്:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ശബ്ദങ്ങൾ</string>
+  <string name="notification_manager">അറിയിപ്പുകൾ</string>
+  <string name="lockscreen_settings">ലോക്ക് സ്‌ക്രീൻ</string>
+  <string name="category_lights">ലൈറ്റ്സ്</string>
+  <string name="category_volume">വോളിയം</string>
+  <string name="category_vibrate">വൈബ്രേറ്റുചെയ്യുക</string>
+  <string name="category_misc">പലവക</string>
+  <string name="title_general">പൊതുവായത്</string>
+  <string name="advanced">വിപുലം</string>
+  <string name="link_volume_option_title">ലിങ്ക് റിംഗ്ടോൺ &amp; അറിയിപ്പ് വോളിയം</string>
+  <string name="lcd_density_prompt_message">സ്റ്റാൻഡേർഡ് അല്ലാത്ത DPI ല്‍ ചില അപ്ലിക്കേഷനുകൾ പ്രവര്‍ത്തിച്ചെന്നുവരില്ല.\n\ഇത് നിങ്ങളുടെ ഉപകരണത്തെ പുനരാരംഭിക്കുന്നതാണ്.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ഫോൺ നമ്പർ</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">ഡ്യൂപ്ലിക്കേറ്റ് APN</string>
+  <string name="duplicate_apn_error_message">ഈ APN ഇതിനകം നിലവിലുണ്ട്. നിരസിക്കുക അല്ലെങ്കിൽ പരാമീറ്ററുകളും മാറ്റുക.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> is <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+  <string name="sim_disabled">അപ്രാപ്തമാക്കി</string>
+  <string name="sim_missing">നഷ്ടപ്പെട്ടിരിക്കുന്നു അല്ലെങ്കിൽ കേടുപറ്റി</string>
+  <string name="sim_enabler_need_disable_sim">SIM കാർഡ് നിര്‍ജീവമാക്കുന്നതാണ്. നിങ്ങൾക്ക് തുടരണോ?</string>
+  <string name="sim_enabler_will_disable_sim_title">ശ്രദ്ധിക്കുക</string>
+  <string name="sim_enabler_need_switch_data_service">ഈ SIM അപ്രാപ്തമാക്കുകയും ഡാറ്റ സേവനങ്ങൾക്കായി SIM <xliff:g id="slotid">%1$s</xliff:g> ഉപയോഗിക്കുന്നതുമാണ്. നിങ്ങൾ തുടരണമെന്ന് ഉറപ്പാണോ?</string>
+  <string name="sim_enabler_airplane_on">എയര്‍പ്ലെയിന്‍ മോഡ് ഓണ്‍ ആയിരിക്കുന്ന സമയത്ത് പ്രവർത്തനം നടത്താൻ കഴിയുന്നില്ല.</string>
+  <string name="sim_enabler_in_call">കോളില്‍ ആയിരിക്കുന്ന സമയത്ത് പ്രവർത്തനം നടത്താൻ കഴിയുന്നില്ല.</string>
+  <string name="sim_enabler_both_inactive">എല്ലാ SIM കാർഡുകളും അപ്രാപ്തമാക്കുവാന്‍ കഴിയില്ല</string>
+  <string name="sim_enabler_enabling">സജീവമാക്കുന്നു\u2026</string>
+  <string name="sim_enabler_disabling">നിർജീവമാക്കുന്നു\u2026</string>
+  <string name="sub_activate_success">SIM സജീവമാക്കി</string>
+  <string name="sub_activate_failed">സജീവമാക്കൽ പരാജയപ്പെട്ടു.</string>
+  <string name="sub_deactivate_success">SIM നിർജീവമാക്കി.</string>
+  <string name="sub_deactivate_failed">നിർജീവമാക്കല്‍ പരാജയപ്പെട്ടു.</string>
+  <string name="primary_sub_select_title">ഡിഫോള്‍ട്ട് 3G/LTE സബ്സ്ക്രിപ്ഷൻ</string>
+  <string name="select_sim_card">സിം കാർഡ് തിരഞ്ഞെടുക്കുക</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d സ്റ്റാറ്റസ്</string>
+  <string name="sim_card_lock_settings_title">SIM %d ലോക്ക് ക്രമീകരണങ്ങൾ</string>
+  <string name="sim_card_summary_empty">SIM ഇട്ടിട്ടില്ല</string>
+  <string name="sim_mobile_network_settings_category_title">മൊബൈൽ നെറ്റ്‌വർക്ക് ക്രമീകരണങ്ങൾ</string>
+  <string name="sim_mobile_network_settings_title">SIM %d ക്രമീകരണങ്ങൾ</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">ഓർമ്മപ്പെടുത്തലുകൾ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ഇവന്റുകൾ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">തിരഞ്ഞെടുത്ത കോളർമാർ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">തിരഞ്ഞെടുത്ത സന്ദേശങ്ങൾ</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">ഹെഡ്: %1$s W/kg</string>
+  <string name="maximum_body_level">ബോഡി: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">മോഡൽ: %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">SIM %d റിംഗ്ടോൺ</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">അപ്ലിക്കേഷൻ:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">അവസാനം ഉപയോഗിച്ചത്</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">ഉപയോഗ സമയം</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">ഇത് നിങ്ങളുടെ ഫോണിന്റെ <b>ആന്തരിക സംഭരണത്തില്‍</b> നിന്നുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതാണ്, അതില്‍ ഉള്‍പ്പെടുന്നവയാണ്:\n\n<li>നിങ്ങളുടെ ഉപകരണ അക്കൗണ്ടുകൾ</li>\n<li>സിസ്റ്റം, ആപ്ലിക്കേഷൻ ഡാറ്റയും ക്രമീകരണങ്ങളും</li>\n<li>ഡൗൺലോഡ് ചെയ്ത അപ്ലിക്കേഷനുകൾ</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">ഇത് നിങ്ങളുടെ ഫോണിന്റെ <b>ആന്തരിക സംഭരണത്തില്‍</b> നിന്നുള്ള എല്ലാ ഡാറ്റയും മായ്ക്കുന്നതാണ്, അതില്‍ ഉള്‍പ്പെടുന്നവയാണ്:\n\n<li>നിങ്ങളുടെ ഉപകരണ അക്കൗണ്ടുകൾ</li>\n<li>സിസ്റ്റം, ആപ്ലിക്കേഷൻ ഡാറ്റയും ക്രമീകരണങ്ങളും</li>\n<li>ഡൗൺലോഡ് ചെയ്ത അപ്ലിക്കേഷനുകൾ</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">വ്യക്തിഗത ഡാറ്റ &amp; അപ്ലിക്കേഷനുകൾ</string>
+  <string name="factory_reset_instructions_summary">ഈ ഉപകരണത്തിലെ നിങ്ങളുടെ എല്ലാ അക്കൗണ്ടുകള്‍, ആപ്ലിക്കേഷനുകൾ, ആപ്ലിക്കേഷൻ ഡാറ്റ, സിസ്റ്റം ക്രമീകരണങ്ങൾ എന്നിവ മായ്ക്കുന്നതാണ്</string>
+  <string name="factory_reset_personal_content">വ്യക്തിഗത ഉള്ളടക്കം</string>
+  <string name="factory_reset_erase_stored_content">സംഭരിച്ചിരിക്കുന്ന ഉള്ളടക്കം മായ്ക്കുക</string>
+  <string name="factory_reset_erase_stored_content_summary">ഈ ഉപകരണത്തിൽ സംഭരിച്ചിട്ടുള്ള സംഗീതം, ഫോട്ടോകൾ, വീഡിയോകൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുക</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">ഈ ഉപകരണത്തിൽ സംഭരിച്ചിട്ടുള്ള സംഗീതം, ഫോട്ടോകൾ, വീഡിയോകൾ, മറ്റ് ഉപയോക്തൃ ഡാറ്റ എന്നിവ മായ്ക്കുക. \n\n<b>ഉപകരണ എൻക്രിപ്ഷൻ കാരണം ഉള്ളടക്കം സേവ് ചെയ്യാന്‍ കഴിയില്ല.</b></string>
+  <string name="factory_reset_erase_sd_card">SD കാർഡ് ഫോർമാറ്റ് ചെയ്യണോ?</string>
+  <string name="factory_reset_erase_sd_card_summary">സംഗീതവും ഫോട്ടോകളും ഉൾപ്പെടെ, SD കാർഡിലെ എല്ലാ ഡാറ്റയും മായ്ക്കുക</string>
+  <string name="factory_reset_warning_text_reset_now">ഇപ്പോൾ പുനക്രമീകരിക്കുക</string>
+  <string name="factory_reset_warning_text_message">നിങ്ങളുടെ എല്ലാ അക്കൗണ്ടുകൾ, ആപ്ലിക്കേഷനുകൾ, ആപ്ലിക്കേഷൻ ഡാറ്റ, സിസ്റ്റം ക്രമീകരണങ്ങൾ എന്നിവ ഈ ഉപകരണത്തിൽ നിന്ന് നീക്കം ചെയ്യുന്നതാണ്‌. ഇത് പൂർവാവസ്ഥയിലാക്കാൻ കഴിയില്ല.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">മറ്റുള്ളവ</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi ഹോട്ട്സ്പോട്ട് കാലഹരണപ്പെട്ടു</string>
+  <string name="hotstpot_inactivity_timeout_never">ഒരിക്കലുമില്ല</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 മിനിറ്റ്</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 മിനിറ്റ്</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 മിനിറ്റ്</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">പോർട്ടബിൾ Wi\u2011Fi ഒരിക്കലും കാലഹരണപ്പെടില്ല</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">പോർട്ടബിൾ Wi\u2011Fi ഹോട്ട്സ്പോട്ട് കാലഹരണപെടും ഇതിനു ശേഷം <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ലോക്ക് സ്ക്രീൻ തത്സമയം</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">ലൈവ് ലോക്ക് സ്ക്രീനുകൾ പ്രാപ്തമാക്കുക ക്രമീകരിക്കുകയും ചെയ്യുക</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">ക്രമീകരണം</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ലഭ്യമായ ലൈവ് ലോക്ക് സ്ക്രീനുകൾ കാണാൻ, ലൈവ് ലോക്ക് സ്ക്രീനുകൾ ഓണാക്കുക.
+ .</string>
+  <string name="interruptions_ignore_while_media_title">ഓഡിയോ ഡക്കിംഗ് തടയുക</string>
+  <string name="interruptions_ignore_while_media_summary">ഒരു അറിയിപ്പ് ലഭിക്കുമ്പോൾ മീഡിയ പ്ലേബാക്ക് വോളിയം കുറയ്ക്കരുത്</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">CyanogenMod ലീഗല്‍</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">സ്ഥിതിവിവരക്കണക്കുകൾ പുനഃക്രമീകരിക്കാൻ</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">ബാറ്ററി ഹിസ്റ്ററി നില പുനക്രമീകരിക്കാന്‍ പോകുന്നു</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ഡോക്ക് ബാറ്ററി നിലവിലില്ല</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ഡോക്ക് AC യില്‍ ചാര്‍ജ്ജ് ചെയ്യുന്നു</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">USB ഡോക്ക് മുഖേന ചാര്‍ജ് ചെയ്യുന്നു</string>
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-mr-rIN/cm_plurals.xml b/res/values-mr-rIN/cm_plurals.xml
new file mode 100644
index 0000000..76d9104
--- /dev/null
+++ b/res/values-mr-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> सेकंद</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> %d सेकंद</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">एकदा</item>
+    <item quantity="other">%d वेळा</item>
+  </plurals>
+</resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 5fd19c8..a3be628 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">विकास सेटिंग्ज सक्षम करण्यापासून तुम्ही <xliff:g id="step_count">%1$d</xliff:g> पायरी अनुपस्थित आहात.</item>
+    <item quantity="other">विकास सेटिंग्ज सक्षम करण्यापासून तुम्ही <xliff:g id="step_count">%1$d</xliff:g> पायऱ्या अनुपस्थित आहात.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">तुम्ही विकास सेटिंग्ज सक्षम केली आहेत!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">गरज नाही, तुम्ही आधीच विकास सेटिंग्ज सक्षम केली आहेत.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">विकास साधने</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">विकास शॉर्टकट</string>
+  <string name="development_shortcut_summary">अलीकडील अनुप्रयोग यादीमध्ये अनुप्रयोग व्यवस्थापन शॉर्टकट सक्षम करा</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">रूट ऍक्सेस</string>
+  <string name="root_access_warning_title">रूट ऍक्सेसला परवानगी द्यायची?</string>
+  <string name="root_access_warning_message">अनुप्रयोगांना रूट ऍक्सेसची विनंती करू देणे अतिशय धोकादायक असते आणि तुमच्या सिस्टिमच्या सुरक्षिततेशी तडजोड करू शकते!</string>
+  <string name="root_access_none">अक्षम केले</string>
+  <string name="root_access_apps">केवळ अनुप्रयोग</string>
+  <string name="root_access_adb">केवळ ADB</string>
+  <string name="root_access_all">अनुप्रयोग आणि ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">CyanogenMod आवृत्ती</string>
+  <string name="mod_version_default">अज्ञात</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">डिव्हाइस मॉडेल</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">डिव्हाइस नाव</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API लेव्हल</string>
+  <string name="mod_api_level_default">अज्ञात</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">बांधणी तारीख</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">CyanogenMod अद्यतने</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Cyanogen पुनर्प्राप्ती अद्ययावत करा</string>
+  <string name="update_recovery_summary">सिस्टिम अद्यतनांसह अद्यतने पुनर्प्राप्ती</string>
+  <string name="update_recovery_on_warning">सूचना जेव्हा हे वैशिष्ट्य सक्षम केलेले असते तेव्हा, तुमच्या स्थापित पुनर्प्राप्तीची जागा OS चालविण्याचा समावेश असलेल्या चालू आवृत्तीने घेतली जाईल.\n\nतुमच्या सिस्टिमच्या उन्नतीकरणांसह तुमची पुनर्प्राप्ती अद्यतन केली जाईल, ज्यामुळे भविष्यातील सुसंगतीची खात्री होण्यास मदत मिळेल.\n\nतुम्हाला हे वैशिष्ट्य सक्षम करायचे आहे का?</string>
+  <string name="update_recovery_off_warning">चेतावनी जेव्हा हे वैशिष्ट्य अक्षम केलेले असते तेव्हा, तुमची स्थापित पुनर्प्राप्ती OS उन्नतीकरणांसह अद्यतन केली जाणार नाही.\n\n कालबाह्य किंवा सानुकूल पुनर्प्राप्ती आवृत्तींसह भविष्यातील OS अद्यतने कदाचित स्थापित होणार नाहीत.\n\nतुम्हाला हे वैशिष्ट्य खरोखरच अक्षम करायचे आहे का?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">थीम्स</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">रिंग मोड</string>
+  <string name="ring_mode_normal">सामान्य</string>
+  <string name="ring_mode_vibrate">कंपन करा</string>
+  <string name="ring_mode_mute">निःशब्द करा</string>
+  <string name="settings_reset_button">रीसेट करा</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">सिस्टिम प्रोफाइल्स</string>
+  <string name="profiles_add">जोडा</string>
+  <string name="profile_menu_delete">हटवायचे?</string>
+  <string name="profile_settings_title">प्रोफाइल</string>
+  <string name="profile_empty_list_profiles_off">सिस्टिम प्रोफाइल्स कॉन्फिगर करण्यासाठी आणि वापरण्यासाठी, प्रोफाइल्स चालू करा.</string>
+  <string name="profile_trigger_configure">ट्रिगर कॉन्फिगर करा</string>
+  <string name="profile_write_nfc_tag">NFC टॅग वर लिहा</string>
+  <string name="profile_write_touch_tag">लिहिण्यासाठी टॅगला स्पर्श करा</string>
+  <string name="profile_write_success">टॅग यशस्वीरित्या लिहिला गेला</string>
+  <string name="profile_write_failed">टॅग लिहिणे अपयशी झाले!</string>
+  <string name="profile_selected">प्रोफाइल निवडला: %1$s</string>
+  <string name="profile_nfc_text">NFC टॅगवर प्रोफाइल लिहिल्यामुळे प्रोफाइल निवडण्यासाठी टॅग टॅप करता येतो. दुसऱ्यांदा टॅप केल्यामुळे पूर्वी निवडलेला प्रोफाइल निवडला जाईल.</string>
+  <string name="profile_unknown_nfc_tag">अज्ञात प्रोफाइल</string>
+  <string name="profile_add_nfc_text">हा NFC टॅग एका अज्ञात प्रोफाइलचा संदर्भ देतो. हा NFC टॅग विद्यमान प्रोफाइलला संलग्न केल्यामुळे तो प्रोफाइल भविष्यात निवडता येईल.</string>
+  <string name="profile_select">प्रोफाइल निवडा</string>
+  <string name="profile_remove_dialog_message">%1$s प्रोफाइल काढायचा?</string>
+  <string name="profile_populate_profile_from_state">चालू डिव्हाइस सेटिंग्जचा वापरून प्रोफाइल कॉन्फिगर करा?</string>
+  <string name="profile_menu_fill_from_state">चालू डिव्हाइस सेटिंग्ज आयात करा</string>
+  <string name="profile_remove_current_profile">चालू प्रोफाइल हटवू शकत नाही!</string>
+  <string name="profile_app_group_category_title">सूचना अधिलिखित करते</string>
+  <string name="profile_app_group_item_instructions">समूह जोडा किंवा काढा</string>
+  <string name="profile_app_group_item_instructions_summary">सूचना अधिलिखित अनुप्रयोग समूह ह्या प्रोफाइलमध्ये जोडा किंवा काढा</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">चालू</string>
+  <string name="profile_entries_off">बंद</string>
+  <string name="profile_entries_no_override">अधिलिखित नाही</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">नाव</string>
+  <string name="new_profile_name">&lt;नवीन प्रोफाइल&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">पुनर्नामित करा</string>
+  <string name="rename_dialog_message">नवीन नाव प्रविष्ठ करा</string>
+  <string name="duplicate_appgroup_name">डुप्लिकेट अनुप्रयोग समूह नाव!</string>
+  <string name="rename_dialog_hint">प्रोफाइल नाव प्रविष्ठ करा</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">रीसेट करा</string>
+  <string name="profile_reset_message">सर्व प्रयोक्ता निर्मित प्रोफाइल्स आणि अनुप्रयोग आणि समूह हटवायचे आणि त्यांना डिफॉल्टला पुनर्स्थापित करायचे?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">हे अनुप्रयोग काढायचे?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">ध्वनी अधिलिखित करतो</string>
+  <string name="connection_state_enabled">सक्षम करा</string>
+  <string name="volume_override_summary">%1$s/%2$s ला सेट करा</string>
+  <string name="profile_volume_override_checkbox_label">ध्वनी अधिलिखित करा</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">प्रोफाइल्स</string>
+  <string name="profile_profile_manage">प्रोफाइल व्यवस्थापित करा</string>
+  <string name="profile_appgroups_manage">अनुप्रयोग समूह</string>
+  <string name="profile_appgroup_manage">अनुप्रयोग समूह व्यवस्थापित करा</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">प्रोफाईल सेटिंग्ज</string>
+  <string name="profile_trigger_connect">कनेक्ट केल्यावर</string>
+  <string name="profile_trigger_disconnect">डिसकनेक्ट केल्यावर</string>
+  <string name="profile_trigger_notrigger">ट्रिगर नाही</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">सूचना मोड</string>
+  <string name="ringer_mode">रिंग मोड</string>
+  <string name="lights_mode">प्रकाश मोड</string>
+  <string name="vibrate_mode">कंपन मोड</string>
+  <string name="choose_soundtone">सूचना टोन निवडा</string>
+  <string name="choose_ringtone">रिंगटोन निवडा</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">सूचना टोन</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">अनुप्रयोग समूह</string>
+  <string name="profile_applist_title">अॅप्स</string>
+  <string name="profile_new_appgroup">नवीन अनुप्रयोग समूह</string>
+  <string name="profile_delete_appgroup">हा अनुप्रयोग समूह हटवा?</string>
+  <string name="profile_appgroup_name_prompt">नवीन अनुप्रयोग समूहासाठी एक नाव प्रविष्ठ करा</string>
+  <string name="profile_appgroup_name_title">नाव</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">अॅप निवडा</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">सिस्टीम सेटिंग्ज</string>
+  <string name="profile_lockmode_title">लॉक स्क्रीन मोड</string>
+  <string name="profile_lockmode_policy_disabled_summary">हा प्रोफाइल पर्याय एका डिव्हाइस प्रशासक धोरणाने अक्षम केलेला आहे</string>
+  <string name="profile_lockmode_insecure_summary">पिन किंवा पासवर्ड विचारू नका</string>
+  <string name="profile_lockmode_disabled_summary">लॉक स्क्रीन अक्षम करा</string>
+  <string name="profile_airplanemode_title">विमान मोड</string>
+  <string name="profile_brightness_title">स्क्रीन चकाकी</string>
+  <string name="profile_brightness_override_summary">%1$d%% ला सेट करा</string>
+  <string name="profile_brightness_override_checkbox_label">चकाकी अधिलिखित करा</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">वाय-फाय</string>
+  <string name="toggleWifiAp">पोर्टेबल वाय-फाय हॉटस्पॉट</string>
+  <string name="toggleBluetooth">ब</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">डेटा कनेक्शन</string>
+  <string name="toggleSync">डेटा स्‍वयं-सिंक करा</string>
+  <string name="toggle2g3g4g">प्राधान्‍यकृत नेटवर्क प्रकार</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi प्रदेश कोड</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fiसाठी प्रदेश कोड नमूद करा</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">प्रदेश कोड सेट करण्यात समस्या आली.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">हटवायचे?</string>
+  <string name="profile_action_none">न बदलले ठेवा</string>
+  <string name="profile_action_system">सिस्टम डीफॉल्ट</string>
+  <string name="profile_action_disable">बंद करा</string>
+  <string name="profile_action_enable">चालू करा</string>
+  <string name="profile_trigger_a2dp_connect">A2DP कनेक्ट केल्यावर</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DP डिसकनेक्ट केल्यावर</string>
+  <string name="profile_tabs_wifi">वाय-फाय</string>
+  <string name="profile_tabs_bluetooth">ब</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ट्रिगर होतो ज्यामुळे हा प्रोफाइल सक्रिय होईल</string>
+  <string name="profile_setup_setup_triggers_title">पायरी 1: ट्रिगर्स जोडा</string>
+  <string name="profile_setup_setup_triggers_title_config">ट्रिगर्स सुधारित करा: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">पायरी 2: क्रिया सेटअप करा</string>
+  <string name="profile_setup_actions_title_config">क्रिया कॉन्फिगर करा</string>
+  <string name="profile_appgroups_manage">अनुप्रयोग समूह</string>
+  <string name="profile_appgroup_manage">अनुप्रयोग समूह व्यवस्थापित करा</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">अनुप्रयोग समूह</string>
+  <string name="profile_new_appgroup">नवीन अनुप्रयोग समूह</string>
+  <string name="profile_delete_appgroup">हा अनुप्रयोग समूह हटवा?</string>
+  <string name="profile_appgroup_name_prompt">नवीन अनुप्रयोग समूहासाठी एक नाव प्रविष्ठ करा</string>
+  <string name="profile_appgroup_name_title">नाव</string>
+  <string name="duplicate_appgroup_name">डुप्लिकेट अनुप्रयोग समूह नाव!</string>
+  <string name="profile_app_delete_confirm">हे अनुप्रयोग काढायचे?</string>
+  <string name="no_bluetooth_triggers">कोणत्याही Bluetooth डिव्हाइसेसची जोडी जुळलेली नाही.\nट्रिगर्स कॉन्फिगर करण्यापूर्वी Bluetooth डिव्हाइसची जोडी जुळवण्यासाठी टॅप करा.</string>
+  <string name="no_wifi_triggers">कोणतेही Wi\u2011Fi ऍक्सेस बिंदू कॉन्फिगर केलेले नाहीत.\nट्रिगर्स कॉन्फिगर करण्यापूर्वी Wi\u2011Fi  कनेक्ट करण्यासाठी टॅप करा.</string>
+  <string name="no_triggers_configured">कोणतेही ट्रिगर्स कॉन्फिगर केलेले नाहीत. अधिक जोडण्यासाठी टॅप करा</string>
+  <string name="no_triggers_configured_nfc">एक नवीन NFC ट्रिगर सेटअप करण्यासाठी टॅप करा.</string>
+  <string name="profile_setup_setup_triggers_description">कृपया असे ट्रिगर्स निवडा जे हा प्रोफाइल सक्रिय करतील</string>
+  <string name="profile_setup_actions_description">प्रोफाइल सक्रिय केल्यावर काय घडते ते आता कॉन्फिगर करा</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">नेव्हिगेशन बार</string>
+  <string name="navigation_bar_left_title">डाव्या हाताचा मोड</string>
+  <string name="navigation_bar_left_summary">लँडस्केप मोडमध्ये नेव्हिगेशन बार स्क्रीनच्या डावीकडे ठेवा</string>
+  <string name="navigation_bar_title">बटणे आणि मांडणी</string>
+  <string name="navigation_bar_help_text">सुरुवात करण्यासाठी संपादनासाठी नेव्हिगेशन बार अनलॉक करण्यासाठी संपादन प्रतीक टॅप करा.\n\nएखाद्या प्रतीकाचा शॉर्टकट बदलण्यासाठी तुम्ही ते टॅप करू शकता किंवा मांडणीची पुनर्मांडणी करण्यासाठी एखादे प्रतीक दीर्घ दाबू शकता.\n\nतुमचे बदल कमिट करण्यासाठी \'जतन करा\' किंवा मांडणीला डिफॉल्ट सेटिंग्जना रीसेट करण्यासाठी \'डिफॉल्ट पुनर्स्थापित करा\' टॅप करा.</string>
+  <string name="navigation_restore_button_text">पुनर्स्थापित करा\nडिफॉल्ट्स</string>
+  <string name="navigation_edit_button_text">संपादित करा</string>
+  <string name="navigation_save_button_text">जतन करा</string>
+  <string name="navigation_bar_reset_message">चालू सेटिंग्ज हटवायची आणि डिफॉल्ट मांडणी पुनर्स्थापित करायची?</string>
+  <string name="navigation_bar_arrow_keys_title">टाईप करताना बाणाच्या की दर्शवा</string>
+  <string name="navigation_bar_arrow_keys_summary">टाईप करताना डावी आणि उजवी कर्सर बटणे प्रदर्शित करा. IME स्विचर अधिलिखित करा.</string>
+  <string name="navigation_bar_recents_title">अलीकडील दीर्घ दाबणे क्रिया</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">प्रकाश सेटिंग्ज संपादित करा</string>
+  <string name="pulse_speed_title">पल्स लांबी आणि वेग</string>
+  <string name="default_time">सामान्य</string>
+  <string name="custom_time">सानुकूल</string>
+  <string name="dialog_delete_title">हटवायचे?</string>
+  <string name="dialog_delete_message">निवडलेले घटक काढायचे?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">नेहमी चालू</string>
+  <string name="pulse_length_very_short">खूप अल्प</string>
+  <string name="pulse_length_short">लहान</string>
+  <string name="pulse_length_normal">सामान्य</string>
+  <string name="pulse_length_long">दीर्घ</string>
+  <string name="pulse_length_very_long">खूप दीर्घ</string>
+  <string name="pulse_speed_very_fast">खूप जलद</string>
+  <string name="pulse_speed_fast">जलद</string>
+  <string name="pulse_speed_normal">सामान्य</string>
+  <string name="pulse_speed_slow">धीमे</string>
+  <string name="pulse_speed_very_slow">खूप धीमे</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">बॅटरी प्रकाश</string>
+  <string name="battery_low_pulse_title">बॅटरी कमी असल्यास पल्स करा</string>
+  <string name="battery_light_list_title">रंग</string>
+  <string name="battery_light_low_color_title">बॅटरी कमी</string>
+  <string name="battery_light_medium_color_title">चार्ज होत आहे</string>
+  <string name="battery_light_full_color_title">पूर्णपणे चार्ज झालेली</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">सूचना प्रकाश</string>
+  <string name="notification_light_general_title">सामान्य</string>
+  <string name="notification_light_applist_title">अॅप्स</string>
+  <string name="notification_light_phonelist_title">फोन</string>
+  <string name="notification_light_use_custom">सानुकूल मूल्ये वापरा</string>
+  <string name="notification_light_default_value">डीफॉल्ट</string>
+  <string name="notification_light_missed_call_title">सुटलेला कॉल</string>
+  <string name="notification_light_voicemail_title">व्हॉइसमेल</string>
+  <string name="notification_light_screen_on">स्क्रीन चालू असताना प्रकाशतो</string>
+  <string name="notification_light_zen_mode">Do Not Disturb मोडमध्ये लाइट्स</string>
+  <string name="notification_light_use_multiple_leds">अनेक LEDs</string>
+  <string name="keywords_lights_brightness_level">लेड्स चकाकी मंदावते</string>
+  <string name="notification_light_automagic">ऑटोमॅटीकली रंग निवडा</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">प्रकाश सेटिंग्ज</string>
+  <string name="led_notification_text">सेटिंग्जद्वारे LED प्रकाश सक्षम केला</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Android डिबगिंग</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">Android डिबग ब्रिज (adb) इंटरफेस सक्षम करा</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">नेटवर्कवर ADB</string>
+  <string name="adb_over_network_summary">नेटवर्क इंटरफेसेसवर TCP/IP डिबगिंग सक्षम करा (Wi\u2011Fi, USB नेटवर्क्स). रीबूट केल्यावर हे सेटिंग रीसेट केले जाते</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">चेतावनी जेव्हा नेटवर्कवर ADB सक्षम केलेले असते तेव्हा, तुमचा फोन सर्व कनेक्ट केलेल्या नेटवर्क्सवर घुसखोरीसाठी तयार असतो!\n\nजेव्हा तुम्ही विश्वसनीय नेटवर्क्सवर कनेक्टेड असाल तेव्हाच केवळ हे वैशिष्ट्य वापरा.\n\nतुम्हाला हे कार्य खरोखरच सक्षम करायचे आहे का?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">डिबगिंग सूचित करा</string>
+  <string name="adb_notify_summary">जेव्हा USB किंवा नेटवर्क डिबगिंग सक्षम केलेले असते तेव्हा सूचना प्रदर्शित करा</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">स्थान</string>
+  <string name="app_ops_categories_personal">वैयक्तिक</string>
+  <string name="app_ops_categories_messaging">संदेशन</string>
+  <string name="app_ops_categories_media">मीडिया</string>
+  <string name="app_ops_categories_device">डिव्हाइस</string>
+  <string name="app_ops_categories_bootup">बूटअप</string>
+  <string name="app_ops_categories_su">रूट ऍक्सेस</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">खडबडीत स्थान</string>
+  <string name="app_ops_summaries_fine_location">उत्कृष्ट स्थान</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">कंपन करा</string>
+  <string name="app_ops_summaries_read_contacts">संपर्क वाचा</string>
+  <string name="app_ops_summaries_modify_contacts">संपर्क सुधारित करा</string>
+  <string name="app_ops_summaries_read_call_log">कॉल लॉग वाचा</string>
+  <string name="app_ops_summaries_modify_call_log">कॉल लॉग सुधारित करा</string>
+  <string name="app_ops_summaries_read_calendar">कॅलेंडर वाचा</string>
+  <string name="app_ops_summaries_modify_calendar">कॅलेंडर सुधारित करा</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi स्कॅन</string>
+  <string name="app_ops_summaries_notification">सूचना/टोस्ट</string>
+  <string name="app_ops_summaries_cell_scan">सेल स्कॅन</string>
+  <string name="app_ops_summaries_call_phone">फोनवर कॉल करा</string>
+  <string name="app_ops_summaries_read_sms">SMS वाचा</string>
+  <string name="app_ops_summaries_write_sms">SMS लिहा</string>
+  <string name="app_ops_summaries_receive_sms">SMS प्राप्त करा</string>
+  <string name="app_ops_summaries_receive_emergency_sms">आणीबाणी SMS प्राप्त करा</string>
+  <string name="app_ops_summaries_receive_mms">MMS प्राप्त करा</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP पुश प्राप्त करा</string>
+  <string name="app_ops_summaries_send_sms">SMS पाठवा</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS वाचा</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS लिहा</string>
+  <string name="app_ops_summaries_modify_settings">सेटिंग्ज सुधारित करा</string>
+  <string name="app_ops_summaries_draw_on_top">शीर्षस्थानी रेखांकित करा</string>
+  <string name="app_ops_summaries_access_notifications">प्रवेश सूचना</string>
+  <string name="app_ops_summaries_camera">कॅमेरा</string>
+  <string name="app_ops_summaries_record_audio">ऑडिओ रेकॉर्ड करा</string>
+  <string name="app_ops_summaries_play_audio">ऑडिओ प्ले करा</string>
+  <string name="app_ops_summaries_read_clipboard">क्लिपबोर्ड वाचा</string>
+  <string name="app_ops_summaries_modify_clipboard">क्लिपबोर्ड सुधारित करा</string>
+  <string name="app_ops_summaries_media_buttons">मीडिया बटण</string>
+  <string name="app_ops_summaries_audio_focus">ऑडिओ फोकस</string>
+  <string name="app_ops_summaries_master_volume">प्रमुख व्हॉल्यूम</string>
+  <string name="app_ops_summaries_voice_volume">व्हॉईस व्हॉल्यूम</string>
+  <string name="app_ops_summaries_ring_volume">रिंग ध्वनी</string>
+  <string name="app_ops_summaries_media_volume">मीडिया ध्वनी</string>
+  <string name="app_ops_summaries_alarm_volume">अलार्म ध्वनी</string>
+  <string name="app_ops_summaries_notification_volume">सूचना ध्वनी</string>
+  <string name="app_ops_summaries_bluetooth_volume">ब्लूटुथ ध्वनी</string>
+  <string name="app_ops_summaries_keep_awake">सक्रिय ठेवा</string>
+  <string name="app_ops_summaries_monitor_location">स्थानाचे परीक्षण करा</string>
+  <string name="app_ops_summaries_monitor_high_power_location">उच्च उर्जा स्थानाचे परीक्षण करा</string>
+  <string name="app_ops_summaries_get_usage_stats">वापर आकडेवारी मिळवा</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">मायक्रोफोन निःशब्द/सशब्द करा</string>
+  <string name="app_ops_summaries_toast_window">टोस्ट्स प्रदर्शित करा</string>
+  <string name="app_ops_summaries_project_media">प्रोजेक्‍ट मीडिया</string>
+  <string name="app_ops_summaries_activate_vpn">VPN सक्रिय करा</string>
+  <string name="app_ops_summaries_write_wallpaper">वॉलपेपर लिहा</string>
+  <string name="app_ops_summaries_assist_structure">सहाय्य रचना</string>
+  <string name="app_ops_summaries_assist_screenshot">सहाय्य स्क्रीनशॉट</string>
+  <string name="app_ops_summaries_read_phone_state">फोन आकडेवारी वाचा</string>
+  <string name="app_ops_summaries_add_voicemail">व्हॉइसमेल जोडा</string>
+  <string name="app_ops_summaries_use_sip">SIP वापरा</string>
+  <string name="app_ops_summaries_make_call">कॉल करा</string>
+  <string name="app_ops_summaries_use_fingerprint">बोटाचा ठसा वापरा</string>
+  <string name="app_ops_summaries_use_body_sensors">शरीर सेन्सर्स वापरा</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">सेल ब्रॉडकास्ट्स वाचा</string>
+  <string name="app_ops_summaries_mock_location">खोटे स्थान</string>
+  <string name="app_ops_summaries_read_external_storage">बाह्य संग्रह वाचा</string>
+  <string name="app_ops_summaries_write_external_storage">बाह्य संचयनावर लिहा</string>
+  <string name="app_ops_summaries_turn_screen_on">स्क्रीन चालू करा</string>
+  <string name="app_ops_summaries_get_accounts">खाती मिळवा</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi टॉगल करा</string>
+  <string name="app_ops_summaries_toggle_bluetooth">Bluetooth टॉगल करा</string>
+  <string name="app_ops_summaries_start_at_boot">बूटला सुरू करा</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC टॉगल करा</string>
+  <string name="app_ops_summaries_toggle_mobile_data">मोबाईल डेटा टॉगल करा</string>
+  <string name="app_ops_summaries_superuser">रूट ऍक्सेस</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">खडबडीत स्थान</string>
+  <string name="app_ops_labels_fine_location">उत्कृष्ट स्थान</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">कंपन करा</string>
+  <string name="app_ops_labels_read_contacts">संपर्क वाचा</string>
+  <string name="app_ops_labels_modify_contacts">संपर्क सुधारित करा</string>
+  <string name="app_ops_labels_read_call_log">कॉल लॉग वाचा</string>
+  <string name="app_ops_labels_modify_call_log">कॉल लॉग सुधारित करा</string>
+  <string name="app_ops_labels_read_calendar">दिनदर्शिका वाचा</string>
+  <string name="app_ops_labels_modify_calendar">दिनदर्शिका सुधारित करा</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi स्कॅन</string>
+  <string name="app_ops_labels_notification">सूचना/टोस्ट</string>
+  <string name="app_ops_labels_cell_scan">सेल स्कॅन</string>
+  <string name="app_ops_labels_call_phone">फोनवर कॉल करा</string>
+  <string name="app_ops_labels_read_sms">SMS वाचा</string>
+  <string name="app_ops_labels_write_sms">SMS लिहा</string>
+  <string name="app_ops_labels_receive_sms">SMS प्राप्त करा</string>
+  <string name="app_ops_labels_receive_emergency_sms">आणीबाणी SMS प्राप्त करा</string>
+  <string name="app_ops_labels_receive_mms">MMS प्राप्त करा</string>
+  <string name="app_ops_labels_receive_wap_push">WAP पुश प्राप्त करा</string>
+  <string name="app_ops_labels_send_sms">SMS पाठवा</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS वाचा</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS लिहा</string>
+  <string name="app_ops_labels_modify_settings">सेटिंग्ज सुधारित करा</string>
+  <string name="app_ops_labels_draw_on_top">शीर्षस्थानी ड्रॉ करा</string>
+  <string name="app_ops_labels_access_notifications">ऍक्सेस सूचना</string>
+  <string name="app_ops_labels_camera">कॅमेरा</string>
+  <string name="app_ops_labels_record_audio">ऑडिओ रेकॉर्ड करा</string>
+  <string name="app_ops_labels_play_audio">ऑडिओ प्ले करा</string>
+  <string name="app_ops_labels_read_clipboard">क्लिपबोर्ड वाचा</string>
+  <string name="app_ops_labels_modify_clipboard">क्लिपबोर्ड सुधारित करा</string>
+  <string name="app_ops_labels_media_buttons">मीडिया बटणे</string>
+  <string name="app_ops_labels_audio_focus">ऑडिओ फोकस</string>
+  <string name="app_ops_labels_master_volume">प्रमुख ध्वनी</string>
+  <string name="app_ops_labels_voice_volume">आवाज व्हॉल्यूम</string>
+  <string name="app_ops_labels_ring_volume">रिंग व्हॉल्यूम</string>
+  <string name="app_ops_labels_media_volume">मीडिया व्हॉल्यूम</string>
+  <string name="app_ops_labels_alarm_volume">अलार्म व्हॉल्यूम</string>
+  <string name="app_ops_labels_notification_volume">सूचना व्हॉल्यूम</string>
+  <string name="app_ops_labels_bluetooth_volume">ब्लूटुथ व्हॉल्यूम</string>
+  <string name="app_ops_labels_keep_awake">सक्रिय ठेवा</string>
+  <string name="app_ops_labels_monitor_location">स्थानावर देखरेख करा</string>
+  <string name="app_ops_labels_monitor_high_power_location">उच्च उर्जा स्थानाचे परीक्षण करा</string>
+  <string name="app_ops_labels_get_usage_stats">वापर आकडेवारी मिळवा</string>
+  <string name="app_ops_labels_mute_unmute_microphone">मायक्रोफोन निःशब्द/सशब्द करा</string>
+  <string name="app_ops_labels_toast_window">टोस्ट्स प्रदर्शित करा</string>
+  <string name="app_ops_labels_project_media">मीडिया प्रॉजेक्ट करा</string>
+  <string name="app_ops_labels_activate_vpn">VPN सक्रिय करा</string>
+  <string name="app_ops_labels_write_wallpaper">वॉलपेपर लिहा</string>
+  <string name="app_ops_labels_assist_structure">सहाय्य रचना</string>
+  <string name="app_ops_labels_assist_screenshot">सहाय्य स्क्रीनशॉट</string>
+  <string name="app_ops_labels_read_phone_state">फोन आकडेवारी वाचा</string>
+  <string name="app_ops_labels_add_voicemail">व्हॉइसमेल जोडा</string>
+  <string name="app_ops_labels_use_sip">SIP वापरा</string>
+  <string name="app_ops_labels_make_call">कॉल करा</string>
+  <string name="app_ops_labels_use_fingerprint">बोटाचा ठसा वापरा</string>
+  <string name="app_ops_labels_use_body_sensors">शरीर सेन्सर्स वापरा</string>
+  <string name="app_ops_labels_read_cell_broadcasts">सेल ब्रॉडकास्ट्स वाचा</string>
+  <string name="app_ops_labels_mock_location">खोटे स्थान</string>
+  <string name="app_ops_labels_read_external_storage">बाह्य संग्रह वाचा</string>
+  <string name="app_ops_labels_write_external_storage">बाह्य संचयनावर लिहा</string>
+  <string name="app_ops_labels_turn_screen_on">स्क्रीन चालू करा</string>
+  <string name="app_ops_labels_get_accounts">खाती मिळवा</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi टॉगल करा</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bluetooth टॉगल करा</string>
+  <string name="app_ops_labels_start_at_boot">बूटला सुरू करा</string>
+  <string name="app_ops_labels_toggle_nfc">NFC टॉगल करा</string>
+  <string name="app_ops_labels_toggle_mobile_data">मोबाईल डेटा टॉगल करा</string>
+  <string name="app_ops_labels_superuser">रूट ऍक्सेस</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">अनुमती दिली</string>
+  <string name="app_ops_permissions_ignored">दुर्लक्षिलेले</string>
+  <string name="app_ops_permissions_always_ask">नेहमी विचारा</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (वापरले <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">परवानगी असलेले <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">नाकारलेले <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">परवानगी असलेले <xliff:g id="count">%1$s</xliff:g>, नाकारलेले <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">प्रयोक्ता अनुप्रयोग दर्शवा</string>
+  <string name="app_ops_show_system_apps">अंगभूत अनुप्रयोग दर्शवा</string>
+  <string name="app_ops_reset_counters">परवानगी द्या/नाकारा काउंटर्स रीसेट करा</string>
+  <string name="app_ops_reset_confirm_title">काउंटर्सच्या रीसेटची पुष्टी करा</string>
+  <string name="app_ops_reset_confirm_mesg">तुम्हाला नक्की काउंटर्स रीसेट करायचे आहेत का?</string>
+  <string name="ok">ठीक आहे</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">डिव्हाइस होस्टनाव</string>
+  <string name="unlock_scramble_pin_layout_title">मांडणी स्क्रॅम्बल करा</string>
+  <string name="unlock_scramble_pin_layout_summary">डिव्हाइस अनलॉक करताना पिन मांडणी स्क्रॅम्बल करा</string>
+  <string name="button_pref_title">बटणे</string>
+  <string name="hardware_keys_power_key_title">पॉवर बटण</string>
+  <string name="hardware_keys_home_key_title">होम बटण</string>
+  <string name="hardware_keys_back_key_title">मागे बटण</string>
+  <string name="hardware_keys_menu_key_title">मेनू बटण</string>
+  <string name="hardware_keys_assist_key_title">शोध बटण</string>
+  <string name="hardware_keys_appswitch_key_title">अलीकडील बटण</string>
+  <string name="hardware_keys_camera_key_title">कॅमेरा बटण</string>
+  <string name="hardware_keys_volume_keys_title">व्हॉल्यूम बटणे</string>
+  <string name="hardware_keys_short_press_title">अल्प दाब क्रिया</string>
+  <string name="hardware_keys_long_press_title">दीर्घ दाब क्रिया</string>
+  <string name="hardware_keys_double_tap_title">दुहेरी टॅप क्रिया</string>
+  <string name="hardware_keys_action_nothing">क्रिया नाही</string>
+  <string name="hardware_keys_action_menu">मेनू उघडा/बंद करा</string>
+  <string name="hardware_keys_action_app_switch">अलीकडील अनुप्रयोग स्विचर</string>
+  <string name="hardware_keys_action_search">शोध सहाय्यक</string>
+  <string name="hardware_keys_action_voice_search">व्हॉइस शोध</string>
+  <string name="hardware_keys_action_in_app_search">इन-अनुप्रयोग शोध</string>
+  <string name="hardware_keys_action_launch_camera">कॅमेरा सुरू करा</string>
+  <string name="hardware_keys_action_sleep">स्क्रीन बंद करा</string>
+  <string name="hardware_keys_action_last_app">शेवटचा अनुप्रयोग</string>
+  <string name="camera_sleep_on_release_title">स्क्रीन पीक</string>
+  <string name="camera_sleep_on_release_summary">अर्धा दाब स्क्रीनला केवळ तोपर्यंतच चालू ठेवेल जोपर्यंत बटण दाबून ठेवलेले असेल</string>
+  <string name="camera_launch_title">कॅमेरा सुरू करा</string>
+  <string name="camera_launch_summary">दीर्घदाब आणि सोडण्यामुळे कॅमेरा सुरू होईल</string>
+  <string name="volbtn_music_controls_title">प्लेबॅक नियंत्रण</string>
+  <string name="volbtn_music_controls_summary">जेव्हा स्क्रीन बंद असतो तेव्हा, ध्वनी की दीर्घ दाबल्यामुळे संगीत ट्रॅक्स सापडतील</string>
+  <string name="volbtn_cursor_control_title">कीबोर्ड कर्सर नियंत्रण</string>
+  <string name="volbtn_cursor_control_off">अक्षम केले</string>
+  <string name="volbtn_cursor_control_on">ध्वनी वर/खाली कर्सरला डावीकडे/उजवीकडे हलवतो</string>
+  <string name="volbtn_cursor_control_on_reverse">ध्वनी वर/खाली कर्सरला उजवीकडे/डावीकडे हलवतो</string>
+  <string name="power_end_call_title">कॉल समाप्त करा</string>
+  <string name="power_end_call_summary">पॉवर बटण दाबल्याने चालू कॉल समाप्त होईल</string>
+  <string name="swap_volume_buttons_title">पुनःअभिमुख करा</string>
+  <string name="swap_volume_buttons_summary">स्क्रीन फिरवलेला असताना ध्वनी बटणे स्वॅप करा</string>
+  <string name="button_wake_title">डिव्हाइसला जागे करा</string>
+  <string name="home_answer_call_title">कॉलला उत्तर द्या</string>
+  <string name="home_answer_call_summary">होम बटण दाबल्याने चालू येणाऱ्या कॉलला उत्तर दिले जाईल</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">अनुकूली पार्श्वप्रकाश</string>
+  <string name="adaptive_backlight_summary">वापरयोग्यता राखताना बॅटरी आयु सर्वाधिक राहावे यासाठी गतीशीलरित्या प्रदर्शनाच्या पार्श्वप्रकाशाची चकाकी समायोजित करा</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">सूर्यप्रकाश संवर्धन</string>
+  <string name="sunlight_enhancement_summary">प्रदर्शन चकाकी आणि वाचनीयता प्रखर सूर्यप्रकाशामध्ये संवर्धित करा</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">रंग संवर्धन</string>
+  <string name="color_enhancement_summary">प्रदर्शनाचा रंग गतीशीलरित्या संवर्धित करा</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">पार्श्वप्रकाश</string>
+  <string name="button_backlight_enabled">बटणे प्रकाशमान करा</string>
+  <string name="keyboard_backlight_enabled">कीबोर्ड प्रकाशमान करा</string>
+  <string name="button_backlight_seekbar_title">बटण चकाकी</string>
+  <string name="keyboard_backlight_seekbar_title">कीबोर्ड चकाकी</string>
+  <string name="backlight_timeout_title">प्रकाशमान करण्याचा वेळ संपला</string>
+  <string name="backlight_timeout_unlimited">बंद करू नका</string>
+  <string name="backlight_summary_disabled">अक्षम केले</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g> साठी सक्षम केले</string>
+  <string name="backlight_summary_enabled">सक्षम केले</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">जेश्चर्स</string>
   <!-- Power menu -->
+  <string name="power_menu_title">पॉवर मेनू</string>
+  <string name="power_menu_reboot_title">मेनू रीबूट करा</string>
+  <string name="power_menu_screenshot_title">स्क्रीनशॉट</string>
+  <string name="power_menu_airplane_title">विमान मोड</string>
+  <string name="power_menu_users_title">प्रयोक्ता स्विचर</string>
+  <string name="power_menu_settings_title">सेटिंग्ज शॉर्टकट</string>
+  <string name="power_menu_lockdown_title">डिव्हाइस लॉकडाउन</string>
+  <string name="power_menu_bug_report_title">दोष अहवाल</string>
+  <string name="power_menu_sound_title">ध्वनी पॅनेल</string>
+  <string name="power_menu_bug_report_disabled">विकास सेटिंग्जमध्ये बग अहवाल देणे अक्षम केलेले आहे</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">ऑन-स्क्रीन nav बार सक्षम करा</string>
+  <string name="disable_navkeys_summary">ऑन-स्क्रीन नेव्हिगेशन बार सक्षम करा आणि हार्डवेअर बटणे अक्षम करा</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">झोपेसाठी दुहेरी-टॅप करा</string>
+  <string name="double_tap_to_sleep_summary">प्रदर्शन बंद करण्यासाठी स्थिती बारवर दुहेरी-टॅप करा</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">अपघाताने जागे करण्यास प्रतिबंध करा</string>
+  <string name="proximity_wake_summary">स्क्रीनला जागे करण्यापूर्वी प्रॉक्सिमिटी सेन्सर तपासा</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">जागे व्हा प्लग</string>
+  <string name="wake_when_plugged_or_unplugged_summary">पॉवर स्त्रोत कनेक्ट किंवा डिस्कनेक्ट करताना हा स्क्रीन चालू करा</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">नमुना</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">ध्वनी समायोजन ध्वनी</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">कंपन तीव्रता</string>
+  <string name="vibrator_warning">%1$d पेक्षा उच्च मूल्यांची शिफारस केली जात नाही</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">रंग कॅलिब्रेशन</string>
+  <string name="color_calibration_summary">ऑन-स्क्रीन रंग कॅलिब्रेट करा</string>
+  <string name="color_red_title">लाल</string>
+  <string name="color_green_title">हिरवा</string>
+  <string name="color_blue_title">निळा</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">गामा कॅलिब्रेशन</string>
+  <string name="gamma_tuning_summary_head">ट्वीक गामा मूल्ये</string>
+  <string name="gamma_tuning_control_set_header">समूह <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">तीव्रता</string>
+  <string name="gamma_tuning_brightness">चकाकी</string>
+  <string name="gamma_tuning_saturation">संपृक्तता</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">संगीत अनुप्रयोग सुरू करा</string>
+  <string name="headset_connect_player_summary">जेव्हा हेडसेट कनेक्ट केलेला असेल तेव्हा डिफॉल्ट संगीत अनुप्रयोग सुरू करा</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">स्वयंचलित प्राधान्य</string>
+  <string name="auto_brightness_reset_button">रीसेट करा</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">फिरवणे</string>
+  <string name="display_rotation_disabled">अक्षम केले</string>
+  <string name="display_rotation_unit">अंश</string>
+  <string name="display_lockscreen_rotation_title">लॉक स्क्रीन फिरवा</string>
+  <string name="display_rotation_category_title">परिभ्रमण मोड्स</string>
+  <string name="display_rotation_0_title">0 अंश</string>
+  <string name="display_rotation_90_title">90 अंश</string>
+  <string name="display_rotation_180_title">180 अंश</string>
+  <string name="display_rotation_270_title">270 अंश</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">स्क्रीन रंग</string>
+  <string name="screencolor_summary">स्क्रीन रंगछटा, संपृक्तता, वैधर्म्य किंवा तीव्रता</string>
+  <string name="custom_screencolor">स्क्रीन रंग सानुकूल करा</string>
+  <string name="screencolor_save">जतन करा</string>
+  <string name="screencolor_cancel">रद्द करा</string>
+  <string name="restore_preview">डिफॉल्ट चित्र पाहा</string>
+  <string name="selectnewfile_menu">गॅलरीतून नवीन चित्र पाहा</string>
+  <string name="selectfile_menu">गॅलरीतून चित्र पाहा</string>
+  <string name="restore_default_str">रीसेट करा</string>
+  <string name="hue_str">रंगछटा: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">संपृक्तता: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">वैधर्म्य: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">वाचनीयता सुधारण्यासाठी आणि डोळ्यांवरील ताण कमी करण्यासाठी दिवसाची वेळ आणि आसपासची स्थिती यानुसार तुमचा स्क्रीन अनुकूल करा</string>
+  <string name="live_display_mode">प्रदर्शन मोड</string>
+  <string name="live_display_color_temperature_title">रंग तापमान</string>
+  <string name="live_display_color_temperature_summary">दिवस: <xliff:g id="day_temperature">%1$d</xliff:g>K  रात्र: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">दिवस</string>
+  <string name="live_display_night">रात्र</string>
+  <string name="live_display_outdoor_mode_title">स्वयंचलित आऊटडोअर मोड</string>
+  <string name="live_display_outdoor_mode_summary">तीव्र सूर्यप्रकाशात चकाकी आणि संपृक्तता स्वयंचलितपणे वाढवा</string>
+  <string name="live_display_low_power_title">पॉवर वापर कमी करा</string>
+  <string name="live_display_low_power_summary">डीग्रेड न करता कमी पॉवर वापरासाठी प्रदर्शन समायोजित करा</string>
+  <string name="live_display_enhance_color_title">रंग संवर्धित करा</string>
+  <string name="live_display_enhance_color_summary">फ्लेश टोन्स, देखावा आणि इतर प्रतिमांसाठी रंग व्हायब्रन्स सुधारित करा</string>
+  <string name="live_display_color_profile_title">रंग प्रोफाइल</string>
+  <string name="live_display_color_profile_standard_title">मानक</string>
+  <string name="live_display_color_profile_standard_summary">अचूक रंग आणि चमकदार पांढरे</string>
+  <string name="live_display_color_profile_natural_title">नैसर्गिक</string>
+  <string name="live_display_color_profile_natural_summary">वास्तववादी रंग आणि फ्लेश टोन्स</string>
+  <string name="live_display_color_profile_dynamic_title">गतीशील</string>
+  <string name="live_display_color_profile_dynamic_summary">संवर्धित रंग आणि चमकदार पांढरे</string>
+  <string name="live_display_color_profile_cinema_title">सिनेमा</string>
+  <string name="live_display_color_profile_cinema_summary">व्हिडिओसाठी अचूक रंग पुनरुत्पादन</string>
+  <string name="live_display_color_profile_astronomy_title">खगोलशास्त्र</string>
+  <string name="live_display_color_profile_astronomy_summary">रात्रीची दृष्टी टिकविण्यासाठी गहिरा लाल</string>
+  <string name="live_display_color_profile_photography_title">छायाचित्रण</string>
+  <string name="live_display_color_profile_photography_summary">फोटोंसाठी अचूर रंग पुनरुत्पादन</string>
+  <string name="live_display_color_profile_basic_title">मुलभूत</string>
+  <string name="live_display_color_profile_basic_summary">कॅलिब्रेट न केलेले प्रदर्शन वापरा</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">निवडणारे प्रतीक</string>
+  <string name="ime_switcher_notify_summary">इनपुट पध्दत निवडणारे प्रतीक प्रदर्शित करा</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">हेड्स अप</string>
+  <string name="summary_heads_up_enabled">पॉप-अप सूचना सक्षम केल्या गेल्या</string>
+  <string name="summary_heads_up_disabled">पॉप-अप सूचना अक्षम केल्या गेल्या</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">सर्व फाइल प्रकार स्वीकारा</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">उच्च स्पर्श संवेदनक्षमता</string>
+  <string name="high_touch_sensitivity_summary">टचस्क्रीन संवेदनक्षमता वाढवा म्हणजे ग्लोव्ज घातलेले असताना ती वापरता येईल</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD घनता</string>
+  <string name="dialog_title_lcd_density">LCD घनता</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (डिफॉल्ट)</string>
+  <string name="restarting_ui">पुन्हा सुरू करत आहे UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">स्टायलस वापरताना प्रतीक दर्शवा</string>
+  <string name="stylus_icon_enabled_summary">स्टायलससह हॉवरिंग किंवा रेखाटन करताना स्टायलस दर्शवा</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">स्टायलस जेश्चर्स</string>
+  <string name="category_spen_title">स्टायलस जेश्चर्स</string>
+  <string name="enable_subcat_title">स्टायलस</string>
+  <string name="enable_spen_title_head">जेश्चर्स सक्षम करा</string>
+  <string name="enable_spen_summary_head">स्टायलस बटण खाली दाबून स्वाईप जेश्चर्स वापरा</string>
+  <string name="gestures_subcat_title">जेश्चर्स</string>
+  <string name="gestures_left_spen_title_head">डावे स्वाईप</string>
+  <string name="gestures_right_spen_title_head">उजवे स्वाईप</string>
+  <string name="gestures_up_spen_title_head">वर स्वाईप</string>
+  <string name="gestures_down_spen_title_head">खाली स्वाईप</string>
+  <string name="gestures_long_spen_title_head">दीर्घ दाबणे</string>
+  <string name="gestures_double_spen_title_head">दुहेरी टॅप</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">क्रिया नाही</string>
+  <string name="gestures_action_home">मुख्‍यपृष्‍ठ</string>
+  <string name="gestures_action_back">परत</string>
+  <string name="gestures_action_menu">मेनू</string>
+  <string name="gestures_action_search">शोध चालू करा</string>
+  <string name="gestures_action_recent">अलीकडील अनुप्रयोग</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s स्थापित केलेले नाही</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">टचस्क्रीन हॉवरिंग</string>
+  <string name="touchscreen_hovering_summary">वेब ब्राउझर्स, दूरस्थ डेस्कटॉप्स इ. मध्ये तुम्हाला माउसप्रमाणे स्क्रीनवर हॉवर करू देते</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">रिंग ध्वनी वाढवणे</string>
+  <string name="increasing_ring_min_volume_title">प्रारंभ ध्वनी</string>
+  <string name="increasing_ring_ramp_up_time_title">रॅम्प-अप वेळ</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS सहाय्यक डेटा डाउनलोड</string>
+  <string name="lto_download_data_wifi_only_on">कोणत्याही नेटवर्क्सवर</string>
+  <string name="lto_download_data_wifi_only_off">फक्त Wi\u2011Fi  नेटवर्क्सवर</string>
+  <string name="volume_keys_control_ring_stream_title">रींग टोन ध्वनी नियंत्रित करा</string>
+  <string name="volume_keys_control_ring_stream_summary_on">ध्वनी की रींग टोन ध्वनी नियंत्रित करतात</string>
+  <string name="volume_keys_control_ring_stream_summary_off">ध्वनी की मिडिया ध्वनी नियंत्रित करतात</string>
+  <string name="category_calibration">कॅलिब्रेशन</string>
+  <string name="display_and_lights">प्रदर्शन आणि प्रकाश</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">चार्जिंग ध्वनी</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">सक्षम करा</string>
+  <string name="power_notifications_enable_summary">पॉवर स्त्रोत कनेक्ट किंवा डिस्कनेक्ट करताना ध्वनी प्ले करा</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">कंपन करा</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">सूचना ध्वनी</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">मूक</string>
   <!-- Status bar -->
+  <string name="status_bar_title">स्थिती बार</string>
+  <string name="status_bar_toggle_brightness">चकाकी नियंत्रण</string>
+  <string name="status_bar_toggle_brightness_summary">स्थिती बारवर तिरके स्लाईड करून चकाकी समायोजित करा</string>
+  <string name="status_bar_notif_count_title">सूचना संख्या दर्शवा</string>
+  <string name="status_bar_notif_count_summary">प्रलंबित सूचनांची संख्या प्रदर्शित करा</string>
+  <string name="status_bar_quick_qs_pulldown_title">जलद पुलडाउन</string>
+  <string name="status_bar_quick_qs_pulldown_summary">स्थिती बारचे %1$s किनार जलद सेटिंग्ज खाली खेचते</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">डावे</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">उजवे</string>
+  <string name="status_bar_quick_qs_pulldown_off">बंद</string>
+  <string name="status_bar_quick_qs_pulldown_left">डावे</string>
+  <string name="status_bar_quick_qs_pulldown_right">उजवे</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">घड्याळाची शैली</string>
+  <string name="status_bar_clock_style_right">उजवे</string>
+  <string name="status_bar_clock_style_left">डावे</string>
+  <string name="status_bar_clock_style_center">मध्यवर्ती</string>
+  <string name="status_bar_clock_style_hidden">लपविलेले</string>
+  <string name="status_bar_am_pm_title">AM/PM शैली</string>
+  <string name="status_bar_am_pm_info">24-तास घड्याळ सक्षम केले आहे</string>
+  <string name="status_bar_am_pm_normal">सामान्य</string>
+  <string name="status_bar_am_pm_small">लहान</string>
+  <string name="status_bar_am_pm_hidden">लपविलेले</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">बॅटरी स्थिती शैली</string>
+  <string name="status_bar_battery_style_icon_portrait">प्रतीक पोर्ट्रेट</string>
+  <string name="status_bar_battery_style_icon_landscape">प्रतीक लँडस्केप</string>
+  <string name="status_bar_battery_style_circle">वर्तुळ</string>
+  <string name="status_bar_battery_style_text">मजकूर</string>
+  <string name="status_bar_battery_style_hidden">लपविलेले</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">बॅटरी टक्केवारी</string>
+  <string name="status_bar_battery_percentage_default">लपविलेले</string>
+  <string name="status_bar_battery_percentage_text_inside">प्रतीकाच्या आत</string>
+  <string name="status_bar_battery_percentage_text_next">प्रतीकाच्या शेजारी</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">स्थिती बार प्रतीके</string>
+  <string name="status_bar_icons_summary">कोणती स्थिती बार प्रतीके दाखवली जातील ते नियंत्रित करा</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">जेश्चर टच इव्हेंट्स अवरोधित करा</string>
+  <string name="edge_gesture_service_summary">नेव्हिगेशनसाठी टच इव्हेंट्स आणि अनुप्रयोगांसाठी स्थिती बार जेश्चर्स पाठवू नका</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">कधीही नाही</string>
+  <string name="keep_screen_on_debugging">USB डिबगिंग करताना</string>
+  <string name="keep_screen_on_charging">चार्ज होत असताना</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">गोपनीयता</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">डिफॉल्टद्वारे सक्षम</string>
+  <string name="privacy_guard_default_summary">नव्याने-स्थापित अनुप्रयोगांसाठी डिफॉल्टद्वारे सक्षम केलेले</string>
+  <string name="privacy_guard_manager_title">गुप्तता रक्षक</string>
+  <string name="privacy_guard_manager_summary">तुमच्या वैयक्तिक डेटावर कोणत्या अनुप्रयोगांना ऍक्सेस आहे ते व्यवस्थापित करा</string>
+  <string name="privacy_guard_no_user_apps">कोणतेही अनुप्रयोग स्थापित नाहीत</string>
+  <string name="privacy_guard_help_title">मदत</string>
+  <string name="privacy_guard_reset_title">रीसेट करा</string>
+  <string name="privacy_guard_reset_text">परवानग्या रीसेट करायच्या?</string>
+  <string name="privacy_guard_help_text">ह्या स्क्रीनमध्ये तुम्ही निवडू शकता की कोणत्या अनुप्रयोगवर केवळ टॅप करून त्यांना गुप्तता रक्षकाने सक्रिय करावे. निवडक अनुप्रयोगांना तुमच्या वैयक्तिक डेटामध्ये ऍक्सेस करता येणार नाही जसे की, संपर्क, संदेश किंवा कॉल लॉग्ज. एखाद्या अनुप्रयोगाची प्रविष्ठी दीर्घ दाबून ठेवल्यामुळे त्याचे अनुप्रयोग तपशील स्क्रीन उघडतात.\n\nअंगभूत अनुप्रयोग डिफॉल्टनुसार दाखवले जात नाहीत परंतु संबंधित मेनू पर्याय निवडल्याने उघड केले जाऊ शकतात.</string>
+  <string name="privacy_guard_manager_show_system_apps">अंगभूत अनुप्रयोग दर्शवा</string>
+  <string name="privacy_guard_advanced_settings_title">प्रगत</string>
+  <string name="privacy_guard_notification_title">सूचना दर्शवा</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">पॅटर्न त्रुटी दर्शवा</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">पॅटर्न डॉट्स दर्शवा</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">पासवर्ड प्रविष्ठी थेट दर्शवा</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">पॅटर्न व्ह्यू थेट दर्शवा</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">पिन प्रविष्ठी थेट दर्शवा</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">संगीत व्हिज्युअलायझर प्रदर्शित करा</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">जलद सेटिंग्ज टाईलद्वारे अक्षम केलेले</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">लॉक स्क्रीन सक्षम करण्यासाठी टॅप करा</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">लॉक स्क्रीन सक्षम केला!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">बॅटरी बचतकर्ता मर्यादा</string>
+  <string name="battery_saver_summary">कामगिरी कमी करा आणि पार्श्वभूमी डेटा मर्यादित करा</string>
+  <string name="battery_saver_summary_unavailable">चार्ज करत असताना उपलब्ध नाही</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">अनुप्रयोगागणिक प्रोफाइल्स सक्षम करा</string>
+  <string name="autoperf_summary">विविध अनुप्रयोगांसाठी योग्य बॅटरी मोड स्वयंचलितपणे निवडा</string>
+  <string name="perf_profile_title">बॅटरी मोड</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">बूट केल्यावर सुरू झालेले अनुप्रयोग</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">सूचना टोन</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">प्रगत रीबूट</string>
+  <string name="advanced_reboot_summary">अनलॉक केलेले असताना, पुनर्प्राप्ती, बूटलोडर किंवा सॉफ्ट रीबूट पार पाडण्यामध्ये रीबूट करण्यासाठी पॉवर मेनूमध्ये पर्याय समाविष्ट करते</string>
+  <string name="category_interface">इंटरफेस</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">विस्तारित डेस्कटॉप</string>
+  <string name="expanded_hide_nothing">काहीही लपवू नका</string>
+  <string name="expanded_hide_status">स्थितीदर्शक पट्टी लपवा</string>
+  <string name="expanded_hide_navigation">नेव्हिगेशन बार लपवा</string>
+  <string name="expanded_hide_both">दोन्ही लपवा</string>
+  <string name="expanded_nothing_to_show">सानुकूल अनुप्रयोगागणिक कॉन्फिगरेशन विस्तारित स्थितीमध्ये जोडण्यासाठी, \'सर्वांसाठी सक्षम केलेले\' बंद स्थितीमध्ये जोडा</string>
+  <string name="expanded_enabled_for_all">सर्वांसाठी सक्षम केलेले</string>
+  <string name="expanded_desktop_style">विस्तारित डेस्कटॉप शैली</string>
+  <string name="expanded_desktop_style_description">डिफॉल्ट विस्तारित डेस्कटॉप शैली निवडा</string>
+  <string name="expanded_desktop_title">विस्तारित डेस्कटॉप पर्याय</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">अनुप्रयोग बंद करा मागे बटण</string>
+  <string name="kill_app_longpress_back_summary">मागे बटण दीर्घ दाबून अग्रभूमी अनुप्रयोग बंद करा</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">अलीकडील मेनूंमध्ये शोध बार दर्शवा</string>
+  <string name="keywords_recents_show_searchbar">अलीकडील अलीकडील अक्षम करका सक्षम करा दर्शवा लपवा शोध बार शोधबार</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">व्हॉइस सक्रिय</string>
+  <string name="voice_wakeup_retrain_title">तुमचा व्हॉइस रिट्रेन करा</string>
+  <string name="voice_wakeup_activity_title">सुरू करण्याचा कार्यकलाप</string>
+  <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">थेट डायल संपर्क निवडण्यासाठी व्हॉइस सक्रियला फोन कॉल परवानग्यांची आवश्यकता आहे.</string>
+  <string name="picker_activities">क्रियाकलाप</string>
+  <string name="select_custom_app_title">सानुकूल अनुप्रयोग निवडा</string>
+  <string name="select_custom_activity_title">सानुकूल कार्यकलाप निवडा</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">अवरोधित कॉलर यादी</string>
+  <string name="blacklist_edit_dialog_title">अवरोधित फोन नंबर संपादित करा</string>
+  <string name="blacklist_prefs">सेटिंग्ज</string>
+  <string name="blacklist_button_delete">हटवायचे?</string>
+  <string name="blacklist_empty_text">तुमच्याकडे कोणतेही अवरोधित नंबर्स नाहीत. जोडा (+) बटणाला स्पर्श करून प्रविष्ठी जोडा.</string>
+  <string name="blacklist_disabled_empty_text">फोन नंबर्सना तुम्हाला कॉल करण्यापासून किंवा संदेश पाठवण्यापासून प्रतिबंध करण्यासाठी, अवरोधित कॉलर यादी सक्षम करा.</string>
+  <string name="blacklist_summary_disabled">अक्षम केले</string>
+  <string name="blacklist_summary">अवरोधित कॉलर यादीवरील फोन नंबर्सकडून तुम्हाला इनकमिंग कॉल्स किंवा संदेश प्राप्त होणार नाहीत</string>
+  <string name="blacklist_notify">सूचना दर्शवा</string>
+  <string name="blacklist_private_numbers_title">खाजगी नंबर्स</string>
+  <string name="blacklist_private_numbers_summary_disabled">खाजगी नंबर्सकडून येणारे कॉल्स अवरोधित करू नका</string>
+  <string name="blacklist_private_numbers_summary">खाजगी नंबर्सकडून येणारे  <xliff:g id="type">%s</xliff:g> अवरोधित करा</string>
+  <string name="blacklist_unknown_numbers_title">अज्ञात नंबर्स</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">संपर्क यादीमध्ये नसलेल्या नंबर्सकडून येणारे कॉल्स किंवा संदेश अवरोधित करू नका</string>
+  <string name="blacklist_unknown_numbers_summary">संपर्क यादीमध्ये नसलेल्या नंबर्सकडून येणारे <xliff:g id="type">%s</xliff:g> अवरोधित करा</string>
+  <string name="blacklist_summary_type_calls_only">कॉल्स</string>
+  <string name="blacklist_summary_type_messages_only">संदेश</string>
+  <string name="blacklist_summary_type_calls_and_messages">कॉल्स आणि संदेश</string>
+  <string name="blacklist_regex_title">वाईल्डकार्ड्स वापरा</string>
+  <string name="blacklist_regex_summary">. वाईल्डकार्ड म्हणून आणि * पुनरावृत्तीसाठी वापरा. उदा. 123.* 123 पासून सुरू होणारे नंबर्स अवरोधित करते आणि .*123.* 123 असलेले नंबर्स अवरोधित करते</string>
+  <string name="blacklist_policy_block_calls">इनकमिंग कॉल्स अवरोधित करा</string>
+  <string name="blacklist_policy_block_messages">इनकमिंग संदेश अवरोधित करा</string>
+  <string name="blacklist_bad_number_add">अवैध फोन नंबर अवरोधित कॉलर यादीमध्ये जोडण्यात अक्षम</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">नंबर काढा</string>
+  <string name="remove_blacklist_entry">तुम्हाला हा अवरोधित फोन नंबर काढायचा आहे का?</string>
+  <string name="select_contact">संपर्क निवडा</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">अनुप्रयोग सुरक्षा</string>
+  <string name="sms_security_check_limit_title">SMS संदेश मर्यादा</string>
+  <string name="sms_security_check_limit_summary">पुष्टीकरणाची आवश्यकता भासण्यापूर्वी अनुप्रयोग 1 मिनिटात %d संदेश पाठवू शकतात</string>
+  <string name="sms_security_check_limit_summary_none">पुष्टीकरणाविना अनुप्रयोगांना कोणतेही संदेश पाठवण्यासाठी परवानगी नाही</string>
+  <string name="sms_security_check_limit_none">काहीही नाही</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s जोडले</string>
+  <string name="spam_last_blocked_title">शेवटचे अवरोधित %1$s</string>
+  <string name="block_notifications_title">सूचना फिल्टर करा</string>
+  <string name="block_notifications_summary">दुर्लक्ष केलेल्या सूचना आणि फिल्टर्स व्यवस्थापित करा</string>
+  <string name="no_filters_title">कोणतेही फिल्टर्स सेट नाहीत</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod आकडेवारी</string>
+  <string name="anonymous_statistics_summary">अनामिक आकडेवारी अहवाल देणे निवडून CyanogenMod अधिक चांगले करण्यास मदत करा</string>
+  <string name="anonymous_statistics_warning_title">विषयी</string>
+  <string name="anonymous_statistics_warning">CyanogenMod आकडेवारी निवडल्यामुळे डिव्हाइसेवरील वैशिष्ट्यपूर्ण स्थापनेचा मागोवा घेण्यासाठी CyanogenMod च्या विकसकांकडे अ-वैयक्तिक डेटा सबमिट करण्यास परवानगी दिली जाईल. सबमिट केलेल्या माहितीमध्ये वैशिष्ट्यपूर्ण ओळखकर्त्याचा समावेश होतो, जो तुमच्या गुप्तता किंवा वैयक्तिक डेटाशी तडजोड करत नाही. डेटा प्रत्येक बूट दरम्यान सबमिट केला जातो.\n\nसबमिट केल्या जाणाऱ्या डेटाच्या उदाहरणासाठी, डेटा पूर्वावलोकन वर टॅप करा.</string>
+  <string name="enable_reporting_title">अहवाल देणे सक्षम करा</string>
+  <string name="preview_data_title">डेटा पूर्वावलोकन</string>
+  <string name="view_stats_title">आकडेवारी पाहा</string>
+  <string name="anonymous_learn_more">अधिक जाणून घ्या</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">वैशिष्ट्यपूर्ण ID</string>
+  <string name="preview_device_title">डिव्हाइस</string>
+  <string name="preview_version_title">आवृत्ती</string>
+  <string name="preview_country_title">देश</string>
+  <string name="preview_carrier_title">वाहक</string>
+  <string name="stats_collection_title">आकडेवारी संकलन</string>
+  <string name="stats_collection_summary">सक्षम केलेले असताना, मेट्रिक्स संकलनास अनुमती देते</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">पॅटर्न रीसेट करा</string>
+  <string name="lockpattern_settings_reset_summary">पॅटर्न लॉक रीसेट करण्यासाठी प्राथमिक ईमेल खाते आणि संबंधित पासवर्ड प्रविष्ठ करा</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">रीसेट करा</string>
+  <string name="menu_hidden_apps_reset_lock">पॅटर्न लॉक रीसेट करा</string>
+  <string name="protected_apps">संरक्षित अनुप्रयोग</string>
+  <string name="protected_apps_summary">सुरक्षित लॉकमागे कोणती अनुप्रयोग लपवली जातात ते व्यवस्थापित करा</string>
+  <string name="saving_protected_components">घटक स्थिती जतन करत आहे\u2026</string>
+  <string name="pa_login_username_hint">वापरकर्तानाव (ईमेल)</string>
+  <string name="pa_login_password_hint">संकेतशब्द</string>
+  <string name="pa_login_submit_button">साइन इन करा</string>
+  <string name="pa_login_checking_password">खाते तपासत आहे…</string>
+  <string name="pa_login_incorrect_login">लॉगिन चुकीचे होते</string>
+  <string name="pa_pattern_or_fingerprint_header">अनलॉक करण्यासाठी पॅटर्न रेखाटला पाहिजे किंवा बोटाचा ठसा वापरला पाहिजे</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">योगदानकर्ते</string>
+  <string name="contributors_cloud_loading_message">योगदानकर्त्यांचा डेटा\u2026 लोड करत आहे</string>
+  <string name="contributors_cloud_failed_message">योगदानकर्त्यांचा डेटा लोड करता येत नाही</string>
+  <string name="contributor_info_menu">योगदानकर्ता माहिती</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>नाव:</b> <xliff:g id="नाव">%1$s</xliff:g><br/><br/>
+                 <b>टोपण:</b> <xliff:g id="टोपण">%2$s</xliff:g><br/><br/>
+                 <b>कमिट्स:</b> <xliff:g id="कमिट्स">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">योगदान माहिती</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>एकूण योगदानकर्ते:</b> <xliff:g id="एकूण योगदानकर्ते">%1$s</xliff:g><br/><br/>
+                 <b>एकूण कमिट्स:</b> <xliff:g id="एकूण_कमिट्स">%2$s</xliff:g><br/><br/>
+                 <b>शेवटचे अद्यतन:</b> <xliff:g id="तारीख">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ध्वनी</string>
+  <string name="notification_manager">सूचना</string>
+  <string name="lockscreen_settings">लॉक स्‍क्रीन</string>
+  <string name="category_lights">प्रकाश</string>
+  <string name="category_volume">व्हॉल्यूम</string>
+  <string name="category_vibrate">कंपन करा</string>
+  <string name="category_misc">संकीर्ण</string>
+  <string name="title_general">सामान्य</string>
+  <string name="advanced">प्रगत</string>
+  <string name="link_volume_option_title">रींग टोन आणि सूचना ध्वनी लिंक करा</string>
+  <string name="lcd_density_prompt_message">काही अनुप्रयोग अ-मानक DPI ला कदाचित चालणार नाहीत.\n\nयामुळे तुमचे डिव्हाइस पुन्हा सुरू होईल.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP फोन नंबर</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN ची प्रत </string>
+  <string name="duplicate_apn_error_message">APN आधिपासून अस्तित्वात आहे.घटक टाकून दया कींवा बदला.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g>  <xliff:g id="status" example="disabled">%2$s</xliff:g> आहे</string>
+  <string name="sim_disabled">अक्षम केलेले</string>
+  <string name="sim_missing">गहाळ किंवा सदोष</string>
+  <string name="sim_enabler_need_disable_sim">सिम कार्ड निष्क्रिय केले जाईल. तुम्हाला चालू ठेवायचे आहे का?</string>
+  <string name="sim_enabler_will_disable_sim_title">लक्ष द्या</string>
+  <string name="sim_enabler_need_switch_data_service">हे सिम अक्षम केले जाईल आणि सिम <xliff:g id="slotid">%1$s</xliff:g> डेटा सेवांसाठी वापरले जाईल. तुम्हाला नक्की पुढे चालू ठेवायचे का?</string>
+  <string name="sim_enabler_airplane_on">विमान मोड चालू असताना ऑपरेशन पार पाडण्यात अक्षम.</string>
+  <string name="sim_enabler_in_call">कॉल चालू असताना ऑपरेशन पार पाडण्यात अक्षम.</string>
+  <string name="sim_enabler_both_inactive">सर्व सिम कार्ड्स अक्षम करू शकत नाही</string>
+  <string name="sim_enabler_enabling">सक्रिय करत आहे\u2026</string>
+  <string name="sim_enabler_disabling">निष्क्रिय करत आहे\u2026</string>
+  <string name="sub_activate_success">सिम सक्रिय केले.</string>
+  <string name="sub_activate_failed">सक्रियण अपयशी झाले.</string>
+  <string name="sub_deactivate_success">सिम निष्क्रिय केले.</string>
+  <string name="sub_deactivate_failed">निष्क्रियण अपयशी झाले.</string>
+  <string name="primary_sub_select_title">डिफॉल्ट 3G/LTE सदस्यता</string>
+  <string name="select_sim_card">सिम कार्ड निवडा</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">सिम %d स्थिती</string>
+  <string name="sim_card_lock_settings_title">सिम %d लॉक सेटिंग्ज</string>
+  <string name="sim_card_summary_empty">सिम समाविष्ट नाही</string>
+  <string name="sim_mobile_network_settings_category_title">मोबाईल नेटवर्क सेटिंग्ज</string>
+  <string name="sim_mobile_network_settings_title">सिम %d सेटिंग्ज</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">स्मरणे</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">इव्हेंट्स</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">निवडलेले कॉलर्स</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">निवडलेले संदेश</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">हेड: %1$s W/किग्रॅ</string>
+  <string name="maximum_body_level">बॉडी: %1$s W/किग्रॅ</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">मॉडेल: %1$s</string>
+  <string name="ic_code_full">IC %1$s</string>
+  <string name="sim_ringtone_title">सिम %d रींग टोन</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">अप:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">शेवटचे वापरलेले:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">वापर वेळ:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">यामुळे तुमच्या टॅब्लेटच्या <b>अंतर्गत संचयनामधून</b> सर्व डेटा खोडला जाईल, पुढील गोष्टींच्या समावेशासह:\n\n<li>तुमची डिव्हाइस खाती</li>\n<li>सिस्टिम आणि अनुप्रयोग डेटा आणि सेटिंग्ज</li>\n<li>डाउनलोड केलेले अॅप्स</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">यामुळे तुमच्या फोनच्या <b>अंतर्गत संचयनामधून</b> सर्व डेटा खोडला जाईल, पुढील गोष्टींच्या समावेशासह:\n\n<li>तुमची डिव्हाइस खाती</li>\n<li>सिस्टिम आणि अनुप्रयोग डेटा आणि सेटिंग्ज</li>\n<li>डाउनलोड केलेले अॅप्स</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">वैयक्तिक डेटा आणि अनुप्रयोग</string>
+  <string name="factory_reset_instructions_summary">ह्यामुळे ह्या डिव्हाइसवरील तुमची सर्व खाती, अनुप्रयोग, अनुप्रयोग डेटा, आणि सिस्टिम सेटिंग्ज खोडली जातील</string>
+  <string name="factory_reset_personal_content">वैयक्तिक सामग्री</string>
+  <string name="factory_reset_erase_stored_content">संचयित सामग्री खोडा</string>
+  <string name="factory_reset_erase_stored_content_summary">ह्या डिव्हाइसवर संचयित संगीत, फोटो, व्हिडिओ आणि इतर प्रयोक्ता डेटा खोडा</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">ह्या डिव्हाइसवर संचयित संगीत, फोटो, व्हिडिओ आणि इतर प्रयोक्ता डेटा खोडा. \n\n<b>डिव्हाइस एनक्रिप्शनमुळे सामग्री जतन केली जाऊ शकत नाही.</b></string>
+  <string name="factory_reset_erase_sd_card">SD कार्ड फॉरमॅट करा</string>
+  <string name="factory_reset_erase_sd_card_summary">संगीत आणि फोटोंसह SD कार्डवरील सर्व डेटा खोडा</string>
+  <string name="factory_reset_warning_text_reset_now">आत्ता रीसेट करा</string>
+  <string name="factory_reset_warning_text_message">तुमची सर्व खाती, अनुप्रयोग, अनुप्रयोग डेटा, आणि सिस्टिम सेटिंग्ज ह्या डिव्हाइसवरून काढले जातील. हे उलटवता येत नाही.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">इतर</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi hotspot timeout</string>
+  <string name="hotstpot_inactivity_timeout_never">कधीही नाही</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1मिनिट</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 मिनिट्स</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 मिनिट्स</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">पोर्टेबल Wi\u2011Fi hotspot कधीही टाइमआउट होत नाही</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Portable Wi\u2011Fi hotspot will timeout after <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">थेट लॉक स्क्रिन</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">थेट लॉक स्क्रिन्स सक्षम आणि कॉनफीगर</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">सेटिंग्ज</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">उपलब्ध थेट लॉक स्क्रिन्स पाहण्यासाठी,थेट लॉक स्क्रिन चालू करा</string>
+  <string name="interruptions_ignore_while_media_title">ऑडिओ डकिंगला प्रतिबंध करा</string>
+  <string name="interruptions_ignore_while_media_summary">सूचना आल्यावर मिडिया प्लेबॅक ध्वनी कमी करू नका</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">CyanogenMod लिगल</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">आकडेवारी रीसेट करा</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">बॅटरी इतिहास आकडेवारी रीसेट केली जाणार नाही</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">डॉक बॅटरी उपस्थित नाही</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">डॉक AC वर चार्ज करत आहे</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">डॉक USB वर चार्ज करत आहे</string>
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index e62010d..9b0eafa 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -924,4 +924,14 @@
   <string name="interruptions_ignore_while_media_summary">Ikke Reduser media avspillingsvolumet når en melding ankommer</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod juridisk</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Tilbakestill statistikk</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Batteriloggstatistikken vil bli tilbakestilt</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dokkbatteriet er ikke til stede</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Lader på dokk AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Lader via dokk-USB</string>
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 1269259..27431a1 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -792,7 +792,7 @@
   <string name="voice_wakeup_retrain_title">Uw stem opnieuw aanleren</string>
   <string name="voice_wakeup_activity_title">Activiteit om te starten</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">Ontwaken met stem heeft telefoonmachtiging nodig om een contact te selecteren.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">\'Ontwaken met stem\' heeft telefoonmachtiging nodig om een contact te selecteren.</string>
   <string name="picker_activities">Activiteiten</string>
   <string name="select_custom_app_title">Aangepaste app kiezen</string>
   <string name="select_custom_activity_title">Aangepaste activiteit kiezen</string>
@@ -861,7 +861,7 @@
   <string name="menu_hidden_apps_delete">Opnieuw instellen</string>
   <string name="menu_hidden_apps_reset_lock">Patroon opnieuw instellen</string>
   <string name="protected_apps">Beschermde apps</string>
-  <string name="protected_apps_summary">Beheren welke applicaties beschermd zijn</string>
+  <string name="protected_apps_summary">Beheren welke apps beschermd zijn</string>
   <string name="saving_protected_components">Opslaan\u2026</string>
   <string name="pa_login_username_hint">Gebruikersnaam (e-mail)</string>
   <string name="pa_login_password_hint">Wachtwoord</string>
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Mediavolume niet verminderen bij meldingen</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Juridische afdeling van CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Statistieken opnieuw instellen</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistieken over accugeschiedenis worden opnieuw ingesteld</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dock-accu niet aanwezig</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Opladen via dock (AC)</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-oc-rFR/strings.xml b/res/values-oc-rFR/strings.xml
index c3268d5..2216f6c 100644
--- a/res/values-oc-rFR/strings.xml
+++ b/res/values-oc-rFR/strings.xml
@@ -1200,6 +1200,7 @@
   <!-- Master clear progress screen text [CHAR LIMIT=75] -->
   <!-- Main settings screen, Call settings title for item to go into the call settings -->
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- 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]-->
@@ -1402,6 +1403,7 @@
   <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
   <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
@@ -1499,6 +1501,7 @@
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
   <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
   <!-- Descriptive text of a running process: singular process, singular service. -->
@@ -1912,6 +1915,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
   <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
@@ -2403,7 +2407,9 @@
   <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
   <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
@@ -2531,6 +2537,7 @@
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -2846,6 +2853,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -3086,4 +3094,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-or-rIN/cm_plurals.xml b/res/values-or-rIN/cm_plurals.xml
new file mode 100644
index 0000000..b8bf77d
--- /dev/null
+++ b/res/values-or-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> ସେକେଣ୍ଡ</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> ଟି ସେକେଣ୍ଡ</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">ଥରେ</item>
+    <item quantity="other">%d ଥର</item>
+  </plurals>
+</resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 5fd19c8..494894e 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">ଉନ୍ନତି ସେଟିଂସମୂହ‍ ସଷମ କରାଯିବା ଠାରୁ ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="step_count">%1$d</xliff:g> ପର୍ଯ୍ୟାୟ ଦୂରରେ ଅଛନ୍ତି।</item>
+    <item quantity="other">ଉନ୍ନତି ସେଟିଂସମୂହ ସଷମ କରାଯିବା ଠାରୁ ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="step_count">%1$d</xliff:g> ପର୍ଯ୍ୟାୟ ଦୂରରେ ଅଛନ୍ତି।</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">ଆପଣ ଉନ୍ନତି ସେଟିଂସ୍‍ ସଷମ କରିଛନ୍ତି!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">ଆବଶ୍ୟକ ନାହିଁ, ଆପଣ ଆଗରୁ ଉନ୍ନତି ସେଟିଂସମୂହ ସଷମ କରିସାରିଛନ୍ତି।</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">ବିକାଶକରଣ ଟୁଲସ୍</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">ଉନନ୍ତି ସର୍ଟକଟ୍‍</string>
+  <string name="development_shortcut_summary">ସମ୍ପ୍ରତି ଆପ୍ଲିକେସନ୍‍ ତାଲିକାରେ ଆପ୍ଲିକେସନ୍‍ ପରିଚାଳନା ସର୍ଟକଟ୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍</string>
+  <string name="root_access_warning_title">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍କୁ ଅନୁମତି ଦେବେ କି?</string>
+  <string name="root_access_warning_message">ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍ ପାଇଁ ଅନୁମତି ଦେବା ବହୁତ ବିପ୍ଜ୍ଜନକ ଓ ଏହା ଆପଣଙ୍କ ସିଷ୍ଟମ୍‍ର ସୁରଷା ପାଇଁ ବାଧା ସୃଷ୍ଟି କରିପାରେ</string>
+  <string name="root_access_none">ଅକ୍ଷମ ହୋଇଛି</string>
+  <string name="root_access_apps">କେବଳ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ</string>
+  <string name="root_access_adb">କେବଳ ADB</string>
+  <string name="root_access_all">ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ଓ ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ ସଂସ୍କରଣ</string>
+  <string name="mod_version_default">ଅଜ୍ଞାତ</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">ଡିଭାଇସ୍‍ ମଡେଲ୍‍</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">ଡିଭାଇସ୍ ନାମ</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ API ସ୍ତର</string>
+  <string name="mod_api_level_default">ଅଜ୍ଞାତ</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">ତାରିଖ ତିଆରି କରନ୍ତୁ</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ ଅଦ୍ୟତନ</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">ସିଆନୋଜେନ୍‍ ରିକଭରି ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="update_recovery_summary">ସିଷ୍ଟମ୍‍ ଅଦ୍ୟତନ ସହିତ ରିକଭରି ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="update_recovery_on_warning">ସୁଚନା ଏହି ବୈଶିଷ୍ଟ୍ୟ ଯେତେବେଳେ ସଷମ କରାଯାଏ, ଆପଣ ସଂ‍ସ୍ଥାପନ କରିଥିବା ରିକଭରି ଚାଳିତ Osର ସମ୍ପ୍ରତି ସଂସ୍କରଣ ସହିତ ଅନ୍ତଭୁକ୍ତ ଥିବା ଅନ୍ୟ ଏକ ଦ୍ୱାରା ପ୍ରତି୍‍ସ୍ଥାପିତ ହେବ।\n\nଆପଣଙ୍କ ସିଷ୍ଟମ୍‍ ପାଇଁ କରାଯାଇଥିବା ଅପ୍‍ଗ୍ର।\n\nେଡ୍‍ ସହିତ ଆପଣଙ୍କ ରିକଭରି ଅଦ୍ୟତନ ହୋଇଯିବ, ଆଗାମି ସଂସ୍କରଣ ସହିତ କମ୍ପାଟିବିଲିଟି ପାଇଁ ସାହାଯ୍ୟ କରିବ।\n\nଆପଣ ଏହି ବୈଶିଷ୍ଟ୍ୟ ସଷମ କରିବାକୁ ଚାହାନ୍ତି କି?</string>
+  <string name="update_recovery_off_warning">ସତର୍କତା: ଯେତେବେଳେ ଏହି ବୈଶିଷ୍ଟ୍ୟ ଅଷମ କରାଯାଏ, ଆପଣଙ୍କର ସଂ‍ସ୍ଥାପିତ ହୋଇଥିବା ରିକଭରି OS ଅପ୍‍ଗ୍ରେଡ୍‍ ସହିତ ଅଦ୍ୟତନ ହେବ ନାହିଁ।\n\n ଆଗାମି OS ଅଦ୍ୟତ୍ନ ଆଉଟ୍‍ଡେଟେଡ୍‍ ବା କଶଃଟମ୍‍ ରିକଭରି ସଂସ୍କରଣ ସହିତ ସଂ‍ସ୍ଥାପନ ହୋଇନପାରେ।\n\nଆପଣ ପ୍ରକୃତରେ ଏହି ବୈଶିଷ୍ଟ୍ୟ ଅଷମ କରିବାକୁ ଚାହାଁନ୍ତି କି?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">ଥିମ୍‍ଗୁଡିକ</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">ରିଙ୍ଗ୍‍ ମୋଡ୍‍</string>
+  <string name="ring_mode_normal">ସାଧାରଣ</string>
+  <string name="ring_mode_vibrate">କମ୍ପନ</string>
+  <string name="ring_mode_mute">ମ୍ୟୁଟ୍</string>
+  <string name="settings_reset_button">ପୁନଃସେଟ୍</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">ସିଷ୍ଟମ୍‍ ପ୍ରୋଫାଇଲ୍‍ଗୁଡିକ</string>
+  <string name="profiles_add">ଯୋଡନ୍ତୁ</string>
+  <string name="profile_menu_delete">ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="profile_settings_title">ପ୍ରୋଫାଇଲ୍‍</string>
+  <string name="profile_empty_list_profiles_off">ସିଷ୍ଟମ୍‍ ପ୍ରୋଫାଇଲ୍‍ ବିନ୍ୟାସ କରିବା ପାଇଁ ଓ ବ୍ୟବହାର କରିବା ପାଇଁ, ପ୍ରୋଫାଇଲ୍‍ ଅନ୍‍ କରନ୍ତୁ।</string>
+  <string name="profile_trigger_configure">ଟ୍ରିଗର୍‍ ବିନ୍ୟାସ‍ କରନ୍ତୁ</string>
+  <string name="profile_write_nfc_tag">NFC ଟ୍ୟାଗ୍‍କୁ ଲେଖନ୍ତୁ</string>
+  <string name="profile_write_touch_tag">ଲେଖିବା ପାଇଁ ଟ୍ୟାଗ୍‍ ସ୍ପର୍ଶ କରନ୍ତୁ</string>
+  <string name="profile_write_success">ଟ୍ୟାଗ୍‍ ସଫଳତାର ସହିତ ଲେଖାଯାଇଛି</string>
+  <string name="profile_write_failed">ଟ୍ୟାଗ୍‍ ଲେଖିବା ବିଫଳ ହୋଇଛି</string>
+  <string name="profile_selected">ପ୍ରୋଫାଇଲ୍‍ ଚୟନ ହୋଇଛି: %1$s</string>
+  <string name="profile_nfc_text">ପ୍ରୋଫାଇଲ୍‍ ଚୟନ କରିବା ପାଇଁ NFC ଟ୍ୟାଗ୍‍ରେ ପ୍ରୋଫାଇଲ୍‍ ଲେଖିବା ଦ୍ୱାରା ଟ୍ୟାଗ୍‍ରେ ଟ୍ୟାପ୍‍ କରାଯାଇପାରିବ। ଦ୍ୱିତୀୟ ଥର ଟ୍ୟାପ୍‍ କରିବା ଦ୍ୱାରା ପୂର୍ବରୁ ଚୟନ କରାଯାଥିବା ପ୍ରୋଫାଇଲ୍‍ ଚୟନ କରାଯାଇପାରିବ।</string>
+  <string name="profile_unknown_nfc_tag">ଅଜ୍ଞାତ ପ୍ରୋଫାଇଲ୍‍</string>
+  <string name="profile_add_nfc_text">NFC ଟ୍ୟାଗ୍‍ ଏକ ଅଜ୍ଞାତ ପ୍ରୋଫାଇଲ୍‍କୁ ବୁଝାଏ। ପୂର୍ବରୁ ବିଦ୍ୟମାନ ଥିବା ଏହି NFC ଟ୍ୟାଗ୍‍ ସଂଲଗ୍ନ କରିବା ଦ୍ୱାରା ଏହା ଭବିଷ୍ୟତରେ ପ୍ରୋଫାଇଲ୍‍ ଚୟନ କରିବାକୁ ଅନୁମତି ଦିଏ।</string>
+  <string name="profile_select">ପ୍ରୋଫାଇଲ୍‍ ଚୟନ କରନ୍ତୁ</string>
+  <string name="profile_remove_dialog_message">ପ୍ରୋଫାଇଲ୍‍ %1$s ଅପସାରଣ କରିବେ କି?</string>
+  <string name="profile_populate_profile_from_state">ସମ୍ପ୍ରତି ଡିଭାଇସ୍‍ ସେଟିଂସ୍‍ ବ୍ୟବହାର କରି ପ୍ରୋଫାଇଲ୍‍ ିନ୍ୟାସ କରିବେ କି?</string>
+  <string name="profile_menu_fill_from_state">ସମ୍ପ୍ରତି ଡିଭାଇସ୍‍ ସେଟିଂସ‍ ଆମଦାନି କରନ୍ତୁ</string>
+  <string name="profile_remove_current_profile">ସାମ୍ପ୍ରତିକ ପ୍ରୋଫାଇଲ୍‍ ବିଲୋପ କରିହେବ ନାହିଁ!</string>
+  <string name="profile_app_group_category_title">ନୋଟିଫିକେସନ୍‍ ଓଭର୍‍ରାଇଡ୍‍ ହେଉଛି</string>
+  <string name="profile_app_group_item_instructions">ଗୋ‍ଷ୍ଠୀ ଯୋଗ ବା ଅ୍ପସାରଣ କରନ୍ତୁ</string>
+  <string name="profile_app_group_item_instructions_summary">ନି୍ର୍ଦ୍ଦେଶାବଳି ଯୋଗ ବା ଅ୍ପସାରଣ କରିବା ଦ୍ୱାରା ଏହି ପ୍ରୋଫାଇଲ୍‍କୁ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ଓଭର୍‍ରାଇଡ୍‍ କରିଥାଏ</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">ଅନ</string>
+  <string name="profile_entries_off">ଅଫ୍</string>
+  <string name="profile_entries_no_override">ଓଭର୍‍ରାଇଡ୍‍ କରିହେବ ନାହିଁ</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">ନାମ</string>
+  <string name="new_profile_name">&lt;ନୂତନ ପ୍ରୋଫାଇଲ୍‍&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">ପୁନଃନାମ</string>
+  <string name="rename_dialog_message">ଏକ ନୂଆ ନାମ ଏଣ୍ଟର୍ କରନ୍ତୁ</string>
+  <string name="duplicate_appgroup_name">ଆପ୍ଲିକେସନ୍‍ ଗୋ୍ଷଠୀ ନାମ ଡୁପ୍ଲିକେଟ୍‍ କରନ୍ତୁ!</string>
+  <string name="rename_dialog_hint">ପ୍ରୋଫାଇଲ୍‍ ନାମ ଏଣ୍ଟର୍ କରନ୍ତୁ</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">ପୁନଃସେଟ୍</string>
+  <string name="profile_reset_message">ସମସ୍ତ ଉପଭୋକ୍ତାଙ୍କ ଦ୍ୱାରା ସୃଷ୍ଟି କରାଯାଇଥିବା ପ୍ରୋଫାଇଲ୍‍ ଓ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ବିଲୋପ କରିବେ କି ଓ ତାହା ଡିଫଲ୍ଟ୍କୁ ରିଷ୍ଟୋର୍‍ କରିବେ କି?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">ଏହି ଆପ୍ଲିକେସନ୍‍ ଅପସାରଣ କରିବେ କି?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">ଭୋଲ୍ୟୁମ୍‍ ଓଭର୍‍ରାଇଡ୍‍ କରିହୁଏ</string>
+  <string name="connection_state_enabled">ସକ୍ଷମ</string>
+  <string name="volume_override_summary">%1$S/%2$sକୁ ସେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="profile_volume_override_checkbox_label">ଭୋଲ୍ୟୁମ୍‍ ଓଭର୍‍ରାଇଡ୍‍ କରନ୍ତୁ</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">ପ୍ରୋଫାଇ‌ଗୁଡିକ</string>
+  <string name="profile_profile_manage">ପ୍ରୋଫାଇଲ୍‍ ପରି୍ଚାଳନା କରନ୍ତୁ</string>
+  <string name="profile_appgroups_manage">ଗୋ‍ଷ୍ଠୀଗୁଡିକ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="profile_appgroup_manage">ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ପରି୍ଚାଳନା କରନ୍ତୁ</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">ପ୍ରୋଫାଇଲ୍ ସେଟିଂସ୍</string>
+  <string name="profile_trigger_connect">ସଂଯୋଗ କରିବା ଦ୍ୱାରା</string>
+  <string name="profile_trigger_disconnect">ବିଛିନ୍ନ କରିବା ଦ୍ୱାରା</string>
+  <string name="profile_trigger_notrigger">ଟ୍ରିଗର୍‍ କରିହେବ ନାହିଁ</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">ନୋଟିଫିକେସନ୍‍ ମୋଡ୍‍</string>
+  <string name="ringer_mode">ରିଙ୍ଗ୍‍ ମୋଡ୍‍</string>
+  <string name="lights_mode">ଲାଇଟ୍‍ ମୋଡ୍‍</string>
+  <string name="vibrate_mode">ଭାଇବ୍ରେଟ୍‍ ମୋଡ୍‍</string>
+  <string name="choose_soundtone">ନୋଟିଫିକେସନ୍‍ ଟୋନ୍‍ ଚୟନ କରନ୍ତୁ</string>
+  <string name="choose_ringtone">ରିଂଟୋନ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">ନୋଟିଫି୍କିସନ୍‍ ଟୋନ୍‍</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ଗୋ‍ଷ୍ଠୀଗୁଡିକ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="profile_applist_title">ଆପ୍ଲିକେସନଗୁଡିକ</string>
+  <string name="profile_new_appgroup">ନୂଆ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ</string>
+  <string name="profile_delete_appgroup">ଏହି ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ବିଲୋପ କରିବେ କି?</string>
+  <string name="profile_appgroup_name_prompt">ନୂଆ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ପାଇଁ ଏକ ନାମ ପ୍ରବେଶ କରନ୍ତୁ</string>
+  <string name="profile_appgroup_name_title">ନାମ</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">ଆପ୍ଲିକେସନ୍‌ ବାଛନ୍ତୁ</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">ସିଷ୍ଟମ୍ ସେଟିଂସ୍‌</string>
+  <string name="profile_lockmode_title">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ମୋଡ୍‍</string>
+  <string name="profile_lockmode_policy_disabled_summary">ଏହି ପ୍ରୋଫାଇଲ୍‍ ବିକଳ୍ପ ଡିଭାଇସ୍‍ ଆଡ୍‍ମିନି୍ଷ୍ଟ୍ରେଟର୍‍ ନିୟମ ଦ୍ୱାରା ଅ‍କ୍ଷମ କରାଯାଇଛି</string>
+  <string name="profile_lockmode_insecure_summary">PIN ବା ପାସ୍‍ୱାର୍ଡ ପାଇଁ ପଚାରନ୍ତୁ ନାହିଁ</string>
+  <string name="profile_lockmode_disabled_summary">ଲକ୍‍ସ୍କ୍ରିନ୍‍ ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="profile_airplanemode_title">ବିମାନ ମୋଡ୍</string>
+  <string name="profile_brightness_title">ସ୍କ୍ରିନ୍‍ ଉଜ୍ଜ୍ୱଳତା</string>
+  <string name="profile_brightness_override_summary">%1$D%%କୁ ସେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="profile_brightness_override_checkbox_label">ଔଜଲ୍ୟତା ଓଭର୍‍ରାଇଡ୍‍ କରନ୍ତୁ</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi\u2011Fi</string>
+  <string name="toggleWifiAp">Wi-Fi ହଟସ୍ପଟ୍ ପୋର୍ଟେବୁଲ୍</string>
+  <string name="toggleBluetooth">ବ୍ଲୁଟୁଥ୍</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">ଡାଟା ସଂଯୋଗ କରନ୍ତୁ</string>
+  <string name="toggleSync">ସ୍ଵତଃ-ସିଙ୍କ୍ ଡାଟା</string>
+  <string name="toggle2g3g4g">ଅଗ୍ରାଧିକାର ହୋଇଥିବା ନେଟୱାର୍କ୍ ମୋଡ୍</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi ଅଞ୍ଚଳ କୋଡ୍‍</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fi ପାଇଁ ଅଞ୍ଚଳ କୋଡ୍‍ ବିନିର୍ଦ୍ଦିଷ୍ଟ କରନ୍ତୁ</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">ଅଞ୍ଚଳ କୋଡ୍‍ ସେଟ୍‍ କରିବାରେ ଏକ ତ୍ରୁଟି ରହିଛି</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="profile_action_none">ପରିବର୍ତ୍ତନ ନ କରି ଛାଡିଦିଅନ୍ତୁ</string>
+  <string name="profile_action_system">ସିଷ୍ଟମ୍ ଡିଫଲ୍ଟ</string>
+  <string name="profile_action_disable">ଟର୍ନ୍ ଅଫ୍</string>
+  <string name="profile_action_enable">ଟର୍ନ୍ ଅନ୍</string>
+  <string name="profile_trigger_a2dp_connect">A2DP ସଂଯୋଗ ସମୟରେ</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DP ବିଛିନନ୍ ସମୟରେ</string>
+  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
+  <string name="profile_tabs_bluetooth">ବ୍ଲୁଟୁଥ୍</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ଟ୍ରିଗର୍‍ଗୁଡିକ ଯାହା ଏହି ପ୍ରୋଫାଇଲ୍‍ ସକ୍ରିୟ କରିବ</string>
+  <string name="profile_setup_setup_triggers_title">ପର୍ଯ୍ୟାୟ 1: ଟ୍ରିଗର୍‍ଗୁଡିକ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="profile_setup_setup_triggers_title_config">ଟ୍ରିଗର୍‍ଗୁଡିକ ସମ୍ପାଦନା କରନ୍ତୁ: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">ପର୍ଯ୍ୟାୟ 2: ସଂଚାଳନଗୁଡିକ ସେଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
+  <string name="profile_setup_actions_title_config">କାର୍ଯ୍ୟଗୁଡିକ ବିନ୍ୟାସ କରନ୍ତୁ</string>
+  <string name="profile_appgroups_manage">ଗୋ‍ଷ୍ଠୀଗୁଡିକ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="profile_appgroup_manage">ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ପରି୍ଚାଳନା କରନ୍ତୁ</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ଗୋ‍ଷ୍ଠୀଗୁଡିକ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="profile_new_appgroup">ନୂଆ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ</string>
+  <string name="profile_delete_appgroup">ଏହି ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ବିଲୋପ କରିବେ କି?</string>
+  <string name="profile_appgroup_name_prompt">ନୂଆ ଆପ୍ଲିକେସନ୍‍ ଗୋ‍ଷ୍ଠୀ ପାଇଁ ଏକ ନାମ ପ୍ରବେଶ କରନ୍ତୁ</string>
+  <string name="profile_appgroup_name_title">ନାମ</string>
+  <string name="duplicate_appgroup_name">ଆପ୍ଲିକେସନ୍‍ ଗୋ୍ଷଠୀ ନାମ ଡୁପ୍ଲିକେଟ୍‍ କରନ୍ତୁ!</string>
+  <string name="profile_app_delete_confirm">ଏହି ଆପ୍ଲିକେସନ୍‍ ଅପସାରଣ କରିବେ କି?</string>
+  <string name="no_bluetooth_triggers">କୌଣସି ବ୍ଲୁଟୁଥ୍‍ ଡିଭାଇସ୍‍ ପେଆର୍‍ ହୋଇନାହିଁ।\nଟ୍ରିଗର୍‍ କ‍ନ୍ଫିଗର୍‍ କରିବା ପୂର୍ବରୁ ବ୍ଲୁଟୁଥ୍‍ ଡିଭାଇସ୍‍ ପେଆର୍‍ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="no_wifi_triggers">କୌଣସି Wi\u2011Fi ଆକ୍‍ସେସ୍‍ ପଏଣ୍ଟ ିନ୍ୟାସ ହୋଇନାହିଁ।\n ଟ୍ରିଗର୍ସ୍‍ ିନ୍ୟାସ କରିବା ପୂର୍ବରୁ Wi\u2011Fi ସଂଯୋଗ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="no_triggers_configured">କୌଣସି ଟ୍ରିଗର୍ସ୍‍ କନ୍ଫି ଗର୍‍ କରାଯାଇନାହିଁ। ଅଧିକ ଯୋଗ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="no_triggers_configured_nfc">ନୂଆ NFC ଟ୍ରିଗର୍‍ ସେଟ୍‍ଅପ୍‍ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="profile_setup_setup_triggers_description">ଦୟାକରି ସେହି ଟ୍ରିଗର୍‍ ଚୟନ କରନ୍ତୁ ଯାହା ଏହି ପ୍ରୋଫାଇଲ୍‍ ସକ୍ରିୟ କରିବ</string>
+  <string name="profile_setup_actions_description">ଯେତେବେଳେ ପ୍ରୋଫାଇଲ୍‍ ସ୍କ୍ରିୟ ହୁଏ ସେତେବେଳେ ଯାହା ହୁଏ ତାହାକୁ ବର୍ତ୍ତମାନ ିନ୍ୟାସ କରନ୍ତୁ</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">ନେଭିଗେସନ୍‍ ବାର୍‍</string>
+  <string name="navigation_bar_left_title">ବାମ-ହାତବିଶିଷ୍ଟ ମୋଡ୍‍</string>
+  <string name="navigation_bar_left_summary">ଲ୍ୟାଣ୍ଡ୍‍ସ୍କେପ୍‍ ମୋଡ୍‍ରେ ନେଭିଗେସନ୍‍ ବାର୍‍କୁ ସ୍କ୍ରିନ୍‍ର ବାମ ପାଖରେ ରଖନ୍ତୁ</string>
+  <string name="navigation_bar_title">ବଟନ୍‍ ଓ ଲେଆଉଟ୍‍</string>
+  <string name="navigation_bar_help_text">ସମ୍ପାଦନା କରିବା ପାଇଁ ନେଭିଗେସନ୍‍ ବାର୍‍ରେ ଅନ୍‍ଲକ୍‍ କ୍ରିବା ନିମନ୍ତେ ଆରଂଭ କରିବାକୁ ସମ୍ପାଦନା ଆଇକନ୍‍ରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।\n\nଏହାର ସର୍ଟକଟ୍‍ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏକ ଆଇକନ୍‍ରେ ଆପଣ ଟ୍ୟାପ୍‍ କରିପାରିବେ, ବା ଲେଆଉଟ୍‍ ପୁନଃ-ସଜାଇବା ପାଇଁ ଏକ ଆଇକନ୍‍କୁ ଲମ୍ବା ପ୍ରେସ୍‍ କରନ୍ତୁ।\n\n ଆପଣଙ୍କ ସୁଳ୍କ ଦେବା ପାଇଁ \’ସଂରକ୍ଷଣ\’ରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ, ବା ଡିଫଲ୍ଟ ସେଟିଂସ୍‍ରେ ଲେଆଉଟ୍‍ ରିସେଟ୍‍ କରିବା ପାଇଁ \’ରିଷ୍ଟୋର୍‍ ଡିଫଲ୍ଟ୍ସ\’ରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="navigation_restore_button_text">ରିଷ୍ଟୋର୍‍\nଡିଫଲ୍ଟ୍ଗୁଡିକ</string>
+  <string name="navigation_edit_button_text">ସମ୍ପାଦନ</string>
+  <string name="navigation_save_button_text">ସଞ୍ଚୟ</string>
+  <string name="navigation_bar_reset_message">ସମ୍ପ୍ରତି ସେ୍ଟିଂସ୍‍ ବିଲୋପ କରିବେ କି ଓ ଡିଫଲ୍ଟ ଲେଆଉଟ୍‍ ରିଷ୍ଟୋର୍‍ କରିବେ କି?</string>
+  <string name="navigation_bar_arrow_keys_title">ଟାଇପ୍‍ କରିବା ସମୟରେ ତୀର କୀ ଦେଖାନ୍ତୁ</string>
+  <string name="navigation_bar_arrow_keys_summary">ଟାଇପ୍‍ କରିବା ସମୟରେ ବାମ ଓ ଡାହାଣ କର୍ସର୍‍ ବଟନ୍‍ ଦେଖାନ୍ତୁ। IME ସ୍ୱିଚର୍‍ ଓଭର୍‍ରାଇଡ୍‍ କରେ।</string>
+  <string name="navigation_bar_recents_title">ସମ୍ପ୍ରତି ଲମ୍ବା ପ୍ରେସ୍‍ କ୍ରିୟା</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">ଆଲୋକ ସେଟିଂସ୍‍ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="pulse_speed_title">ପଲ୍ସ୍‍ ଲମ୍ବ ଓ ବେଗ</string>
+  <string name="default_time">ସାଧାରଣ</string>
+  <string name="custom_time">କଷ୍ଟମ୍</string>
+  <string name="dialog_delete_title">ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="dialog_delete_message">ଚୟନ କରାଯାଇଥିବା ଆଇଟମ୍‍ ଅପସାରଣ କରିବେ କି?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">ସର୍ବଦା ଅନ୍‌</string>
+  <string name="pulse_length_very_short">ବହୁତ ଛୋଟ</string>
+  <string name="pulse_length_short">ଛୋଟ</string>
+  <string name="pulse_length_normal">ସାଧାରଣ</string>
+  <string name="pulse_length_long">ଦୀର୍ଘ</string>
+  <string name="pulse_length_very_long">ଅଧିକ ଲମ୍ବା</string>
+  <string name="pulse_speed_very_fast">ଅଧିକ ଦ୍ରୁତ</string>
+  <string name="pulse_speed_fast">ଦ୍ରୁତ</string>
+  <string name="pulse_speed_normal">ସାଧାରଣ</string>
+  <string name="pulse_speed_slow">ଧୀର</string>
+  <string name="pulse_speed_very_slow">ଖୁବ୍ ଧୀର</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">ବ୍ୟାଟେରୀ ଆଲୋକ</string>
+  <string name="battery_low_pulse_title">ବ୍ୟାଟେରୀ କମ୍‍ ଥିଲେ ପଲ୍ସ୍‍ କରନ୍ତୁ</string>
+  <string name="battery_light_list_title">ରଙ୍ଗଗୁଡିକ</string>
+  <string name="battery_light_low_color_title">ବ୍ୟାଟେରୀ କମ୍‍ ଅଛି</string>
+  <string name="battery_light_medium_color_title">ଚାର୍ଜିଂ</string>
+  <string name="battery_light_full_color_title">ସମ୍ପୂର୍ଣ୍ଣ ଚାର୍ଜ୍‍ ହୋଇଥିବା</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">ବିଜ୍ଞପ୍ତି ଲାଇଟ୍</string>
+  <string name="notification_light_general_title">ସାଧାରଣ</string>
+  <string name="notification_light_applist_title">ଆପ୍ଲିକେସନଗୁଡିକ</string>
+  <string name="notification_light_phonelist_title">ଫୋନ୍</string>
+  <string name="notification_light_use_custom">କଷ୍ଟମ୍‍ ମୂଲ୍ୟ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="notification_light_default_value">ଡିଫଲ୍ଟ</string>
+  <string name="notification_light_missed_call_title">ହରାଇଥିବା କଲ୍</string>
+  <string name="notification_light_voicemail_title">ଭଏସମେଲ୍</string>
+  <string name="notification_light_screen_on">ସ୍କ୍ରିନ୍‍ ଅନ୍‍ ସହିତ ଲାଇଟ୍‍</string>
+  <string name="notification_light_zen_mode">ଲାଇଟସ୍ ଡୁନଟ୍ ଡିସଟର୍ଭ୍ ମୋଡ଼ ରେ ଅଛି</string>
+  <string name="notification_light_use_multiple_leds">ଏକାଧିକ LED</string>
+  <string name="keywords_lights_brightness_level">ଝାପ୍‍ସା Ledର ଔଜଲ୍ୟତା</string>
+  <string name="notification_light_automagic">ରଙ୍ଗ ସ୍ଵୟଂଚାଳିତ ଚୟନ କରନ୍ତୁ</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ଲାଇଟ୍‍ ସେଟିଂସ୍‍</string>
+  <string name="led_notification_text">ସେଟିଂସ୍‍ ଦ୍ୱାରା LED ଆ୍ଲୋକ ସଷମ କରାଯାଇଛି</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">ଆଣଡ୍ରଏଡ୍‍ ଡିବଗିଂ</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">ଆଣଡ୍ରଏଡ୍‍ ଡିବଗ୍‍ ବ୍ରିଜ୍‍ (adb) ଇଂଟରଫେସ୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ନେଟ୍‍ୱାର୍କ୍‍ରେ ADB</string>
+  <string name="adb_over_network_summary">ନେଟ୍‍ୱାର୍କ୍‍ ଇଂଟରଫେସ୍ ‍(Wi\u2011Fi, USB ନେଟ୍‍ୱାର୍କ୍‍ଗୁଡିକ)ରେ TCP/IP ଡିବଗିଂ ସଷମ କରନ୍ତୁ। ରିବୁଟ୍‍ରେ ଏହି ସେଟିଂ ରିସେଟ୍‍ ହୋଇଛି</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">ସତର୍କତା: ଯେତେବେଳେ ନେଟ୍‍ୱାର୍କ୍‍ରେ ADB ସ‍କ୍ଷମ କରାଯାଏ, ଆପଣଙ୍କ ଫୋନ୍‍ ସମସ୍ତ ସଂଯୋଗ ନେଟ୍‍ୱାର୍କ୍‍ରେ ଇଣ୍ଟ୍ର୍ୟୁଜନ୍‍ ପାଇଁ ଖୋଲା ରହିଛି!\n\nକେବଳ ଭରସାଯୋଗ୍ୟ ନେଟ୍‍ୱାର୍କ୍‍ରେ ସଂଯୋଗ କରିଥିବା ସମୟରେ ଏହି ବୈଶିଷ୍ଟ୍ୟ ବ୍ୟବହାର କରନ୍ତୁ।\n\nଆପଣ ପ୍ରକୃତରେ ଏହି ସଂଚାଳନ ସଷମ କରିବାକୁ ଚାହାଁନ୍ତି କି?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">ଡିବଗିଂ ସୂଚୀତ କରନ୍ତୁ</string>
+  <string name="adb_notify_summary">ଯେତେବେଳେ USB ବା ନେଟ୍‍ୱାର୍କ ଡିବଗିଂ ସ‍କ୍ଷମ କରାଯାଇଥାଏ, ଏକ ନିର୍ଦ୍ଦେଶାବଳି ଦେଖାନ୍ତୁ</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">ଅବସ୍ଥାନ</string>
+  <string name="app_ops_categories_personal">ବ୍ୟକ୍ତିଗତ</string>
+  <string name="app_ops_categories_messaging">ମେସେଜିଂ</string>
+  <string name="app_ops_categories_media">ମିଡିଆ</string>
+  <string name="app_ops_categories_device">ଡିଭାଇସ୍</string>
+  <string name="app_ops_categories_bootup">ବୁଟ୍‍ଅପ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_categories_su">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">ଅସମତଳ ଅବସ୍ଥାନ</string>
+  <string name="app_ops_summaries_fine_location">ସ୍ଵଚ୍ଛ ଅବସ୍ଥାନ</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">ଭାଇବ୍ରେଟ୍‍</string>
+  <string name="app_ops_summaries_read_contacts">ସମ୍ପର୍କଗୁଡିକ ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_modify_contacts">ସମ୍ପର୍କଗୁଡିକ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_call_log">କଲ୍ ଲଗ୍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_modify_call_log">କଲ୍ ଲଗ୍ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_calendar">କ୍ୟାଲେଣ୍ଡର୍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_modify_calendar">କ୍ୟାଲେଣ୍ଡର୍‌ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi ସ୍କାନ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_notification">ନିର୍ଦ୍ଦେଶାବଳି/ଟୋଷ୍ଟ</string>
+  <string name="app_ops_summaries_cell_scan">ସେଲ୍ ସ୍କାନ୍‍</string>
+  <string name="app_ops_summaries_call_phone">ଫୋନ୍ କଲ୍</string>
+  <string name="app_ops_summaries_read_sms">SMS ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_write_sms">SMS ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_summaries_receive_sms">SMS ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_receive_emergency_sms">ଜରୁରୀକାଳୀନ ସନ୍ଦେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_receive_mms">MMS ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP ପୁସ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_send_sms">SMS ପଠାନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_summaries_modify_settings">ସେଟିଂସ୍ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_draw_on_top">ଶୀଷରେ ଆଙ୍କନ୍ତୁ</string>
+  <string name="app_ops_summaries_access_notifications">ବିଜ୍ଞପ୍ତିଗୁଡିକ ଆକସେସ୍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_camera">କ୍ୟାମେରା</string>
+  <string name="app_ops_summaries_record_audio">ଅଡିଓ ରେକର୍ଡ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_play_audio">ଅଡିଓ ବଜାନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_clipboard">କ୍ଲିପ ବୋର୍ଡ ପଠନ୍ତୁ</string>
+  <string name="app_ops_summaries_modify_clipboard">କ୍ଲିପ ବୋର୍ଡ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_media_buttons">ମିଡିଆ ବଟନଗୁଡିକ</string>
+  <string name="app_ops_summaries_audio_focus">ଅଡିଓ ଫୋକସ୍</string>
+  <string name="app_ops_summaries_master_volume">ମାଷ୍ଟର୍ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_voice_volume">ଭଏସ୍‌ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_ring_volume">ରିଙ୍ଗ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_media_volume">ମିଡିଆ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_alarm_volume">ଆଲରାମ୍ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_notification_volume">ସୂଚନା ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_summaries_bluetooth_volume">ବ୍ଲୁଟୁଥ୍ ଭଲ୍ୟୁମ</string>
+  <string name="app_ops_summaries_keep_awake">ସଜାଗ ରଖନ୍ତୁ</string>
+  <string name="app_ops_summaries_monitor_location">ଅବସ୍ଥାନ ମନିଟର୍</string>
+  <string name="app_ops_summaries_monitor_high_power_location">ଉଚ୍ଚ ପାୱାର ଅବସ୍ଥାନ ମନିଟର୍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_get_usage_stats">ବ୍ୟବହାର ପରିସଂଖ୍ୟାନ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">ମାଇକ୍ରୋଫୋନ୍ ମ୍ୟୁଟ୍/ଅନମ୍ୟୁଟ୍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_toast_window">ଟୋଷ୍ଟ ଡିସ୍‍ପ୍ଲେ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_project_media">ପ୍ରୋଜେକ୍ଟ ମିଡିଆ</string>
+  <string name="app_ops_summaries_activate_vpn">VPN ସକ୍ରିୟ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_write_wallpaper">ୱାଲ୍‍ପେପର୍‍ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_summaries_assist_structure">ସଂରଚନାରେ ସହାୟତା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_assist_screenshot">ସ୍କ୍ରିନ୍‍ସଟ୍‍ରେ ସହାୟତା କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_phone_state">ଫୋନ୍‍ ‍ସ୍ଥିତି ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_add_voicemail">ଭଏସମେଲ୍ ଯୋଡନ୍ତୁ</string>
+  <string name="app_ops_summaries_use_sip">SIP ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_make_call">କଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_use_fingerprint">ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_use_body_sensors">ବଡି ସେନ୍‍ସର୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">ସେଲ୍‍ ବ୍ର୍ଡ୍‍କାଷ୍ଟ ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_mock_location">ଅବ‍ସ୍ଥାନ ମକ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_read_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍‍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_summaries_write_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍‍ରେ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_summaries_turn_screen_on">ସ୍କ୍ରିନ୍‍ ଅନ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_get_accounts">ଆକାଉଣ୍ଟ୍ଗୁଡିକ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_toggle_bluetooth">ବ୍ଲୁଟୁଥ୍‍ ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_start_at_boot">ବୁଟ୍‍ ସମୟରେ ଆରଂଭ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_toggle_mobile_data">ମୋବାଇଲ୍‍ ଡାଟା ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_summaries_superuser">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">ଅସମତଳ ଅବସ୍ଥାନ</string>
+  <string name="app_ops_labels_fine_location">ସ୍ଵଚ୍ଛ ଅବସ୍ଥାନ</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">କମ୍ପନ</string>
+  <string name="app_ops_labels_read_contacts">ସମ୍ପର୍କଗୁଡିକ ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_modify_contacts">ରୂପାନ୍ତରଣ ସମ୍ପର୍କଗୁଡିକ</string>
+  <string name="app_ops_labels_read_call_log">କଲ୍ ଲଗ୍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_modify_call_log">କଲ୍ ଲଗ୍ ରୂପାନ୍ତରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_read_calendar">କ୍ୟାଲେଣ୍ଡର୍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_modify_calendar">କ୍ୟାଲେଣ୍ଡର୍‌ ରୂପାନ୍ତରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi ସ୍କାନ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_notification">ବିଜ୍ଞପ୍ତି/ଟୋ୍ଷ୍ଟ</string>
+  <string name="app_ops_labels_cell_scan">ସେଲ୍ ସ୍କାନ୍‍</string>
+  <string name="app_ops_labels_call_phone">ଫୋନ୍ କଲ୍</string>
+  <string name="app_ops_labels_read_sms">SMS ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_write_sms">SMS ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_labels_receive_sms">SMS ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_receive_emergency_sms">ଜରୁରୀକାଳୀନ ସନ୍ଦେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_receive_mms">MMS ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_receive_wap_push">WAP ପୁସ୍ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_send_sms">SMS ପଠାନ୍ତୁ</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_labels_modify_settings">ସେଟିଂସ୍ ରୂପାନ୍ତରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_draw_on_top">ଶୀର୍ଷରେ ଅଙ୍କନ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_access_notifications">ବିଜ୍ଞପ୍ତିଗୁଡିକ ଆକସେସ୍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_camera">କ୍ୟାମେରା</string>
+  <string name="app_ops_labels_record_audio">ଅଡିଓ ରେକର୍ଡ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_play_audio">ଅଡିଓ ବଜାନ୍ତୁ</string>
+  <string name="app_ops_labels_read_clipboard">କ୍ଲିପ ବୋର୍ଡ ପଠନ୍ତୁ</string>
+  <string name="app_ops_labels_modify_clipboard">କ୍ଲିପ ବୋର୍ଡ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_media_buttons">ମିଡିଆ ବଟନଗୁଡିକ</string>
+  <string name="app_ops_labels_audio_focus">ଅଡିଓ ଫୋକସ୍</string>
+  <string name="app_ops_labels_master_volume">ମାଷ୍ଟର୍ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_voice_volume">ଭଏସ୍‌ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_ring_volume">ରିଂ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_media_volume">ମିଡିଆ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_alarm_volume">ଆଲରାମ୍ ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_notification_volume">ସୂଚନା ଭଲ୍ୟୁମ୍</string>
+  <string name="app_ops_labels_bluetooth_volume">ବ୍ଲୁଟୁଥ୍ ଭଲ୍ୟୁମ</string>
+  <string name="app_ops_labels_keep_awake">ସଜାଗ ରଖନ୍ତୁ</string>
+  <string name="app_ops_labels_monitor_location">ଅବସ୍ଥାନ ମନିଟର୍</string>
+  <string name="app_ops_labels_monitor_high_power_location">ଉଚ୍ଚ ପାୱାର ଅବସ୍ଥାନ ମନିଟର୍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_get_usage_stats">ବ୍ୟବହାର ଅବସ୍ଥା ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_mute_unmute_microphone">ମାଇକ୍ରୋଫୋନ୍ ମ୍ୟୁଟ୍/ଅନମ୍ୟୁଟ୍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_toast_window">ଟୋଷ୍ଟ ଡିସ୍‍ପ୍ଲେ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_project_media">ପ୍ରୋଜେକ୍ଟ୍ ମିଡିଆ</string>
+  <string name="app_ops_labels_activate_vpn">VPN ସକ୍ରିୟ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_write_wallpaper">ୱାଲ୍‍ପେପର୍‍ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_labels_assist_structure">ସଂରଚନାରେ ସହାୟତା କରନ୍ତୁ</string>
+  <string name="app_ops_labels_assist_screenshot">ସ୍କ୍ରିନ୍‍ସଟ୍‍ରେ ରେ ସହାୟତା କରନ୍ତୁ</string>
+  <string name="app_ops_labels_read_phone_state">ଫୋନ୍‍ ‍ସ୍ଥିତି ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_add_voicemail">ଭଏସମେଲ୍ ଯୋଡନ୍ତୁ</string>
+  <string name="app_ops_labels_use_sip">SIP ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_labels_make_call">କଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_use_fingerprint">ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_labels_use_body_sensors">ବଡି ସେନ୍‍ସର୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_labels_read_cell_broadcasts">ସେଲ୍‍ ବ୍ର୍ଡ୍‍କାଷ୍ଟ ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_mock_location">ଅବ‍ସ୍ଥାନ ମକ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_read_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍‍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_labels_write_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍‍ରେ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_labels_turn_screen_on">ସ୍କ୍ରିନ୍‍ ଅନ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_get_accounts">ଆକାଉଣ୍ଟ୍ଗୁଡିକ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_toggle_bluetooth">ବ୍ଲୁଟୁଥ୍‍ ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_start_at_boot">ବୁଟ୍‍ ସମୟରେ ଆରଂଭ କ୍ରନ୍ତୁ</string>
+  <string name="app_ops_labels_toggle_nfc">NFC ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_toggle_mobile_data">ମୋବାଇଲ୍‍ ଡାଟା ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_labels_superuser">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">ଅନୁମୋଦିତ ହୋଇଛି</string>
+  <string name="app_ops_permissions_ignored">ଏଡାନ୍ତୁ</string>
+  <string name="app_ops_permissions_always_ask">ସର୍ବଦା ପଚାରନ୍ତୁ</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (ବ୍ୟବହୃତ<xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">ଅନୁମତି ଦିଆଯାଇଛି <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">ଅଗ୍ରାହ୍ୟ କରାଯାଇଛି <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">ଅନୁମତି ଦିଆଯାଇଛି <xliff:g id="count">%1$s</xliff:g>, denied <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">ଉପଭୋକ୍ତା ଆପ୍ଲିକେସନ୍‍ ଦେଖନ୍ତୁ</string>
+  <string name="app_ops_show_system_apps">ବିଲ୍‍ଟ୍‍-ଇନ୍‍ ଆପ୍ଲିକେସନ୍‍ ପ୍ରଦର୍ଶନ କରନ୍ତୁ</string>
+  <string name="app_ops_reset_counters">କାଉଣ୍ଟର ରି୍ସେଟ୍‍ ଅନୁମତି/ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ</string>
+  <string name="app_ops_reset_confirm_title">କାଉଣ୍ଟର ରି୍ସେଟ୍‍ ସୁନିଶ୍ଚିତ କରନ୍ତୁ</string>
+  <string name="app_ops_reset_confirm_mesg">ଆପଣ କାଉଣ୍ଟର ରିସେଟ୍‍ କରିବାକୁ ଚାହାନ୍ତି, ଏଥିରେ ଆପଣ ସୁନିଶ୍ଚିତ କି?</string>
+  <string name="ok">ଓକେ</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">ଡିଭାଇସ୍‍ ହୋଷ୍ଟ ନାମ</string>
+  <string name="unlock_scramble_pin_layout_title">ସ୍କ୍ରାମେବୁଲ୍‍ ଲେଆଉଟ୍‍</string>
+  <string name="unlock_scramble_pin_layout_summary">ଡିଭାଇସ୍‍ ଅ୍ନ୍‍ଲକ୍‍ କରିବା ସମୟରେ ସ୍କ୍ରାମେବୁଲ୍ PIN ଲେଆଉଟ୍‍</string>
+  <string name="button_pref_title">ବଟନ୍‍ଗୁଡିକ</string>
+  <string name="hardware_keys_power_key_title">ପାୱାର୍‍ ବଟନ୍‍</string>
+  <string name="hardware_keys_home_key_title">ହୋମ୍‍ ବଟନ୍‍</string>
+  <string name="hardware_keys_back_key_title">ପଛକୁ ଯିବା ବଟନ୍‍</string>
+  <string name="hardware_keys_menu_key_title">ମେନ୍ୟୁ ବଟନ୍</string>
+  <string name="hardware_keys_assist_key_title">ସ‍ନ୍ଧାନ ବଟନ୍‍</string>
+  <string name="hardware_keys_appswitch_key_title">ସମ୍ପ୍ରତି ବଟନ୍‍</string>
+  <string name="hardware_keys_camera_key_title">କ୍ୟାମେରା ବଟନ୍‍</string>
+  <string name="hardware_keys_volume_keys_title">ଭଲ୍ୟୁମ୍ ବଟନ୍‌</string>
+  <string name="hardware_keys_short_press_title">କମ୍‍ ଦବାଇବା କ୍ରିୟା</string>
+  <string name="hardware_keys_long_press_title">ଲମ୍ବା ଦବାଇବା କ୍ରିୟା</string>
+  <string name="hardware_keys_double_tap_title">ଦୁଇଥର ଟ୍ୟାପ୍‍ କ୍ରିୟା</string>
+  <string name="hardware_keys_action_nothing">କୌଣସି କାର୍ଯ୍ୟ କରା୍ଯିବ ନାହିଁ</string>
+  <string name="hardware_keys_action_menu">ଖୋଲିବା/ବନ୍ଦ କରିବା ମେନ୍ୟୁ</string>
+  <string name="hardware_keys_action_app_switch">ସମ୍ପ୍ରତି ଆପ୍ଲିକେସନ୍‍ ସ୍ୱିଚର୍‍</string>
+  <string name="hardware_keys_action_search">ସହାୟକ ସନ୍ଧାନ କରନ୍ତୁ</string>
+  <string name="hardware_keys_action_voice_search">ଭଏସ୍ ସନ୍ଧାନ</string>
+  <string name="hardware_keys_action_in_app_search">ଇନ୍‍-ପ୍‍ ସନ୍ଧାନ</string>
+  <string name="hardware_keys_action_launch_camera">କ୍ୟାମେରା ଉନ୍ମୋଚନ୍ଚ କରନ୍ତୁ</string>
+  <string name="hardware_keys_action_sleep">ସ୍କ୍ରିନ୍‍ ଅଫ୍‍ କରନ୍ତୁ</string>
+  <string name="hardware_keys_action_last_app">ଶେଷ ଆପ୍ଲିକେସନ୍‍</string>
+  <string name="camera_sleep_on_release_title">ସ୍କ୍ରିନ୍‍ ପିକ୍‍</string>
+  <string name="camera_sleep_on_release_summary">ବଟନ୍‍ ହେଲ୍ଡ ଡାଉନ୍‍ ହୋଇଥିବା ସମୟରେ ଏକ ଅଧା ଦ୍ବାଯାଇଥିବା ସ୍କ୍ରିନ୍‍ କେବଳ ଅନ୍‍ କରନ୍ତୁ</string>
+  <string name="camera_launch_title">କ୍ୟାମେରା ଉନ୍ମୋଚନ୍ଚ କରନ୍ତୁ</string>
+  <string name="camera_launch_summary">ଏକ ଲମ୍ବା ପ୍ରେସ୍‍ ଓ ରିଲିଜ୍ କରିବା ଦ୍ୱାରା କ୍ୟାମେରା ଲଞ୍ଚ କରନ୍ତୁ</string>
+  <string name="volbtn_music_controls_title">ପ୍ଲେବ୍ୟାକ୍‍ ନିୟନ୍ତ୍ରଣ</string>
+  <string name="volbtn_music_controls_summary">ସ୍କ୍ରିନ୍‍ ଅଫ୍‍ ଥିବା ସମୟରେ, ଭୋଲ୍ୟୁମ୍‍ କୀ ଲମ୍ବା ପ୍ରେସ୍‍ କରିବା ମ୍ୟୁଜିକ୍‍ ଟ୍ରାକ୍‍ ଆବଶ୍ୟକ କରିବ</string>
+  <string name="volbtn_cursor_control_title">କୀବୋର୍ଡ କର୍ସର୍‍ ନିୟନ୍ତ୍ରଣ</string>
+  <string name="volbtn_cursor_control_off">ଅକ୍ଷମ ହୋଇଛି</string>
+  <string name="volbtn_cursor_control_on">ଭୋଲ୍ୟୁମ୍‍ ଅପ୍‍/ଡାଉନ୍‍ କର୍ସର୍‍କୁ ବାମ/ଡାହାଣକୁ ନେଇଥାଏ</string>
+  <string name="volbtn_cursor_control_on_reverse">ଭୋଲ୍ୟୁମ୍‍ ଅପ୍‍/ଡାଉନ୍‍ କର୍ସର୍‍କୁ ବାମ/ଡାହାଣକୁ ନେଇଥାଏ</string>
+  <string name="power_end_call_title">କଲ୍‍ ଶେଷ କରନ୍ତୁ</string>
+  <string name="power_end_call_summary">ପାୱାର୍‍ ବଟନ୍‍ ଦବାଇବା ଦ୍ୱାରା ସମ୍ପ୍ରତି କଲ୍‍ ଶେଷ ହୋଇଯିବ</string>
+  <string name="swap_volume_buttons_title">ପୁନଃଆଭିମୁଖ୍ୟ</string>
+  <string name="swap_volume_buttons_summary">ସ୍କ୍ରିନ୍‍ ଘୂରାଯାଉଥିବା ସମ୍ୟରେ ଭୋଲ୍ୟୁମ୍‍ ବଟନ୍‍ ସ୍ୱାପ୍‍ କରନ୍ତୁ</string>
+  <string name="button_wake_title">ଡିଭାଇସ୍‍ ଉଠାନ୍ତୁ</string>
+  <string name="home_answer_call_title">କଲ୍‍ର ଉତ୍ତର ଦିଅନ୍ତୁ</string>
+  <string name="home_answer_call_summary">ହୋମ୍‍ ବଟନ୍‍ ଦବାଇବା ଦ୍ୱାରା ସମ୍ପ୍ରତି ଆସୁଥିବା କଲ୍‍ର ଉତ୍ତର ଦିଆଯିବ</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">ଆଡେପ୍ଟିଭ୍‍ ବ୍ୟାକ୍‍ଲାଇଟ୍‍</string>
+  <string name="adaptive_backlight_summary">ବ୍ୟବହାରିତା ବଜାୟ ରଖିଥିବା ସମୟରେ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ଅବଧି ବଢାଇବା ପାଇଁ ଡାଇନେମିକାଲି ଡିସ୍‍ପ୍ଲେର ବ୍ୟାକ୍‍ଲାଇଟ୍‍ର ଉଜ୍ଜ୍ୱଳତା ଆଡ୍‍ଜଅଷ୍ଟ କରନ୍ତୁ</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">ସୂର୍ଯ୍ୟାଲୋକ ବୃଧି</string>
+  <string name="sunlight_enhancement_summary">ଉଜ୍ଜ୍ୱଳ ସୂର୍ଯ୍ୟାଲୋକରେ ଡିସ୍‍ପ୍ଲେ ଉଜ୍ଜ୍ୱଳତା ଓ ରିଡେବିଲିଟି ବୃଧି କରନ୍ତୁ</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">ରଙ୍ଗ ବୃଧି</string>
+  <string name="color_enhancement_summary">ଡାଇନେମିକ୍‍ ଭାବେ ଡିସ୍‍ପ୍ଲେର ରଙ୍ଗ ବୃଧି କରନ୍ତୁ</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">ପୃଷ୍ଠପଟଆଲୋକ</string>
+  <string name="button_backlight_enabled">ବଟନ୍‍ ଆଲୋକିତ ହେବା</string>
+  <string name="keyboard_backlight_enabled">କୀବୋର୍ଡ ଆଲୋକିତ ହେବା</string>
+  <string name="button_backlight_seekbar_title">ବଟନ୍‍ ଉଜ୍ଜ୍ୱଳତା</string>
+  <string name="keyboard_backlight_seekbar_title">କୀବୋଡ୍‍ ଉଜ୍ଜ୍ୱଳତା</string>
+  <string name="backlight_timeout_title">ସମୟ ଆଲୋକିତ ହେବା</string>
+  <string name="backlight_timeout_unlimited">ଟର୍ନ୍ ଅଫ୍ କରନ୍ତୁ ନାହିଁ</string>
+  <string name="backlight_summary_disabled">ଅକ୍ଷମ ହୋଇଛି</string>
+  <string name="backlight_summary_enabled_with_timeout">ଏହା ପାଇଁ ସ‍କ୍ଷମ କରନ୍ତୁ <xliff:g id="timeout">%s</xliff:g></string>
+  <string name="backlight_summary_enabled">ସକ୍ଷମ ହୋଇଛି</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">ଅଙ୍ଗଭଙ୍ଗୀ୍ସ</string>
   <!-- Power menu -->
+  <string name="power_menu_title">ପାୱାର୍‍ ମେନ୍ୟୁ</string>
+  <string name="power_menu_reboot_title">ରିବୁଟ୍‍ ମେନ୍ୟୁ</string>
+  <string name="power_menu_screenshot_title">ସ୍କ୍ରିନସଟ୍</string>
+  <string name="power_menu_airplane_title">ବିମାନ ମୋଡ୍</string>
+  <string name="power_menu_users_title">ୟୁଜର୍‍ ସ୍ୱିଚର୍‍</string>
+  <string name="power_menu_settings_title">ସେଟିଂ ସର୍ଟକଟ୍</string>
+  <string name="power_menu_lockdown_title">ଡିଭାଇସ୍‍ ଲକ୍‍ଡାଉନ୍‍</string>
+  <string name="power_menu_bug_report_title">ବଗ୍ ରିପୋର୍ଟ୍</string>
+  <string name="power_menu_sound_title">ସାଉଣ୍ଡ ପ୍ୟାନେଲ୍‍</string>
+  <string name="power_menu_bug_report_disabled">ବିକାଶ ସେଟିଂସମୂହର ବେଗ୍ ରିପୋର୍ଟିଂ ଅକ୍ଷଅମ କରାଯାଇଛି</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ନେଭ୍‍ ବାର୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="disable_navkeys_summary">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ନେଭ୍‍ ବାର୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ ଓ ହାର୍ଡ୍‍ଓୟାର୍‍ ବଟନ୍‍ ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">ଶୋ‍ଇବା ପାଇଁ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <string name="double_tap_to_sleep_summary">ଡିସ୍‍ପ୍ଲେ ଅଫ୍‍ କରିବା ପାଇଁ ଷ୍ଟାଟସ୍‍ ବାର୍‍ରେ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">ର୍ଆକ୍ସିଡେଂଟାଲ୍‍ ୱେକ୍‍-ଅପ୍‍ ପ୍ରତିରୋଧ କରନ୍ତୁ</string>
+  <string name="proximity_wake_summary">ସ୍କ୍ରିନ୍‍କୁ ଜଗାଇବା ପୂର୍ବରୁ ନିକଟ ସେନସର୍ ପରୀକ୍ଷିତ କରନ୍ତୁ</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">ପ୍ଲଗ୍‍କୁ ଉଠାନ୍ତୁ</string>
+  <string name="wake_when_plugged_or_unplugged_summary">ଏକ ପାୱାର୍‍ ଉତ୍ସ ସଂଯୋଗ ବା ବିଛିନ୍ନ କରିବା ସମୟରେ ସ୍କ୍ରିନ୍‍ ଅନ୍‍ କରନ୍ତୁ</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">ନମୁନା</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">ଭୋଲ୍ୟୁମ୍‍ ଆଡ୍‍ଜଷ୍ଟ ସାଉଣ୍ଡ</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">ଭାଇବ୍ରେଟର୍‍ ତୀବ୍ରତା</string>
+  <string name="vibrator_warning">%1$Dରୁ ଅଧିକ ମୂଲ୍ୟ ପାଇଁ ଅନୁମତି ଦିଆଯାଇନାହିଁ</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">ରଙ୍ଗ କାଲିବ୍ରେସନ୍‍</string>
+  <string name="color_calibration_summary">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ କାଲିବ୍ରେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="color_red_title">ଲାଲ୍</string>
+  <string name="color_green_title">ସବୁଜ</string>
+  <string name="color_blue_title">ନୀଳ</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">ଗାମା କାଲିବ୍ରେସନ୍‍</string>
+  <string name="gamma_tuning_summary_head">ଗାମା ମୂଲ୍ୟ ଟ୍ୱିକ୍‍ କରନ୍ତୁ</string>
+  <string name="gamma_tuning_control_set_header">ଗୋ‍ଷ୍ଠୀ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">କଣ୍ଟ୍ରାଷ୍ଟ</string>
+  <string name="gamma_tuning_brightness">ଔଜଲ୍ୟତା</string>
+  <string name="gamma_tuning_saturation">ସମ୍ପୃକ୍ତି</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଉନ୍ମୋଚନ କରନ୍ତୁ</string>
+  <string name="headset_connect_player_summary">ହେଡ୍‍ସେଟ୍‍ ସଂଯୋଗ ହୋଇଥିବା ସମୟରେ ଡିଫଲ୍ଟ ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଲଞ୍ଚ କରନ୍ତୁ</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">ସ୍ୱତଃ ପ୍ରାଧାନ୍ୟତା</string>
+  <string name="auto_brightness_reset_button">ପୁନଃସେଟ୍</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">ପୁନରାବର୍ତ୍ତନ</string>
+  <string name="display_rotation_disabled">ଅକ୍ଷମ ହୋଇଛି</string>
+  <string name="display_rotation_unit">ଡିଗ୍ରୀ</string>
+  <string name="display_lockscreen_rotation_title">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ଘୂର୍ଣ୍ଣନ କରନ୍ତୁ</string>
+  <string name="display_rotation_category_title">ପୁନରାବର୍ତ୍ତନ ମୋଡ୍‍</string>
+  <string name="display_rotation_0_title">0 ଡିଗ୍ରୀ</string>
+  <string name="display_rotation_90_title">90 ଡିଗ୍ରୀ</string>
+  <string name="display_rotation_180_title">180 ଡିଗ୍ରୀ</string>
+  <string name="display_rotation_270_title">270 ଡିଗ୍ରୀ</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ</string>
+  <string name="screencolor_summary">ଘ୍ୟୁ, ସାଚୁରେସନ୍‍, କଂଟ୍ରାଷ୍ଟ ବା ତୀବ୍ରତା ଟ୍ଯୁନ୍‍ କରନ୍ତୁ</string>
+  <string name="custom_screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ କଷ୍ଟମ୍‍ କରନ୍ତୁ</string>
+  <string name="screencolor_save">ସଞ୍ଚୟ</string>
+  <string name="screencolor_cancel">ବାତିଲ</string>
+  <string name="restore_preview">ଡିଫଲ୍ଟ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
+  <string name="selectnewfile_menu">ଗ୍ୟାଲେରୀରୁ ନୂଆ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
+  <string name="selectfile_menu">ଗ୍ୟାଲେରୀରୁ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
+  <string name="restore_default_str">ପୁନଃସେଟ୍</string>
+  <string name="hue_str">ହ୍ୟୁ: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">ସାଚୁରେସନ୍‍: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">କଣ୍ଟ୍ରାଷ୍ଟ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">ତୀବ୍ରତା: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">ରିଡେବିଲିଟି ବୃଦ୍ଧି କରିବା ପାଇଁ ଓ ୱ୍ୱିଷ୍ଟ୍ରେନ୍‍ ହ୍ରାସ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଦିନର ସମୟ ଓ ଆମ୍ବିଏଣ୍ଟ ସର୍ତ୍ତାବଳି ଉପରେ ନିଭର କରି ଅପ୍ଟିମାଇଜ୍‍ କରନ୍ତୁ</string>
+  <string name="live_display_mode">ଡିସ୍‍ପ୍ଲେ ମୋଡ୍‍</string>
+  <string name="live_display_color_temperature_title">ରଙ୍ଗ ତାପମାତ୍ରା</string>
+  <string name="live_display_color_temperature_summary">ଦିନ: <xliff:g id="day_temperature">%1$d</xliff:g>K ରାତ୍ରି: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">ଦିନ</string>
+  <string name="live_display_night">ରାତ୍ରି</string>
+  <string name="live_display_outdoor_mode_title">ସ୍ୱତଃ ଆଉଟ୍‍ଡୋର୍‍ ମୋଡ୍‍</string>
+  <string name="live_display_outdoor_mode_summary">ଉଜ୍ଜ୍ୱଳ ସୂର୍ଯ୍ୟାଲୋକ ଅଧିନରେ ସ୍ୱତଃ ଉଜ୍ଜ୍ୱଳତା ଓ ସାଚୁରେସନ୍‍ ବଢାନ୍ତୁ</string>
+  <string name="live_display_low_power_title">ପାୱାର୍‍ ଅଧିଗ୍ରହଣ ହ୍ରାସ କରନ୍ତୁ</string>
+  <string name="live_display_low_power_summary">ଡିଗ୍ରେଡେସନ୍‍ ବିନା ସବୁଠାରୁ କମ୍‍ ପାୱାର୍‍ ଅଧିଗ୍ରହଣ ପାଇଁ ଡିସ୍‍ପ୍ଲେ ଆଡ୍‍ଜଷ୍ଟ କରନ୍ତୁ</string>
+  <string name="live_display_enhance_color_title">ରଙ୍ଗ ବୃଧି କରନ୍ତୁ</string>
+  <string name="live_display_enhance_color_summary">ଫ୍ଲେସ୍‍ ଟୋନ୍‍, ଦୃଶ୍ୟ, ଓ ଅନ୍ୟାନ୍ୟ ଚିତ୍ର ରଙ୍ଗ ଭାଇବ୍ରାନ୍ସ ବୃଧି କରନ୍ତୁ</string>
+  <string name="live_display_color_profile_title">ରଙ୍ଗ ପ୍ରୋଫାଇଲ୍‍</string>
+  <string name="live_display_color_profile_standard_title">ମାନାଙ୍କ</string>
+  <string name="live_display_color_profile_standard_summary">ସଠିକ୍‍ ରଙ୍ଗ ଓ ଉଜ୍ଜ୍ୱଳ ଧଳା</string>
+  <string name="live_display_color_profile_natural_title">ପ୍ରାକୃତିକ</string>
+  <string name="live_display_color_profile_natural_summary">ପ୍ରକୃତ ରଙ୍ଗ ଓ ଫ୍ଲେସ୍‍ ଟୋନ୍‍ଗୁଡିକ</string>
+  <string name="live_display_color_profile_dynamic_title">ଡାଇନେମିକ୍‍</string>
+  <string name="live_display_color_profile_dynamic_summary">ବର୍ଦ୍ଧିତ ରଙ୍ଗ ଓ ଉଜ୍ଜ୍ୱଳ ଧଳା</string>
+  <string name="live_display_color_profile_cinema_title">ସିନେମା</string>
+  <string name="live_display_color_profile_cinema_summary">ଭିଡିଓ ପାଇଁ ସଠିକ୍‍ ରଙ୍ଗ ପୁନଃପ୍ରସ୍ତୁତି</string>
+  <string name="live_display_color_profile_astronomy_title">ଆଷ୍ଟ୍ରୋନୋମି</string>
+  <string name="live_display_color_profile_astronomy_summary">ରାତ୍ରି ଭିଜନ୍‍ ରଖିବା ପାଇଁ ଗାଢ ଲାଲ୍‍</string>
+  <string name="live_display_color_profile_photography_title">ଫଟୋଗ୍ରାଫି</string>
+  <string name="live_display_color_profile_photography_summary">ଫଟୋଗୁଡିକ ପାଇଁ ସଠିକ୍‍ ରଙ୍ଗ ପୁନଃପ୍ରସ୍ତୁତି</string>
+  <string name="live_display_color_profile_basic_title">ସାଧାରଣ</string>
+  <string name="live_display_color_profile_basic_summary">ଡିସ୍‍ପ୍ଲେ ଅନ୍‍କାଲିବ୍ରେଟ୍‍ କରି ବ୍ୟବହାର କରନ୍ତୁ</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">ଆଇକନ୍‍ ଚୟନ</string>
+  <string name="ime_switcher_notify_summary">ଇନ୍‍ପୁଟ୍‍ ପଧତି ସିଲେକ୍ଟର ଆଇକନ୍‍ ଡିସ୍‍ପ୍ଲେ କରନ୍ତୁ</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">ହେଡ୍ସ୍‍ ଅପ୍‍</string>
+  <string name="summary_heads_up_enabled">ପପ୍‍-ଅପ୍‍ ନୋଟିଫିକେସନ୍‍ ସ‍କ୍ଷମ କରାଯାଇଛି</string>
+  <string name="summary_heads_up_disabled">ପପ୍‍-ଅପ୍‍ ନୋଟିଫିକେସନ୍‍ ସ‍କ୍ଷମ କରାଯାଇଛି</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">ସମସ୍ତ ଫାଇଲ୍‍ ପ୍ରକାର ଗ୍ରହଣ କରନ୍ତୁ</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">ଅଧିକ ସ୍ପର୍ଶ ତୀବ୍ରତା</string>
+  <string name="high_touch_sensitivity_summary">ଟଚ୍‍ସ୍କ୍ରିନ୍‍ ତୀବ୍ରତା ବଢାନ୍ତୁ ଯାହା ଫଳରେ ତାହା ଗ୍ଲୋବ୍ସ ପିଂଧିବା ସମୟରେ ବ୍ୟବହାର କରାଯାଇପାରିବ</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD ତୀବ୍ରତା</string>
+  <string name="dialog_title_lcd_density">LCD ତୀବ୍ରତା</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (ଡିଫଲ୍ଟ)</string>
+  <string name="restarting_ui">ଏହା ପୁନଃଆରଂଭ କରାଯାଉଛି UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">ଷ୍ଟାଇଲସ୍‍ ବ୍ୟବହାର କରିବା ସମ୍ୟ୍ରେ ଆଇକନ୍‍ ଦେଖାନ୍ରୁ</string>
+  <string name="stylus_icon_enabled_summary">ଷ୍ଟାଇଲସ୍‍ ସହିତ ହୋଭରିଂ ବା ଡ୍ରୈଂ କରୁଥିବା ସମୟରେ ପଏଣ୍ଟର ଆଇକନ୍‍ ଦେଖାନ୍ତୁ</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">ଷ୍ଟାଇଲସ୍‍ ଅଙ୍ଗଭଙ୍ଗୀ୍ସ</string>
+  <string name="category_spen_title">ଷ୍ଟାଇଲସ୍‍ ଅଙ୍ଗଭଙ୍ଗୀ୍ସ</string>
+  <string name="enable_subcat_title">ଷ୍ଟାଇଲସ୍</string>
+  <string name="enable_spen_title_head">ଅଙ୍ଗଭଙ୍ଗୀ୍ସ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="enable_spen_summary_head">ଷ୍ଟାଇଲସ୍ ବଟନ୍‍ ତଳକୁ ଧରି ରଖି ସ୍ୱାଇପ୍‍ ଅଙ୍ଗଭଙ୍ଗୀ୍ସ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="gestures_subcat_title">ଅଙ୍ଗଭଙ୍ଗୀ୍ସ</string>
+  <string name="gestures_left_spen_title_head">ବାମକୁ ସ୍ୱାଇପ୍‍ କରନ୍ର୍ତୁ</string>
+  <string name="gestures_right_spen_title_head">ଡାହାଣକୁ ସ୍ୱାଇପ୍‍ କରନ୍ର୍ତୁ</string>
+  <string name="gestures_up_spen_title_head">ଉପରକୁ ସ୍ୱାଇପ୍‍ କରନ୍ର୍ତୁ</string>
+  <string name="gestures_down_spen_title_head">ତଳକୁ ସ୍ୱାଇପ୍‍ କରନ୍ର୍ତୁ</string>
+  <string name="gestures_long_spen_title_head">ଧିକ ସମୟ ଦବାନ୍ତୁ</string>
+  <string name="gestures_double_spen_title_head">ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">କୌଣସି କାର୍ଯ୍ୟ କରା୍ଯିବ ନାହିଁ</string>
+  <string name="gestures_action_home">ହୋମ୍</string>
+  <string name="gestures_action_back">ବ୍ୟାକ୍</string>
+  <string name="gestures_action_menu">ମେନ୍ୟୁ</string>
+  <string name="gestures_action_search">ସନ୍ଧାନ ଇ‍ନ୍ଭୋକ୍‍ କରନ୍ତୁ</string>
+  <string name="gestures_action_recent">ସମ୍ପ୍ରତି ଆପ୍ଲିକେସନଗୁଡିକ</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s ସଂ‍ସ୍ଥାପିତ ହୋଇନାହିଁ</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">ଟଚ୍‍ସ୍କ୍ରିନ୍‍ ହୋଭରିଂ</string>
+  <string name="touchscreen_hovering_summary">ୱେବ୍‍ ବ୍ରାଉଜର୍‍, ରିମୋ‍ ଡେସ୍କଟପ୍ ଇତ୍ୟା୍ଦି‍ରେ ମାଉସ୍‍ ଭଳି ଆପଣଙ୍କୁ ସ୍କ୍ରିନ୍‍ରେ ହୋଭର୍‍ ପାଇଁ ଅନୁମତି ଦିଅ</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">ରିଙ୍ଗ୍‍ ଭୋଲ୍ୟୁମ୍‍ ବଢାଯାଉଛି</string>
+  <string name="increasing_ring_min_volume_title">ଭୋଲ୍ୟୁମ୍‍ ଆରଭ କରନ୍ତୁ</string>
+  <string name="increasing_ring_ramp_up_time_title">ସମୟ ରାମ୍ପ୍‍-ଅପ୍‍ କରନ୍ତୁ</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS ସହାୟକ ଡାଟା ଡାଉନ୍‍ଲ;ଓଡ୍‍</string>
+  <string name="lto_download_data_wifi_only_on">ଯେ କୌଣସି ନେଟ୍‍ୱାର୍କ୍‍ରେ</string>
+  <string name="lto_download_data_wifi_only_off">କେବଳ Wi\u2011Fi ନେଟ୍‍ୱାର୍କ୍‍ରେ</string>
+  <string name="volume_keys_control_ring_stream_title">ରିଙ୍ଗ୍ଟୋନ୍‍‍ ଭୋଲ୍ୟୁମ୍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="volume_keys_control_ring_stream_summary_on">ଭୋଲ୍ୟୁମ୍‍ କୀ ରିଙ୍ଗ୍ଟୋନ୍‍‍ ଭୋଲ୍ୟୁମ୍ ନିୟନ୍ତ୍ରଣ କ୍ରେ</string>
+  <string name="volume_keys_control_ring_stream_summary_off">ଭୋଲ୍ୟୁମ୍‍ କୀ ମିଡିଆ ଭୋଲ୍ୟୁମ୍ ନିୟନ୍ତ୍ରଣ କ୍ରେ</string>
+  <string name="category_calibration">କ୍ୟାଲିବ୍ରେସନ୍</string>
+  <string name="display_and_lights">ଡିସ୍‍ପ୍ଲେ ଓ ଲାଇଟ୍‍</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">ସାଉନ୍ଡ ଚାର୍ଜ କରାଯାଉଛି</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">ସକ୍ଷମ</string>
+  <string name="power_notifications_enable_summary">ଏକ ପାୱାର୍‍ ଉତ୍ସ ସଂଯୋଗ ବା ବିଛିନ୍ନ କରିବା ସମୟରେ ଏକ ସାଉଣ୍ଡ ପ୍ଲେ କରନ୍ତୁ</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">କମ୍ପନ</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">ନୋଟିଫିକେସନ୍‍ ସାଉଣ୍ଡ</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">ଶାନ୍ତ</string>
   <!-- Status bar -->
+  <string name="status_bar_title">ସ୍ଥିତି ଦଣ୍ଡିକା</string>
+  <string name="status_bar_toggle_brightness">ଔଜଲ୍ୟତା ନିୟନ୍ତ୍ରଣ</string>
+  <string name="status_bar_toggle_brightness_summary">ଷ୍ଟାଟସ୍‍ ବାର୍‍ ଚାରିପାଖରେ ସ୍ଲାଇଡ୍‍ କରିବା ଦ୍ୱାରା ଔଜଲ୍ୟତା ଆଡ୍‍ଜଷ୍ଟ କରନ୍ତୁ</string>
+  <string name="status_bar_notif_count_title">ବିଜ୍ଞପ୍ତି କାଉଣ୍ଟ ଦେ୍ଖାନ୍ତୁ</string>
+  <string name="status_bar_notif_count_summary">ବଳକା ଥିବା ନିର୍ଦ୍ଦେଶାବଳି ସଂଖ୍ୟା ପ୍ରଦର୍ଶନ କରନ୍ତୁ</string>
+  <string name="status_bar_quick_qs_pulldown_title">ତଳକୁ ଦ୍ରୁତ ବେଗରେ ତଳକୁ ଟାଣନ୍ତୁ</string>
+  <string name="status_bar_quick_qs_pulldown_summary">ଷ୍ଟାଟସ୍‍ ବାର୍ କଡରେ %1$s  ଦ୍ରୁତ ସେଟିଂସ୍‍କୁ ତଳକୁ ଟାଣିଆଣେ</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">ବାମ</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">ଡାହାଣ</string>
+  <string name="status_bar_quick_qs_pulldown_off">ଅଫ୍</string>
+  <string name="status_bar_quick_qs_pulldown_left">ବାମ</string>
+  <string name="status_bar_quick_qs_pulldown_right">ଡାହାଣ</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">ଘଣ୍ଟା ଶୈଳି</string>
+  <string name="status_bar_clock_style_right">ଡାହାଣ</string>
+  <string name="status_bar_clock_style_left">ବାମ</string>
+  <string name="status_bar_clock_style_center">ସେଣ୍ଟର୍</string>
+  <string name="status_bar_clock_style_hidden">ଲୁକ୍କାୟିତ</string>
+  <string name="status_bar_am_pm_title">AM/PM ଶୈଳି</string>
+  <string name="status_bar_am_pm_info">24-ଘଣ୍ଟା କ୍ଲକ୍‍ ସ‍କ୍ଷମ କରାଯାଇଛି</string>
+  <string name="status_bar_am_pm_normal">ସାଧାରଣ</string>
+  <string name="status_bar_am_pm_small">କ୍ଷୁଦ୍ର</string>
+  <string name="status_bar_am_pm_hidden">ଲୁକ୍କାୟିତ</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">ବ୍ୟାଟେରୀ ‍ସ୍ଥିତି ଶୈଳି</string>
+  <string name="status_bar_battery_style_icon_portrait">ଆଇକନ୍‍ ପୋର୍ଟେଟ୍‍</string>
+  <string name="status_bar_battery_style_icon_landscape">ଆଇକନ୍‍ ଲାଣ୍ଡ୍ସ୍କେପ୍‍</string>
+  <string name="status_bar_battery_style_circle">ସର୍କଲ୍‍</string>
+  <string name="status_bar_battery_style_text">ଟେକ୍ସଟ୍</string>
+  <string name="status_bar_battery_style_hidden">ଲୁକ୍କାୟିତ</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">ବ୍ୟାଟେରୀ ଶତକଡା</string>
+  <string name="status_bar_battery_percentage_default">ଲୁକ୍କାୟିତ</string>
+  <string name="status_bar_battery_percentage_text_inside">ଆଇକନ୍‍ ଭିତରେ</string>
+  <string name="status_bar_battery_percentage_text_next">ଆଇକନ୍‍ ପରେ</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">ଷ୍ଟାଟସ୍‍ ବାର୍‍ ଆଇକନ୍‍ଗୁଡିକ</string>
+  <string name="status_bar_icons_summary">କଣ୍ଟ୍ରୋଲ୍‍ ଯେଉଁଥିରେ ଷ୍ଟାଟସ୍‍ ବାର୍‍ ଦେଖାଯାଏ</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">ଅଙ୍ଗଭଙ୍ଗୀ୍‍ ସ୍ପର୍ଶ ସଂଚାଳନକ୍ରମ ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="edge_gesture_service_summary">ଆପ୍ଲିକେସନ୍‍ର ନେଭିଗେସନ୍‍ ଓ ଷ୍ଟାଟସ୍‍ ବାର୍‍ ଅଙ୍ଗଭଙ୍ଗୀ ପାଇଁ ସ୍ପର୍ଶ ସଂଚାଳନକ୍ରମ ପଠାନ୍ତୁ ନା୍ହିଁ</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">କେବେବି ନୁହେଁ</string>
+  <string name="keep_screen_on_debugging">USB ଡିବଗିଂ ସମୟରେ</string>
+  <string name="keep_screen_on_charging">ଚାର୍ଜ ହେବା ବେଳେ</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">ଗୋପନୀୟତା</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">ଡିଫଲ୍ଟ ଅନୁଯାୟୀ ସ‍କ୍ଷମ କରାଯାଇଛି</string>
+  <string name="privacy_guard_default_summary">ନୂଆ-ସଂ‍ସ୍ଥାପନ କରାଯାଇଥିବା ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ପାଇଁ ଡିଫଲ୍ଟ ଅନୁଯାୟୀ ସାମର୍ଥ୍ୟ କରନ୍ତୁ</string>
+  <string name="privacy_guard_manager_title">ପ୍ରାଇଭେସି ଗାର୍ଡ</string>
+  <string name="privacy_guard_manager_summary">ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ଡାଟା ଅକ୍‍ସେସ୍‍ ପାଇଁ ଯେଉଁ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକୁ ଅନୁମତି ଦିଆଯାଇଛି, ପ୍ରିଚାଳନା କରନ୍ତୁ</string>
+  <string name="privacy_guard_no_user_apps">କୌଣସି ଆପ୍ଲିକେସନ୍‍ ସଂ‍ସ୍ଥାପନ ହୋଇନାହିଁ</string>
+  <string name="privacy_guard_help_title">ସହାୟକ</string>
+  <string name="privacy_guard_reset_title">ପୁନଃସେଟ୍</string>
+  <string name="privacy_guard_reset_text">ଅନୁମତି ରିସେଟ୍‍ କରିବେ କି?</string>
+  <string name="privacy_guard_help_text">ସାଧାର୍ଣଭାବେ ଟ୍ୟାପ୍‍ କରି ଏହି ସ୍କ୍ରିନ୍‍ରେ ଆପଣ କେଉଁ ପ୍ରାଇଭେସି ଗାର୍ଡକୁ ସକ୍ରିୟ କରାଯିବ ଆପଣ ଚୟନ କ୍ରିପାରିବେ। ଚୟନ କରାଯାଇଥିବା ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ଆପଣଙ୍କ ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ଯଥା ସମ୍ପର୍କ, ସଂଦେଶ ବା କଲ୍‍ ସୂଚୀ ଆକ୍‍ସେସ୍‍ କରିବା ପାଇଁ ସ‍କ୍ଷମ ହେବେ ନାହିଁ ଏକ ଆପ୍ଲିକେସନ୍‍ର ପ୍ରବେଶକୁ ଲମ୍ବା ଦବାଇବା ଦ୍ୱାରା ଏହାର ଆପ୍ଲିକେସନ୍‍ ବିବରଣୀ ସ୍କ୍ରିନ୍‍ ଖୋଲିହୋଇଥାଏ।\n\nବିଲ୍ଟ-ଇନ୍‍ ଆ୍ପ୍ଲିକେସନ୍‍ଗୁଡିକ ଡିଫଲ୍ଟ ଭାବେ ଦେଖାଯାଇପାରିବ ନାହିଁ ମାତ୍ର ତାହାର ନିର୍ଦ୍ଦିଷ୍ଟ ମେନ୍ୟୁ ବିକଳ୍ପରେ ଚୟନ କରି ଏହା ଦେଖାଯାଇପାରିବ।</string>
+  <string name="privacy_guard_manager_show_system_apps">ବିଲ୍‍ଟ୍‍-ଇନ୍‍ ଆପ୍ଲିକେସନ୍‍ ପ୍ରଦର୍ଶନ କରନ୍ତୁ</string>
+  <string name="privacy_guard_advanced_settings_title">ଅଗ୍ରୀମ</string>
+  <string name="privacy_guard_notification_title">ବିଜ୍ଞପ୍ତିଗୁଡିକ ଦେଖାନ୍ତୁ</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">ପ୍ୟାଟର୍ଣ୍ଣ ତ୍ରୁଟି ଦେଖାନ୍ତୁ</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">ପାଟର୍ଣ୍ଣ ଡ୍ଟ୍ସ ଦେଖାନ୍ତୁ</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">ସିଧାସଳଖ ପାସ୍‍ୱାର୍ଡ ଏଣ୍ଟ୍ରି ଦେଖାନ୍ତୁ</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">ସିଧାସଳଖ ପାଟର୍ଣ୍ଣ ଦେଖାନ୍ତୁ</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">ସିଧାସଳଖ PIN ପ୍ରବେଶ ଦେଖାନ୍ତୁ</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">ମ୍ୟୁଜିକ୍‍ ଭିଜୁଆଲାଇଜର୍‍ ପ୍ରଦର୍ଶନ କରନ୍ତୁ</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">ଦ୍ରୁତ ସେଟିଂସ୍‍ ଟାଇଲ୍‍ ଦ୍ୱାରା ଅ‍କ୍ଷମ କରାଯାଇଛି</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ସ‍କ୍ଷମ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ସ‍କ୍ଷମ କରାଯାଇଛି!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">ବ୍ୟାଟେରୀ ସେଭର୍‍ ଥ୍ରେସୋଲ୍ଡ</string>
+  <string name="battery_saver_summary">ସଂଚାଳନକାରିତା କମାନ୍ତୁ ଓ ବ୍ୟାକ୍‍ଗ୍ରାଉଣ୍ଡ ଡାଟା ସୀମାରେ ରଖନ୍ତୁ</string>
+  <string name="battery_saver_summary_unavailable">ଚାର୍ଜିଂ ସମୟରେ ଉପଲବ୍ଧ ହୁଏ ନାହିଁ</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">ପ୍ରତି ପ୍ଲିକେସନ୍‍ ପ୍ରୋଫାଇଲ୍‍ ପାଇଁ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="autoperf_summary">ବିଭିନ୍ନ ଆପ୍ଲିକେସନ୍‍ ପାଇଁ ସ୍ୱତଃ ଉପଯୁକ୍ତ ବ୍ୟାଟେରୀ ଚୟନ କାର୍ନ୍ତୁ</string>
+  <string name="perf_profile_title">ବ୍ୟାଟେରୀ ମୋଡ୍‍</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">ବୁଟ୍‍ ସମୟରେ ଆପ୍ଲିକେସନ୍‍ ଆରଂଭ ହୋଇ୍ଛି</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">ନୋଟିଫି୍କିସନ୍‍ ଟୋନ୍‍</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">ଆଭାନ୍ସଡ୍‍ ରିବୁଟ୍‍</string>
+  <string name="advanced_reboot_summary">ଅନ୍‍ଲକ୍‍ ହୋଇଥିବା ସମୟରେ, ରିକଭରି, ବୁଟ୍‍ଲୋଡର୍‍ ପାଇଁ ରିବୁଟିଂ ପାଇଁ ବା ଏକ ସଫ୍ଟ ବୁଟ୍‍ କରିବା ପାଇଁ ପାୱାର୍‍ ମେନ୍ୟୁରେ ବିକଳ୍ପଗୁଡିକ ଅନ୍ତଭୁକ୍ତ କରନ୍ତୁ</string>
+  <string name="category_interface">ଇଂଟରଫେସ୍‍</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">ବୃଧି ହୋଇଥିବା ଡେସ୍କଟପ୍‍</string>
+  <string name="expanded_hide_nothing">କିଛି ଲୁଚାନ୍ତୁ ନାହିଁ</string>
+  <string name="expanded_hide_status">ସ୍ଥିତି ଦଣ୍ଡିକା ଲୁଚାନ୍ତୁ</string>
+  <string name="expanded_hide_navigation">ନେଭିଗେସନ୍‍ ବାର୍‍ ଲୁଚାନ୍ତୁ</string>
+  <string name="expanded_hide_both">ଉଭୟକୁ  ଲୁଚାନ୍ତୁ</string>
+  <string name="expanded_nothing_to_show">ବ‍ର୍ଧିତ ‍ସ୍ଥିତିରେ ଏକ କଷ୍ଟମ୍‍ ପ୍ରରି ଆପ୍ଲିକେସନ୍‍ ପାଇଁ ବିନ୍ୟାସ ଯୋଗ କରିବା ପାଇଁ, ଅଫ୍‍ ପୋଜିସନ୍‍ ପାଇଁ \’ସମସ୍ତ ପାଇଁ ବ‍ର୍ଧିତ\’ ସେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="expanded_enabled_for_all">ସମସ୍ତ ପାଇଁ ବ‍ର୍ଧିତ</string>
+  <string name="expanded_desktop_style">ବ‍ର୍ଧିତ ଡେସ୍କଟପ୍‍ ଶୈଳି</string>
+  <string name="expanded_desktop_style_description">ଏକ ଡିଫଲ୍ଟ ବ‍ର୍ଧିତ ଡେସ୍କଟପ୍‍ ଶୈଳି ଚୟନ କରନ୍ତୁ</string>
+  <string name="expanded_desktop_title">ବ‍ର୍ଧିତ ଡେସ୍କଟପ୍‍ ବିକଳ୍ପ</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">ଆପ୍ଲିକେସନ୍‍ ବ୍ୟାକ୍‍ ବଟନ୍‍କୁ ହଟାନ୍ତୁ</string>
+  <string name="kill_app_longpress_back_summary">ବ୍ୟାକ୍‍ ବଟନ୍‍କୁ ଲମ୍ବା ଦ୍ସ୍ବାଇବା ଦ୍ୱାରା ଫୋର୍‍ଗ୍ରାଉଣ୍ଡ ଆପ୍ଲିକେସନ୍ ହଟାନ୍ତୁ</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">ସମ୍ପ୍ରତି ମେନ୍ୟୁରେ ସନ୍ଧାନ ବାର୍‍ ଦେଖାନ୍ତୁ</string>
+  <string name="keywords_recents_show_searchbar">ସମ୍ପ୍ରତି ସମ୍ପ୍ରତି ଅ‍କ୍ଷମ ସକ୍ଷମ ଦେଖାନ୍ତୁ ଲୁଚାନ୍ତୁ ସନ୍ଧାନ ବାର୍‍ ସନ୍ଧାନବାର୍</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">ଭଏସ୍‍ ୱେକ୍‍ଅପ୍‍</string>
+  <string name="voice_wakeup_retrain_title">ଆପଣଙ୍କ ସ୍ୱରକୁ ପୁନଃତାଲିମ୍‍ ଦିଅନ୍ତୁ</string>
+  <string name="voice_wakeup_activity_title">ଉନ୍ମୋଚନ କରିବା ପାଇଁ ସକ୍ରିୟତା</string>
+  <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">ଏକ ଡାଇ୍ରେକ୍ଟ ଡାଏଲ୍‍ କଣ୍ଟାକ୍ଟ ଚୟନ କରିବା ପାଇଁ, ସ୍ୱର ୱେକ୍‍ଅପ୍‍ର ଫୋନ୍‍ କଲ୍‍ ଅନୁମତି ପାଇବା ଆବଶ୍ୟକ।</string>
+  <string name="picker_activities">କାର୍ଯ୍ୟକଳାପଗୁଡିକ</string>
+  <string name="select_custom_app_title">କଷ୍ଟମ୍‍ ଆପ୍ଲିକେସନ୍‍ ଚୟନ କରନ୍ତୁ</string>
+  <string name="select_custom_activity_title">କଷ୍ଟମ୍‍ ସଂଚାଳନ ଚୟନ କରନ୍ତୁ</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">ଅବରୁ‍ଦ୍ଧ କରାଯାଇଥିବା କଲର୍‍ ତାଲିକା</string>
+  <string name="blacklist_edit_dialog_title">ଅବରୁ‍ଦ୍ଧ କରାଯାଇଥିବା ଫୋନ୍‍ ନମ୍ବର ସଂପାଦନା କରନ୍ତୁ</string>
+  <string name="blacklist_prefs">ସେଟିଂସ୍</string>
+  <string name="blacklist_button_delete">ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="blacklist_empty_text">ଆପଣଙ୍କର କୌଣସି ଅବରୁ‍ଦ୍ଧ କରାଯାଇଥିବା ନମ୍ବର ନାହିଁ ଯୋଗ କରିବା (+) ବଟନ୍‍ ସ୍ପର୍ଶ କରି ଏକ ପ୍ରବେଶ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="blacklist_disabled_empty_text">କୌଣସି ନମ୍ବରରୁ କଲ୍‍ ବା ସଂଦେଶକୁ ଅବରୋଧ କରିବା ପାଇଁ, ଅବ୍ରୋଧ ହୋଇଥିବା କଲର୍‍ ତାଲିକା ସ‍କ୍ଷମ କରନ୍ତୁ।</string>
+  <string name="blacklist_summary_disabled">ଅକ୍ଷମ ହୋଇଛି</string>
+  <string name="blacklist_summary">ଆପଣ ଅବରୁ‍ଦ୍ଧ ହୋଇଥିବା କଲର୍‍ ତାଲିକାରେ ଥିବା ଫୋନ୍‍ ନମ୍ବରରୁ ଆସୁଥିବା କଲ୍‍ ବା ସଂଦେଶ ପ୍ରାପ୍ତ କରିବେ ନାହିଁ</string>
+  <string name="blacklist_notify">ବିଜ୍ଞପ୍ତିଗୁଡିକ ଦେଖାନ୍ତୁ</string>
+  <string name="blacklist_private_numbers_title">ବ୍ୟକ୍ତିଗତ ନମ୍ଵର୍</string>
+  <string name="blacklist_private_numbers_summary_disabled">ବ୍ୟକ୍ତିଗତ ନମ୍ବରରୁ କଲ୍‍ଗୁଡିକ ଅବରୋଧ କରନ୍ତୁ ନାହିଁ</string>
+  <string name="blacklist_private_numbers_summary">ବ୍ୟକ୍ତିଗତ ନମ୍ବରରୁ ଆସୁଥିବା <xliff:g id="type">%s</xliff:g> ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="blacklist_unknown_numbers_title">ଅଜ୍ଞାତ ନମ୍ବର</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">ସମ୍ପ୍ରକ ତାଲିକାରେ ନଥିବା ନମ୍ବରଗୁଡିକରୁ କଲ୍‍ ବା ସଂଦେଶ ଅବରୋଧ କରନ୍ତୁ ନାହିଁ</string>
+  <string name="blacklist_unknown_numbers_summary">ସମ୍ପ୍ରକ ତାଲିକାରେ ନଥିବା <xliff:g id="type">%s</xliff:g>  ନମ୍ବରଗୁଡିକରୁ ଆସୁଥିବା %s ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="blacklist_summary_type_calls_only">କ୍ଲ୍‍ଗୁଡିକ</string>
+  <string name="blacklist_summary_type_messages_only">ସଂଦେଶଗୁଡିକ</string>
+  <string name="blacklist_summary_type_calls_and_messages">କ୍ଲ୍‍ଗୁଡିକ ଓ ସଂଦେଶଗୁଡିକ</string>
+  <string name="blacklist_regex_title">ୱାଇଲ୍ଡକାର୍ଡ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="blacklist_regex_summary">. କୁ ୱାଇଲ୍ଡକାର୍ଡ ଭାବେ ଓ * ଦୋହରାଇବା ପାଇଁ ବ୍ୟବହାର କରନ୍ତୁ ଉଦାହରଣ 123 ସହିତ ଆରଂଭ ହେଉଥିବା ନମ୍ବରଗୁଡିକୁ 123.*  ଅବରୋଧ କରେ ଓ 123 ଥିବା ନମ୍ବରକୁ .*123.* ଅବରୋଧ କରେ</string>
+  <string name="blacklist_policy_block_calls">ଆଗମନ କଲ୍ ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="blacklist_policy_block_messages">ଆଗମନ ସଂଦେଶ ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="blacklist_bad_number_add">ଅବରୋଧ ହୋଇଥିବା କଲର୍‍ ତାଲିକାରେ ଅବୈଧ ଫୋନ୍‍ ନମ୍ବର ଯୋଗ କରିବାରେ ଅ‍କ୍ଷମ</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">ନମ୍ବର ଅପସାରଣ କରନ୍ତୁ</string>
+  <string name="remove_blacklist_entry">ଅବରୋଧ ହୋଇଥିବା ଫୋନ୍‍ ନମ୍ବରକୁ ଆପଣ ଅପସାରଣ କରିବାକୁ ଚାହାଁନ୍ତି କି?</string>
+  <string name="select_contact">ସମ୍ପର୍କ ଚୟନ କରନ୍ତୁ</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">ସୁର‍କ୍ଷାରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <string name="sms_security_check_limit_title">SMS ସଂଦେଶ ସୀମା</string>
+  <string name="sms_security_check_limit_summary">ଆପ୍ଲିକେସନ୍‍ 1 ମିନିଟ୍‍ରେ ସୁନିଶ୍ଚିତତା ଆବଶ୍ୟକ ନକରି %d ସଂଦେଶ ପଠାଇପାରିବ</string>
+  <string name="sms_security_check_limit_summary_none">ଆପ୍ଲିକେସନ୍ଗୁଡିକୁ‍  ସୁନିଶ୍ଚିତତା ଆବଶ୍ୟକ ନକରି କୌଣସି ସଂଦେଶ ପଠାଇବା ପାଇଁ ଅନୁମତି ଦିଆଯାଇ ନାହିଁ</string>
+  <string name="sms_security_check_limit_none">କିଛି ନୁହେଁ</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$S ଯୋଗ କରାଯାଇଛି</string>
+  <string name="spam_last_blocked_title">ଶେଷ ଥର %1$s ଅବରୋଧ କରାଯାଇଛି</string>
+  <string name="block_notifications_title">ନିର୍ଦ୍ଦେଶାବଳି ଫିଲ୍‍ଟର୍‍ କର୍ନ୍ତୁ</string>
+  <string name="block_notifications_summary">ଏଡାଇଦିଆଯାଥିବା ନିର୍ଦ୍ଦେଶାବଳି ଓ ଫିଲ୍‍ଟର୍‍କୁ ପରିଚାଳନା କରନ୍ତୁ</string>
+  <string name="no_filters_title">କୌଣସି ଫିଲ୍‍ଟର୍‍ ସେଟ୍‍ ହୋଇନାହିଁ</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">ସିଆନୋଜେନ୍ମୋଡ‍ ପରିସଂଖ୍ୟାନ</string>
+  <string name="anonymous_statistics_summary">ଅଜ୍ଞାତ ପ୍ରିସଂଖ୍ୟାନ ରିପୋର୍ଟିଂ ପାଇଁ ବିକଳ୍ପ ଦେଇ ସିଆନୋଜେନ୍ମୋଡ‍ ଉନ୍ନତ କରିବାରେ ସାହାଯ୍ୟ କରନ୍ତୁ</string>
+  <string name="anonymous_statistics_warning_title">ବିଷୟରେ</string>
+  <string name="anonymous_statistics_warning">ଡିଭାଇସ୍‍ ମଧ୍ୟରେ ନିର୍ଦିଷ୍ଟ ସଂ‍ସ୍ଥାପନ ଟ୍ରାକ୍‍ କରିବା ନିମନ୍ତେ ସିଆନୋଜେନ୍ମୋଡ‍ ପରିସଂଖ୍ୟାନ ପାଇଁ ବିକଳ୍ପ ଦେଇ ସିଆନୋଜେନ୍ମୋଡର ଡେଭେଲୋପରମାନଙ୍କୁ ଅଣ-ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ସବ୍‍ମିଟ୍‍ କରିବା ପାଇଁ ଅନୁମତି ଦେବ ସବ୍‍ମିଟ୍‍ ହୋଇଥିବା ସୂଚନା ଅଜ୍ଞାତ ପରିଚାୟକଙ୍କୁ ଅନ୍ତଭୁକ୍ତ କରିବ, ଯାହା ଆପଣଙ୍କ ଗୋପନୀୟ ବା ବ୍ୟକ୍ତିଗତ ତଥ୍ୟରେ ବାଧା ସୃଷ୍ଟି କରିବ ନାହିଁ। ଡାଟା୍ରତି ରିବୁଟ୍‍ ସମୟରେ ସବ୍‍ମିଟ୍‍ ହୁଏ।\n\nଯେଉଁ ଡାଟା ସବ୍‍ମିଟ୍‍ ହୁଏ  ତାହାର ଉଦାହରଣ ସ୍ୱରୂପ, ପ୍ରିଭ୍ୟୁ ଡାଟା ଉପରେ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="enable_reporting_title">ରିପୋର୍ଟିଂ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="preview_data_title">ଡାଟା ପ୍ରିଭ୍ୟୁ କରନ୍ତୁ</string>
+  <string name="view_stats_title">ପରିସଂଖ୍ୟାନ ଦେଖନ୍ତୁ</string>
+  <string name="anonymous_learn_more">ଅଧିକ ଜାଣନ୍ତୁ</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">ନିର୍ଦ୍ଦିଷ୍ଟ ID</string>
+  <string name="preview_device_title">ଡିଭାଇସ୍</string>
+  <string name="preview_version_title">ସଂସ୍କରଣ</string>
+  <string name="preview_country_title">ଦେଶ</string>
+  <string name="preview_carrier_title">ବାହାକ</string>
+  <string name="stats_collection_title">ପରିସଂଖ୍ୟାନ ସଂଗ୍ରହ</string>
+  <string name="stats_collection_summary">ଯେତେବେଳେ ସ‍କ୍ଷମ କରାଯାଏ, ମେଟ୍ରିକ୍ସ ସଂଗ୍ରହ ପାଇଁ ଅନୁମତି ଦିଏ</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">ପାଟର୍ଣ୍ଣ ପୁନଃସେଟ୍ କରନ୍ତୁ</string>
+  <string name="lockpattern_settings_reset_summary">ପାଟର୍ଣ୍ଣ ଲକ୍‍ ରି୍ସେଟ୍‍ କରିବା ପାଇଁ ପ୍ରାଥମିକ ଇମେଲ୍‍ ଆକାଉଣ୍ଟ ଓ ସଂଯୋଜିତ ପାସ୍‍ୱାର୍ଡ ପ୍ରବେଶ କରନ୍ତୁ</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">ପୁନଃସେଟ୍</string>
+  <string name="menu_hidden_apps_reset_lock">ପାଟର୍ଣ୍ଣ ଲକ୍‍ ପୁନଃସେଟ୍ କରନ୍ତୁ</string>
+  <string name="protected_apps">ସୁରଷିତ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ</string>
+  <string name="protected_apps_summary">ଏକ ସୁର‍କ୍ଷିତ ଲକ୍‍ ପଛରେ ଯେଉଁ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ଲୁ୍ଚିଛି ତାହା ପରିଚାଳନା କରନ୍ତୁ</string>
+  <string name="saving_protected_components">ଉପାଦାନ ‍ସ୍ଥିତି ସଂରକ୍ଷଣ କରାଯାଉ୍ଛି\u2026</string>
+  <string name="pa_login_username_hint">ଉପଭୋକ୍ତାଙ୍କ ନାମ (ଇମେଲ୍)</string>
+  <string name="pa_login_password_hint">ପାସୱାର୍ଡ୍</string>
+  <string name="pa_login_submit_button">ସାଇନ୍‌ ଇନ୍ କରନ୍ତୁ</string>
+  <string name="pa_login_checking_password">ଆକାଉଣ୍ଟ ଯାଞ୍ଚ କରୁଛି\u2026</string>
+  <string name="pa_login_incorrect_login">ଲଗ୍‍ଇନ୍‍ ଭୂଲ୍‍ ଥିଲା</string>
+  <string name="pa_pattern_or_fingerprint_header">ଅନ୍‍ଲକ୍‍ କରିବା ପାଇଁ ପ୍ୟାଟର୍ଣ୍ଣ ଆଙ୍କିବାକୁ ହେବ ବା ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ବ୍ୟବହାର କରିବାକୁ ହେବ</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">ଯୋଗଦାନକାରୀ</string>
+  <string name="contributors_cloud_loading_message">ଯୋଗଦାନକାରୀ ଡାଟା ଲୋଡ୍‍ ହେଉଛି\u2026</string>
+  <string name="contributors_cloud_failed_message">ଯୋଗଦାନକାରୀ ଡାଟା ଲୋଡ୍ କରିହେବ ନାହିଁ</string>
+  <string name="contributor_info_menu">ଯୋଗଦାନକାରୀସୂଚନା</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>ନାମ:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>ଶ୍ରଦ୍ଧାନାମ:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>ପ୍ରତିଶ୍ରୁତି ଦିଅନ୍ତି:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">ଯୋଗଦାନକାରୀ ସୂଚନା</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Total contributors:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Total commits:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Last update:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ସାଉଣ୍ଡ</string>
+  <string name="notification_manager">ବିଜ୍ଞପ୍ତିଗୁଡିକ</string>
+  <string name="lockscreen_settings">ଲକ୍ ସ୍କ୍ରିନ୍</string>
+  <string name="category_lights">ଲାଇଟ୍‍ଗୁଡିକ</string>
+  <string name="category_volume">ଭଲ୍ୟୁମ୍</string>
+  <string name="category_vibrate">କମ୍ପନ</string>
+  <string name="category_misc">ବିବିଧ</string>
+  <string name="title_general">ସାଧାରଣ</string>
+  <string name="advanced">ଅଗ୍ରୀମ</string>
+  <string name="link_volume_option_title">ରିଙ୍ଗ୍‍ଟୋନ୍‍ ଓ ନୋଟିଫିକେସନ୍‍ଽ ଭୋଲ୍ୟୁମ୍‍ଗୁଡିକୁ ଲିଙ୍କ୍‍ କରନ୍ତୁ</string>
+  <string name="lcd_density_prompt_message">ଅଣ-ମାନାଙ୍କିତ DPIରେ କିଛି ଆପ୍ଲିକେସନ୍‍ ସଂଚାଳନ ନ କରିପାରେ।\n\nଏହା ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ପୁନଃଆରଂଭ କରିଦେବ।</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ଫୋନ୍‍ ନମ୍ବର</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">ନକଲି APN</string>
+  <string name="duplicate_apn_error_message">ଏହି APN ଆଗରୁ ବିଦ୍ୟମାନ ରହିଛି | ପରିବର୍ତ୍ତନ ପାରାମିଟର୍.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+  <string name="sim_disabled">ଅ‍କ୍ଷମ କରାଯାଇଛୀ</string>
+  <string name="sim_missing">ନାହିଁ ବା ତ୍ରୁଟିଯୁକ୍ତ ହୋଇଛି</string>
+  <string name="sim_enabler_need_disable_sim">SIM କାର୍ଡ ଅ‍କ୍ଷମ ହୋଇଯିବ। ଆପଣ ଜାରିରଖିବାକୁ ଚାହାନ୍ତି କି?</string>
+  <string name="sim_enabler_will_disable_sim_title">ସତର୍କତା</string>
+  <string name="sim_enabler_need_switch_data_service">ଏହି SIM ଅ‍କ୍ଷମ ହୋ‍ଇଯିବ ଓ SIM <xliff:g id="slotid">%1$s</xliff:g> ଡାଟା ସେବା ପାଇଁ ବ୍ୟବହୃତ ହେବ। ଜାରି ରଖିବା ପାଇଁ ଚାହୁଁଥିବା ବିଷୟେର ଆପଣ ସୁନିଶ୍ଚିତ କି?</string>
+  <string name="sim_enabler_airplane_on">ବିମାନ ମୋଡ୍‍ ଅନ୍‍ ଥିବା ସମୟରେ ସଂଚାଳନ କରିବାରେ ଅ‍କ୍ଷମ</string>
+  <string name="sim_enabler_in_call">କଲ୍‍ରେ ଥିବା ସମୟରେ ସଂଚାଳନ କରିବାରେ ଅ‍କ୍ଷମ</string>
+  <string name="sim_enabler_both_inactive">ସମସ୍ତ SIM କାର୍ଡ ଅ‍କ୍ଷମ କରିହେବ ନାହିଁ</string>
+  <string name="sim_enabler_enabling">ସକ୍ରିୟ କରିବା\u2026</string>
+  <string name="sim_enabler_disabling">ଅଣସକ୍ରିୟ କରିବା\u2026</string>
+  <string name="sub_activate_success">SIM ସକ୍ରିୟ ହୋଇଛି।</string>
+  <string name="sub_activate_failed">ଆକ୍ଟିଭେସନ୍‍ ବିଫଳ ହୋଇଛି।</string>
+  <string name="sub_deactivate_success">SIM ଡିଆକ୍ଟିଭେଟ୍‍ ହୋଇଛି।</string>
+  <string name="sub_deactivate_failed">ଡିଆକ୍ଟିଭେସନ୍‍ ବିଫଳ ହୋଇଛି।</string>
+  <string name="primary_sub_select_title">ଡିଫଲ୍ଟ 3G/LTE ସବ୍‍ସ୍କ୍ରିପ୍ସନ୍‍</string>
+  <string name="select_sim_card">SIM କାର୍ଡ୍ ଚୟନ କରନ୍ତୁ</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d ‍ସ୍ଥିତି</string>
+  <string name="sim_card_lock_settings_title">SIM %d ଲକ୍‍ ସେଟିଂସମୂହ</string>
+  <string name="sim_card_summary_empty">SIM ଭର୍ତ୍ତି କରାଯାଇନାହିଁ</string>
+  <string name="sim_mobile_network_settings_category_title">ମୋବାଇଲ୍‍ ନେଟ୍‍ୱାର୍କ୍‍ ସେଟିଂସମୂହ</string>
+  <string name="sim_mobile_network_settings_title">SIM %d ସେଟିଂସମୂହ</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">ରିମେଣ୍ଡରଗୁଡିକ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ଇଭେଣ୍ଟସମୂହ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">ଚୟନ କରାଯାଥିବା କଲର୍‍ଗୁଡିକ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">ଚୟନ କରାଯାଥିବା ସଂଦେଶଗୁଡିକ</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">ହେଡ: %1$s W/kg</string>
+  <string name="maximum_body_level">ବଡି: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">ମଡେଲ୍: %1$s</string>
+  <string name="ic_code_full">IC %1$s</string>
+  <string name="sim_ringtone_title">SIM %d ରିଙ୍ଗ୍‍ଟୋନ୍‍</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">ଆପ୍ଲିକେସନ୍‌:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">ଶେଷ ଥର ପାଇଁ ବ୍ୟବହୃତ:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">ବ୍ୟବହାର ସମୟ:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">ଏହା ଆପଣଙ୍କ ଟାବ୍‍ଲେଟ୍‍‍ରେ  <b>ଆଭ୍ୟନ୍ତରୀଣ ଷ୍ଟୋରେଜ୍‍</b>, ଥିବା ସମସ୍ତ ଡାଟା ଆଭ୍ୟନ୍ତରୀଣ ଷ୍ଟୋରେଜ୍‍, ଅନ୍ତଭୁକ୍ତ କରି:\n\n ଲିଭାଇଦେବ<li>ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ଆକାଉଣ୍ଟ୍ଗୁଡିକ</li>\n<li>ସିଷ୍ଟମ୍ ଏବଂ ଆପ୍ଲିକେସନ୍‌ ଡାଟା ଏବଂ ସେଟିଂସ୍</li>\n<li>ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପ୍ଲିକେସନଗୁଡିକ</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">ଏହା ଆପଣଙ୍କ ଫୋନ୍‍ରେ ଥିବା ସମସ୍ତ ଡାଟା <b>ଆଭ୍ୟନ୍ତରୀଣ ଷ୍ଟୋରେଜ୍‍</b>, ଅନ୍ତଭୁକ୍ତ କରି:\n\n ଲିଭାଇଦେବ<li>ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ଆକାଉଣ୍ଟ୍ଗୁଡିକ</li>\n<li>ସିଷ୍ଟମ୍ ଏବଂ ଆପ୍ଲିକେସନ୍‌ ଡାଟା ଏବଂ ସେଟିଂସ୍</li>\n<li>ଡାଉନଲୋଡ୍ ହୋଇଥିବା ଆପ୍ଲିକେସନଗୁଡିକ</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">ବ୍ୟକ୍ତିଗତ ଡାଟା ଓ ଆପ୍ଲି୍କେସନ୍‍ଗୁଡିକ</string>
+  <string name="factory_reset_instructions_summary">ଏହା ଏହି ଡିଭାଇସ୍‍ରେ ଥିବା ଆପଣଙ୍କର ସମସ୍ତ ଆକାଉଣ୍ଟ, ଆପ୍ଲିକେସନ୍‍, ଆପ୍ଲି୍କେସନ୍‍ ଡାଟା, ଓ ସିଷ୍ଟମ୍‍ ସେଟିଂସମୂହ ଲିଭାଇଦେବ</string>
+  <string name="factory_reset_personal_content">ବ୍ୟକ୍ତିଗତ ବିଷୟବସ୍ତୁ</string>
+  <string name="factory_reset_erase_stored_content">ସଂର‍କ୍ଷିତ ବିଷୟବସ୍ତୁ ଲିଭାଇଦିଅନ୍ତୁ।</string>
+  <string name="factory_reset_erase_stored_content_summary">ଏହି ଡିଭାଇସ୍‍ରେ ଥିବା ସଙ୍ଗୀତ ଓ ଫଟୋ, ଭିଡିଓ, ଓ ଅନ୍ୟ ଉପଭୋକ୍ତା ଡାଟା ଲିଭାଇଦିଅନ୍ତୁ।</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">ଏହି ଡିଭାଇସ୍‍ରେ ଥିବା ସଙ୍ଗୀତ ଓ ଫଟୋ, ଭିଡିଓ, ଓ ଅନ୍ୟ ଉପଭୋକ୍ତା ଡାଟା ଲିଭାଇଦିଅନ୍ତୁ। \N\nଡିଭାଇସ୍‍<b>ଡିଭାଇସ୍‍ ଏନ୍‍କ୍ରିପ୍ସନ୍‍ କାରଣରୁ ବିଷୟବସ୍ତୁ ସଂରକ୍ଷଣ କରାଯାଇପାରିବ ନାହିଁ।</b></string>
+  <string name="factory_reset_erase_sd_card">SD କାର୍ଡ ଫର୍ମାଟ୍ କରିବେ</string>
+  <string name="factory_reset_erase_sd_card_summary">ସଙ୍ଗୀତ ଓ ଫଟୋଗୁଡିକ ଅନ୍ତଭୁକ୍ତ କରି SD କାର୍ଡ୍ରେ ଥିବା ସମସ୍ତ ତଥ୍ୟ ଲିଭାଇଦିଅନ୍ତୁ</string>
+  <string name="factory_reset_warning_text_reset_now">ବର୍ତ୍ତମାନ ରିସେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="factory_reset_warning_text_message">ଆପଣଙ୍କ ସମସ୍ତ କାଉଣ୍ଟ, ଆପ୍ଲିକେସନ୍‍ ଡଟା, ଓ ସିଷ୍ଟମ୍‍ ସେଟିଂସମୂହ‍ ଏହି ଡିଭାଇସ୍‍ରି ଅପସାରଣ କରାଯିବ। ଏହା ରିଭର୍ସ କରାଯାଇପାରିବ ନାହିଁ।</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">ଅନ୍ୟାନ୍ୟ</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi ହଟସ୍ପଟ୍ ଟାଇମ ଆଉଟ୍</string>
+  <string name="hotstpot_inactivity_timeout_never">କେବେବି ନୁହେଁ</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 ମିନିଟ୍‌</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 ମିନିଟ୍</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 ମିନିଟ୍</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">ପୋର୍ଟେବୁଲ୍ Wi\u2011Fi ହଟସ୍ପଟ୍ ନେଭର ଟାଇମ ଆଉଟ୍</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">ପୋର୍ଟେବୁଲ୍ Wi\u2011Fi ହଟସ୍ପଟ୍ ନେଭର ଟାଇମ ଆଉଟ୍ ଆଫଟର୍ <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ଲକ୍‍ସ୍କ୍ରିନ୍‍ ସକ୍ଷମ କରନ୍ତୁ</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ସ‍କ୍ଷମ ଏବଂ କନଫିଗର୍ କରନ୍ତୁ</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">ସେଟିଂସ୍</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ଉପଲବ୍ଧ ଲାଇଭ୍ ଲକ୍ ସ୍କ୍ରିନ୍ ଦେଖିବା ପାଇଁ ଲାଇଭ ଲକ୍ ସ୍କ୍ରିନ୍ କୁ ଅନ କରନ୍ତୁ.</string>
+  <string name="interruptions_ignore_while_media_title">ଅଡିଓ ଡକିଂ ଅବରୋଧ କରନ୍ତୁ</string>
+  <string name="interruptions_ignore_while_media_summary">ଏକ ବିଜ୍ଞପ୍ତି ଆସିବା ସମୟରେ ମିଡିଆ ପ୍ଲେବ୍ୟାକ୍‍ ଭୋଲ୍ୟୁମ୍‍ ହ୍ରାସ କରନ୍ତୁ ନାହିଁ</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">ସିଆନୋଜେନ୍‍ମୋଡ୍‍ ଲିଗାଲ୍‍</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">ପରିସଂଖ୍ୟାନ ରିସେଟ୍‍ କରନ୍ତୁ</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">ବ୍ୟାଟେରୀ ଇତିହାସ ପରିସଂଖ୍ୟାନ ରିସେଟ୍‍ ହେବାକୁ ଯାଉଛି</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ଡକ୍‍ ବ୍ୟାଟେରୀ ଉପ‍ସ୍ଥିତ ନାହିଁ</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">ଡକ୍‍ ACରେ ଚାର୍ଜିଂ</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">ଡକ୍‍ USBରେ ଚାର୍ଜିଂ</string>
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 16adba8..00d3097 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -981,4 +981,14 @@
   <string name="interruptions_ignore_while_media_summary">Nie zmniejszaj głośności odtwarzanych mediów, po odebraniu powiadomienia</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Informacje prawne CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Resetuj statystyki</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statystyki baterii zostaną zresetowane</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Bateria doku nie jest pokazywana</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Ładowanie dokiem AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Ładowanie dokiem USB</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 3d149bd..d5d5172 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -979,4 +979,14 @@
   <string name="interruptions_ignore_while_media_summary">Não reduz o volume de reprodução de mídia quando chega uma notificação</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Licença CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Redefinir estatísticas</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Estatísticas do histórico da bateria será redefinida</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Bateria do dock não está disponível</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Carregamento via dock AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Carregamento via dock USB</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index dc3d3e7..c71e217 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -153,7 +153,7 @@
   <string name="profile_lockmode_policy_disabled_summary">Esta opção de perfil está desativada pela política do administrador do dispositivo</string>
   <string name="profile_lockmode_insecure_summary">Não pedir a palavra-passe nem PIN</string>
   <string name="profile_lockmode_disabled_summary">Desativar o ecrã de bloqueio</string>
-  <string name="profile_airplanemode_title">Modo de avião</string>
+  <string name="profile_airplanemode_title">Modo de voo</string>
   <string name="profile_brightness_title">Brilho do ecrã</string>
   <string name="profile_brightness_override_summary">Definido para %1$d%%</string>
   <string name="profile_brightness_override_checkbox_label">Substituir brilho</string>
@@ -505,7 +505,7 @@
   <string name="power_menu_title">Menu ligar/desligar</string>
   <string name="power_menu_reboot_title">Menu de reinicialização</string>
   <string name="power_menu_screenshot_title">Capturar ecrã</string>
-  <string name="power_menu_airplane_title">Modo de avião</string>
+  <string name="power_menu_airplane_title">Modo de voo</string>
   <string name="power_menu_users_title">Mudar utilizador</string>
   <string name="power_menu_settings_title">Atalho das definições</string>
   <string name="power_menu_lockdown_title">Bloqueio do dispositivo</string>
@@ -768,7 +768,7 @@
   <string name="notification_ringtone_title_cm">Toque de notificação</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Reinício avançado</string>
-  <string name="advanced_reboot_summary">Quando desbloqueado, inclui opções no menu ligar/desligar para reiniciar o dispositivo em modo de recuperação, bootloader ou executar uma reinicialização suave</string>
+  <string name="advanced_reboot_summary">Quando desbloqueado, incluir opções no menu ligar/desligar para reiniciar o dispositivo em modo de recuperação, bootloader ou executar uma reinicialização suave</string>
   <string name="category_interface">Interface</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Ecrã expandido</string>
@@ -788,11 +788,11 @@
   <string name="recents_show_searchbar">Mostrar a barra de pesquisa no menu de aplicações recentes</string>
   <string name="keywords_recents_show_searchbar">recente recentes desativar ativar mostrar ocultar pesquisa barra barra de pesquisa</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Ativação por voz</string>
+  <string name="voice_wakeup_settings_title">Ativação por Voz</string>
   <string name="voice_wakeup_retrain_title">Treinar a sua voz</string>
   <string name="voice_wakeup_activity_title">Atividade a executar</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">O Voice Wakeup necessita de ter permissões para realizar chamadas de forma a poder selecionar um contacto direto.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">A Ativação por Voz necessita de permissões para realizar chamadas de forma a poder selecionar um contacto direto.</string>
   <string name="picker_activities">Atividades</string>
   <string name="select_custom_app_title">Selecione uma aplicação personalizada</string>
   <string name="select_custom_activity_title">Selecione uma atividade personalizada</string>
@@ -841,7 +841,7 @@
   <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
   <string name="anonymous_statistics_summary">Ajude a melhorar a CyanogenMod optando por ativar o envio do relatório de estatísticas anónimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas CyanogenMod vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da CyanogenMod para rastrear instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
+  <string name="anonymous_statistics_warning">Optar pelo envio de estatísticas CyanogenMod vai permitir que dados não pessoais sejam transmitidos aos desenvolvedores da CyanogenMod, para rastrearem instalações nos dispositivos. As informações submetidas incluem um identificador único, que não compromete a sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo dos dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
@@ -905,7 +905,7 @@
   <string name="sim_enabler_need_disable_sim">O cartão SIM será desativado. Quer continuar?</string>
   <string name="sim_enabler_will_disable_sim_title">Atenção</string>
   <string name="sim_enabler_need_switch_data_service">Este cartão SIM será desativado e o cartão SIM <xliff:g id="slotid">%1$s</xliff:g> será usado para os serviços de dados. Tem a certeza que deseja continuar?</string>
-  <string name="sim_enabler_airplane_on">Não é possível executar a operação enquanto o Modo de Avião estiver ativado.</string>
+  <string name="sim_enabler_airplane_on">Não é possível executar a operação enquanto o modo de voo estiver ativado.</string>
   <string name="sim_enabler_in_call">Não é possível executar a operação enquanto estiver numa chamada.</string>
   <string name="sim_enabler_both_inactive">Não é possível desativar todos os cartões SIM</string>
   <string name="sim_enabler_enabling">A ativar\u2026</string>
@@ -983,4 +983,14 @@
   <string name="interruptions_ignore_while_media_summary">Não diminuir o volume de reprodução de multimédia quando chega uma notificação</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Licença CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Repor estatísticas</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">As estatísticas da bateria vão ser reiniciadas</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">A bateria da doca não está presente</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Carregar na doca AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Carregar através da doca USB</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 4d8bba0..8eea86e 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -313,10 +313,12 @@
   <string name="app_ops_summaries_activate_vpn">activează VPN</string>
   <string name="app_ops_summaries_write_wallpaper">scrie tapet</string>
   <string name="app_ops_summaries_read_phone_state">citește starea telefonului</string>
+  <string name="app_ops_summaries_use_sip">utilizează SIP</string>
   <string name="app_ops_summaries_make_call">apelează</string>
   <string name="app_ops_summaries_use_fingerprint">utilizează amprentă digitală</string>
   <string name="app_ops_summaries_use_body_sensors">utilizează senzorii corporali</string>
   <string name="app_ops_summaries_read_cell_broadcasts">citește trasmisiunile din rețea</string>
+  <string name="app_ops_summaries_mock_location">locație simulată (falsă)</string>
   <string name="app_ops_summaries_read_external_storage">citește stocare externă</string>
   <string name="app_ops_summaries_write_external_storage">scrie stocare externă</string>
   <string name="app_ops_summaries_turn_screen_on">pornește ecranul</string>
@@ -339,6 +341,7 @@
   <string name="app_ops_labels_modify_calendar">Modifică calendarul</string>
   <string name="app_ops_labels_wifi_scan">Scanare Wi-Fi</string>
   <string name="app_ops_labels_notification">Notificare/Toast</string>
+  <string name="app_ops_labels_cell_scan">Scanare celulă</string>
   <string name="app_ops_labels_call_phone">Apelare</string>
   <string name="app_ops_labels_read_sms">Citește SMS</string>
   <string name="app_ops_labels_write_sms">Scrie SMS</string>
@@ -834,6 +837,7 @@
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <string name="duplicate_apn_error_title">APN dublat</string>
   <string name="duplicate_apn_error_message">Acest APN există deja. Renunțați sau modificați parametrii.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> este <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">dezactivat</string>
   <string name="sim_missing">lipsă sau defect</string>
   <string name="sim_enabler_need_disable_sim">Cartela SIM va fi dezactivată. Doriți să continuați?</string>
@@ -874,6 +878,7 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">SIM %d ton de apel</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicație:</string>
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -899,4 +904,13 @@
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
   <string name="cmlicense_title">Juridic CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Resetare statistici</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Istoricul bateriei va fi resetat</string>
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Încărcare în stativ AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Încărcare prin stativ USB</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 97edb1c..a3b3349 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -166,6 +166,7 @@
   <string name="toggleData">Мобильные данные</string>
   <string name="toggleSync">Автосинхронизация</string>
   <string name="toggle2g3g4g">Предпочитаемый тип сети</string>
+  <string name="toggle2g3g4g_msim">Предпочитаемый тип сети (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Код региона Wi-Fi</string>
@@ -905,7 +906,7 @@
   <string name="sim_missing">отсутствует или неисправна</string>
   <string name="sim_enabler_need_disable_sim">SIM-карта будет отключена. Продолжить?</string>
   <string name="sim_enabler_will_disable_sim_title">Внимание</string>
-  <string name="sim_enabler_need_switch_data_service">Текущая SIM-карта будет отключена, а для передачи данных будет использоваться SIM <xliff:g id="slotid">%1$s </xliff:g>. Продолжить?</string>
+  <string name="sim_enabler_need_switch_data_service">Текущая SIM-карта будет отключена, а для передачи данных будет использоваться SIM-карта <xliff:g id="slotid">%1$s </xliff:g>. Продолжить?</string>
   <string name="sim_enabler_airplane_on">Выполнение операции невозможно при включённом режиме полета.</string>
   <string name="sim_enabler_in_call">Выполнение операции невозможно во время вызова.</string>
   <string name="sim_enabler_both_inactive">Невозможно отключить все SIM-карты</string>
@@ -984,4 +985,14 @@
   <string name="interruptions_ignore_while_media_summary">Не снижать громкость воспроизведения мультимедиа при получении уведомлений</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Политика конфиденциальности CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Сброс статистики</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">История использования батареи будет удалена</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Нет батареи док-станции</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Зарядка от адаптера док-станции</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Зарядка через USB док-станции</string>
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 57c679e..12e3640 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -553,4 +553,9 @@
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod නීතිමය තොරතුරු</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index dcad667..6f1a1c4 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -870,4 +870,14 @@
   <string name="interruptions_ignore_while_media_summary">Neznižovať hlasitosť pri prehrávaní médií po doručení upozornenia</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Právne informácie CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Obnoviť štatistiky</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Štatistiky histórie batérie budú obnovené</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Batéria doku nie je prítomná</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Nabíjanie pomocou napájania doku</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 98c8450..e33abb8 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -558,7 +558,7 @@
   <string name="display_rotation_title">Sukanje</string>
   <string name="display_rotation_disabled">Onemogočeno</string>
   <string name="display_rotation_unit">stopinj</string>
-  <string name="display_lockscreen_rotation_title">Zasukaj zaslon za zaklepanje</string>
+  <string name="display_lockscreen_rotation_title">Zasukaj zaklenjen zaslon</string>
   <string name="display_rotation_category_title">Načini sukanja</string>
   <string name="display_rotation_0_title">0 stopinj</string>
   <string name="display_rotation_90_title">90 stopinj</string>
@@ -754,8 +754,8 @@
   <string name="lockscreen_visualizer_title">Prikaži predočilnik glasbe</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Onemogočeno s ploščico hitrih nastavitev</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary">Tapnite, da omogočite zaslon za zaklepanje</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Zaslon za zaklepanje omogočen!</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Tapnite, da omogočite zaklenjen zaslon</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Zaklepanje zaslona omogočeno!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Prag ohranjevalnika baterije</string>
   <string name="battery_saver_summary">Zmanjšaj zmogljivost in omeji podatke v ozadju</string>
@@ -790,8 +790,8 @@
   <string name="recents_show_searchbar">Prikaži isk. vrs. v meniju nedavnih</string>
   <string name="keywords_recents_show_searchbar">nedavno nedavni onemogoči omogoči prikaži skrij iskalna vrstica iskanje</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Bujenje z glasom</string>
-  <string name="voice_wakeup_retrain_title">Ponovno nauči moj glas</string>
+  <string name="voice_wakeup_settings_title">Glasovno bujenje</string>
+  <string name="voice_wakeup_retrain_title">Ponovno priuči moj glas</string>
   <string name="voice_wakeup_activity_title">Dejavnost za zagon</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
   <string name="voice_wakeup_needs_dial_permission_warning">Glasovno bujenje potrebuje dovoljenje za klice za izbiro stika za neposreden klic.</string>
@@ -889,7 +889,7 @@
                  <b>Zadnja posodobitev:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Zvoki</string>
   <string name="notification_manager">Obvestila</string>
-  <string name="lockscreen_settings">Zaslon za zaklepanje</string>
+  <string name="lockscreen_settings">Zaklepanje zaslona</string>
   <string name="category_lights">Lučke</string>
   <string name="category_volume">Glasnost</string>
   <string name="category_vibrate">Vibriranje</string>
@@ -976,15 +976,25 @@
   <string name="hotstpot_inactivity_timeout_summary_text">Časovna omejitev prenosne dostopne točke Wi\u2011Fi čez <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
-  <string name="live_lock_screen_title">Živi zaslon za zaklepanje</string>
+  <string name="live_lock_screen_title">Živi zaklenjen zaslon</string>
   <!-- Live lock screen summary -->
-  <string name="live_lock_screen_summary">Omogočite in nastavite živi zaslon za zaklepanje</string>
+  <string name="live_lock_screen_summary">Omogočite in nastavite živi zaklenjen zaslon</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Nastavitve</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="live_lock_screen_settings_disabled_prompt">Za ogled razpoložljivih živih zaslonov za zaklepanje omogočite žive zaslone za zaklepanje.</string>
+  <string name="live_lock_screen_settings_disabled_prompt">Za ogled razpoložljivih živih zaklenjenih zaslonov omogočite žive zaklenjene zaslone.</string>
   <string name="interruptions_ignore_while_media_title">Prepreči zvočno izognitev</string>
   <string name="interruptions_ignore_while_media_summary">Ne zmanjšaj glasnosti predvajanja predstavnosti, ko prispe obvestilo</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Pravna obvestila CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Ponastavi statistiko</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistika zgodovine baterije bo ponastavljena</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Baterija postaje ni prisotna</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Poln. z nap. postaje</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Poln. preko USB-ja pos.</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index c163cc1..d07700e 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -984,4 +984,14 @@
   <string name="interruptions_ignore_while_media_summary">Немој утишати јачину репродукције медија када обавештење пристигне</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod лиценца</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Поништавање статистике</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Статистика историје батерије ће бити ресетована</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Усидрена батерија није присутна</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Пуњење на доку AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Пуњење преко USB дока</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 02596d7..1b11604 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -986,4 +986,14 @@ inkluderar en unik identifikation,
   <string name="interruptions_ignore_while_media_summary">Minska inte ljudstyrkan för media när en avisering tas emot</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod Juridik</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Återställ statistik</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistiken för batterihistorik kommer att återställas</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dockningsstationsbatteri hittades inte</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Laddar i dockningsstationens AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Laddar över dockningsstationens USB</string>
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-ta-rIN/cm_plurals.xml b/res/values-ta-rIN/cm_plurals.xml
index add908d..d3355a8 100644
--- a/res/values-ta-rIN/cm_plurals.xml
+++ b/res/values-ta-rIN/cm_plurals.xml
@@ -20,4 +20,8 @@
     <item quantity="one"><xliff:g id="seconds">%d</xliff:g> வினாடி</item>
     <item quantity="other"><xliff:g id="seconds">%d</xliff:g> வினாடிகள்</item>
   </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">ஒருமுறை</item>
+    <item quantity="other">%d முறை</item>
+  </plurals>
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 5fd19c8..d595c92 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">வளர்ச்சி அமைப்புகளை செயல்படுத்துவதற்கு <xliff:g id="step_count">%1$d</xliff:g>  படி தொலைவில் நீங்கள் இப்போது உள்ளீர்கள்.</item>
+    <item quantity="other">வளர்ச்சி அமைப்புகளை செயல்படுத்துவதற்கு <xliff:g id="step_count">%1$d</xliff:g>  படிகள் தொலைவில் நீங்கள் இப்போது உள்ளீர்கள்.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">நீங்கள் வளர்ச்சி அமைப்புகளை செயல்படுத்தினீர்கள்!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">தேவை இல்லை, நீங்கள் முன்பே வளர்ச்சி அமைப்புகளை செயல்படுத்துவிட்டீர்கள்.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">மேம்பாட்டு கருவிகள்</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">வளர்ச்சி குறுக்குவழி</string>
+  <string name="development_shortcut_summary">சமீபத்திய ஆப்ஸ் பட்டியலில் ஆப் நிர்வாக குறுக்குவழிகளை செயல்படுத்துக</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">மூல அணுகல்</string>
+  <string name="root_access_warning_title">மூல அணுகலை அனுமதிக்கவா?</string>
+  <string name="root_access_warning_message">பயன்பாடுகளுக்கு மூல அணுகலை அனுமதிப்பது மிகவும் ஆபத்தானது மற்றும் கணினியின் பாதுகாப்பை சமரசம் செய்யக்கூடும்!</string>
+  <string name="root_access_none">முடக்கப்பட்டது</string>
+  <string name="root_access_apps">பயன்பாடுகள் மட்டும்</string>
+  <string name="root_access_adb">ADB மட்டும்</string>
+  <string name="root_access_all">ஆப்கள் மற்றும் ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">CyanogenMod பதிப்பு</string>
+  <string name="mod_version_default">தெரியாதது</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">கருவி மாதிரி</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">சாதனத்தின் பெயர்</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API நிலை</string>
+  <string name="mod_api_level_default">தெரியாதது</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">கட்டிய தேதி</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">CyanogenMod புதுப்பித்தல்கள்</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Cyanogen மீட்டலை புதுப்பி</string>
+  <string name="update_recovery_summary">சிஸ்டம் புதுப்பித்தல்களுடன் மீட்டலை புதுப்பி</string>
+  <string name="update_recovery_on_warning">அறிவிப்பு: இந்த அம்சம் செயல்படுத்தப்படும்போது, நீங்கள் நிருவிய மீட்டல் தற்போது இயங்கும் OS பதிப்பிலே உள்ளடங்கிய ஒன்றினால் பதிலீடு செய்யப்படும். \n\n உங்கள் மீட்டல் உங்கள் சிஸ்டத்திற்கு புதுப்பித்தல்களுடன் புதுப்பிக்கப்படும், பிற்கால பதிப்புகளின் இணக்கத்தை உறுதிசெய்ய உதவும். \n\n இந்த அம்சத்தை செயல்படுத்த விரும்புகிறீர்களா?</string>
+  <string name="update_recovery_off_warning">எச்சரிக்கை: இந்த அம்சம் முடக்கப்படும்போது, நீங்கள் நிருவிய மீட்டல் தற்போதுள்ள OS புதுப்பித்தல்களோடு புதுப்பிக்கப்படாது. \n\n நாள்பட்ட அல்லது தனிப்பயனாக்கப்பட்ட மீட்டல் பதிப்புகளோடு பிற்கால OS புத்துப்பித்தல்கள் நிருவப்படாது. \n\n நீங்கள் உண்மையாகவே இந்த அம்சத்தை முடக்க விரும்புகிறீர்களா?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">தீம்கள்</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">மணியோசை பயன்முறை</string>
+  <string name="ring_mode_normal">இயல்பு</string>
+  <string name="ring_mode_vibrate">அதிர்வு</string>
+  <string name="ring_mode_mute">ஒலிதடு</string>
+  <string name="settings_reset_button">மீட்டமை</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">சிஸ்டம் சுயவிவரங்கள்</string>
+  <string name="profiles_add">சேர்</string>
+  <string name="profile_menu_delete">நீக்கு</string>
+  <string name="profile_settings_title">சுயவிவரம்</string>
+  <string name="profile_empty_list_profiles_off">சிஸ்டம் சுயவிவரங்களை கட்டமைக்கவும் பயன்படுத்தவும், சுயவிவரங்களை ஆன் செய்க.</string>
+  <string name="profile_trigger_configure">ட்ரிகரை கட்டமைக்கவும்</string>
+  <string name="profile_write_nfc_tag">NFC குறியில் எழுது</string>
+  <string name="profile_write_touch_tag">எழுதுவதற்கு டேக்கை தொடுக</string>
+  <string name="profile_write_success">டேக் வெற்றிகரமாக எழுதப்பட்டது</string>
+  <string name="profile_write_failed">டேக் எழுதுதல் தோல்வியுற்றது!</string>
+  <string name="profile_selected">சுயவிவரம் தேர்ந்தெடுக்கப்பட்டது: %1$s</string>
+  <string name="profile_nfc_text">ஒரு NFC டேகிற்கு ஒரு சுயவிவரத்தை எழுதுவது சுயவிவரத்தை டேக் செய்ய தட்டுவதற்கு அனுமதிக்கிறது இரண்டாம் முறை தட்டுதல் முன்னர் தேர்ந்தெடுத்த சுயவிவரத்தை தேர்ந்தெடுக்கும்.</string>
+  <string name="profile_unknown_nfc_tag">அறியாத சுயவிவரம்</string>
+  <string name="profile_add_nfc_text">இந்த NFC டேக் ஒரு அறியாத சுயவிவரத்தை குறீப்பிடுகின்றது இந்த NFC டேகை தற்போதுள்ள சுயவிவரம் ஒன்றோடு இணைத்தல் அந்த சுயவிவரத்தை எதிர்காலத்தில் தேர்ந்தெடுக்க அனுமதிக்கும்.</string>
+  <string name="profile_select">சுயவிவரத்தை தேர்ந்தெடுக்கவும்</string>
+  <string name="profile_remove_dialog_message">சுயவிவரம் %1$sஐ நீக்கவா?</string>
+  <string name="profile_populate_profile_from_state">சுயவிவரத்தை தற்போதைய கருவி அமைப்புகளை பயன்படுத்தி கட்டமைக்கவும்?</string>
+  <string name="profile_menu_fill_from_state">தற்போதைய கருவி அமைப்புகளை இறக்குமதிசெய்க</string>
+  <string name="profile_remove_current_profile">தற்போதைய சுயவிவரத்தை நீக்க முடியாது!</string>
+  <string name="profile_app_group_category_title">அறிவுறுத்தல் மீறுகின்றது</string>
+  <string name="profile_app_group_item_instructions">குழுக்களை சேர்க்கவும் அல்லது நீக்கவும்</string>
+  <string name="profile_app_group_item_instructions_summary">இந்த சுயவிவரத்திற்கு அறிவுறுத்தல் மீறுதல் ஆப் குழுக்களை சேர்க்கவும் அல்லது நீக்கவும்</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">துவக்கு</string>
+  <string name="profile_entries_off">அணை</string>
+  <string name="profile_entries_no_override">மீறுதல் இல்லை</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">பெயர்</string>
+  <string name="new_profile_name">&lt;new profile&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">மறுபெயரிடு</string>
+  <string name="rename_dialog_message">ஒரு புதிய பெயரை உள்ளிடுக</string>
+  <string name="duplicate_appgroup_name">டூப்லிகேட் ஆப் குழு பெயர்!</string>
+  <string name="rename_dialog_hint">சுயவிவர பெயரை உள்ளிடுக</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">மீட்டமை</string>
+  <string name="profile_reset_message">அனைத்து பயனர் உருவாக்கிய சுயவிவரங்களையும் பயன்பாட்டு குழுக்களையும் நீக்கிவிட்டு அவற்றை இயல்புநிலைக்கு மீட்டமைக்கவா?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">இந்த ஆப்-ஐ நீக்கவா?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">அளவு மீறுதல்கள்</string>
+  <string name="connection_state_enabled">இயக்கு</string>
+  <string name="volume_override_summary">%1$s/%2$sக்கு அமை</string>
+  <string name="profile_volume_override_checkbox_label">மீறுதல் அளவு</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">சுயவிவரங்கள்</string>
+  <string name="profile_profile_manage">சுயவிவரத்தை நிர்வகி</string>
+  <string name="profile_appgroups_manage">ஆப் குழுக்கள்</string>
+  <string name="profile_appgroup_manage">ஆப் குழுவை நிர்வகி</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">சுயவிவர அமைப்பு</string>
+  <string name="profile_trigger_connect">இணைப்பில்</string>
+  <string name="profile_trigger_disconnect">துண்டிப்பில்</string>
+  <string name="profile_trigger_notrigger">ட்ரிகர் இல்லை</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">அறிவுறுத்தல் முறை</string>
+  <string name="ringer_mode">ரிங் முறை</string>
+  <string name="lights_mode">விளக்குகள் முறை</string>
+  <string name="vibrate_mode">அதிர்வு முறை</string>
+  <string name="choose_soundtone">அறிவுறுத்தல் டோனை தேர்ந்தெடு</string>
+  <string name="choose_ringtone">வளையத்தைத் தேர்வுசெய்</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">அறிவுறுத்தல் டோன்</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ஆப் குழுக்கள்</string>
+  <string name="profile_applist_title">பயன்பாடுகள்</string>
+  <string name="profile_new_appgroup">புதிய ஆப் குழு</string>
+  <string name="profile_delete_appgroup">இந்த ஆப் குழுவை நீக்கவா?</string>
+  <string name="profile_appgroup_name_prompt">புதிய ஆப் குழுவுக்கான பெயரை உள்ளிடு</string>
+  <string name="profile_appgroup_name_title">பெயர்</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">பயன்பாட்டைத்தேர்வுசெய்யவும்</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">சிஸ்டம் அமைப்புகள்</string>
+  <string name="profile_lockmode_title">திரை லாக் முறை</string>
+  <string name="profile_lockmode_policy_disabled_summary">கருவி நிர்வாகி கொள்கையினால் இந்த சுயவிவர தெரிவு முடக்கப்பட்டுள்ளது</string>
+  <string name="profile_lockmode_insecure_summary">PIN அல்லது கடவுச்சொல்லை கேட்கவேண்டாம்</string>
+  <string name="profile_lockmode_disabled_summary">திரை பூட்டலை முடக்குக</string>
+  <string name="profile_airplanemode_title">விமானப் பயன்முறை</string>
+  <string name="profile_brightness_title">திரை பிரகாசம்</string>
+  <string name="profile_brightness_override_summary">%1$d%%க்கு அமை</string>
+  <string name="profile_brightness_override_checkbox_label">பிரகாசத்தை மீறு</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">வைஃபை</string>
+  <string name="toggleWifiAp">போர்ட்டபில் வைஃபை ஹாட்ஸ்பாட்</string>
+  <string name="toggleBluetooth">புளூடூத்</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">தரவு இணைப்பு</string>
+  <string name="toggleSync">தரவைத் தானாக ஒத்திசை</string>
+  <string name="toggle2g3g4g">தேர்ந்தெடுத்த நெட்வொர்க் வகை</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\i2011Fi பிராந்திய குறியீடு</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fiக்கான பிராந்திய குறியீட்டை குறிப்பிடு</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">பிராந்திய குறியீட்டை அமைப்பதில் ஒரு பிரச்சனை உள்ளது.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">நீக்கு</string>
+  <string name="profile_action_none">மாற்றாமல் விடு</string>
+  <string name="profile_action_system">முறைமை இயல்புநிலை</string>
+  <string name="profile_action_disable">ஆஃப் செய்</string>
+  <string name="profile_action_enable">இயக்கு</string>
+  <string name="profile_trigger_a2dp_connect">A2DP இணைப்பில்</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DP துண்டிப்பில்</string>
+  <string name="profile_tabs_wifi">வைஃபை</string>
+  <string name="profile_tabs_bluetooth">புளூடூத்</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ட்ரிகர்கள் இந்த சுயவிவரத்தை செயல்படுத்தும்</string>
+  <string name="profile_setup_setup_triggers_title">படி 1: சேர் ட்ரிகர்கள்</string>
+  <string name="profile_setup_setup_triggers_title_config">மாற்றியமை ட்ரிகர்கள் <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">படி 2: செயல்பாடுகளை அமை</string>
+  <string name="profile_setup_actions_title_config">செயல்பாடுகளை மறுகட்டமை</string>
+  <string name="profile_appgroups_manage">ஆப் குழுக்கள்</string>
+  <string name="profile_appgroup_manage">ஆப் குழுவை நிர்வகி</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ஆப் குழுக்கள்</string>
+  <string name="profile_new_appgroup">புதிய ஆப் குழு</string>
+  <string name="profile_delete_appgroup">இந்த ஆப் குழுவை நீக்கவா?</string>
+  <string name="profile_appgroup_name_prompt">புதிய ஆப் குழுவுக்கான பெயரை உள்ளிடு</string>
+  <string name="profile_appgroup_name_title">பெயர்</string>
+  <string name="duplicate_appgroup_name">டூப்லிகேட் ஆப் குழு பெயர்!</string>
+  <string name="profile_app_delete_confirm">இந்த ஆப்-ஐ நீக்கவா?</string>
+  <string name="no_bluetooth_triggers">ப்ளூடூத் கருவி எதுவும் பிணைக்கப்படவில்லை.\n ட்ரிகர்களை கட்டமைக்கும் முன் ப்ளூடூத் கருவியை பிணைக்க தட்டு.</string>
+  <string name="no_wifi_triggers">Wi\u2011fi அணுகல் புள்ளிகள் எதுவும் கட்டமைக்கப்படவில்லை. \n  ட்ரிகர்களை கட்டமைக்கும் முன்பு Wi\u2011Fi இணைக்க தட்டவும்</string>
+  <string name="no_triggers_configured">எந்த ட்ரிகர்களும் கட்டமைக்கப்படவில்லை. மேலும் சேர்க்க தட்டவும்.</string>
+  <string name="no_triggers_configured_nfc">புதிய NFC ட்ரிகரை அமைக்க தட்டவும்.</string>
+  <string name="profile_setup_setup_triggers_description">இந்த சுயவிவரத்தை செயல்படுத்தும் ட்ரிகர்களை தயவுசெய்து தேர்ந்தெடுக்கவும்</string>
+  <string name="profile_setup_actions_description">இப்போது சுயவிவரம் செயல்படுத்தப்படும்போது எது நிகழும் என்பதை கட்டமை</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">வழிசெல்லுதல் பட்டி</string>
+  <string name="navigation_bar_left_title">இடது கை முறை</string>
+  <string name="navigation_bar_left_summary">உலாவி பட்டையை திரைக்கு இடதுபுறம் லேண்ட்ஸ்கேப் முறையில் வைக்கவும்</string>
+  <string name="navigation_bar_title">பட்டன்களும் லேயவுட்டும்</string>
+  <string name="navigation_bar_help_text">திருத்துவதற்காக உலாவி பட்டையை திறக்க திருத்துக ஐகானை தட்டி தொடங்கவும். \n\n ஒரு ஐகானை தட்டி அதன் குறுக்குவழியை நீங்கள் மாற்றலாம், அல்லது ஒரு ஐகானை நீங்கள் நீண்ட அழுத்தம் கொடுத்து அதன் லேயவுட்டை மறுசீரமைக்கலாம். \n\n உங்கள் மாற்றங்களை செய்ய \’சேமி\’யை, அல்லது வரைபடத்தை இயல்நிலை அமைப்புகளுக்கு மாற்ற \’இயல்நிலை மீட்டல்\’ஐ தட்டவும்.</string>
+  <string name="navigation_restore_button_text">மீட்டமை\nஇயல்நிலைகள்</string>
+  <string name="navigation_edit_button_text">திருத்து</string>
+  <string name="navigation_save_button_text">சேமி</string>
+  <string name="navigation_bar_reset_message">தற்போதையை அமைப்புகளை நீக்கி இயல்நிலை லேயவுட்களை மீட்டமைக்கவா?</string>
+  <string name="navigation_bar_arrow_keys_title">டைப் செய்யும்போது அம்பு விசைகளை காட்டு</string>
+  <string name="navigation_bar_arrow_keys_summary">டைப் செய்யும்போது இடது மற்றும் வலது கர்சரை காட்டு IME ஸ்விட்சரை மீறுகிறது</string>
+  <string name="navigation_bar_recents_title">சமீபத்திய நீண்ட அழுத்த செயல்பாடு</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">ஒளி அமைப்புகளை திருத்துக</string>
+  <string name="pulse_speed_title">துடிப்பு நீளம் மற்றும் வேகம்</string>
+  <string name="default_time">இயல்பு</string>
+  <string name="custom_time">தனிப்பயன்</string>
+  <string name="dialog_delete_title">நீக்கு</string>
+  <string name="dialog_delete_message">தேர்வுசெய்யப்பட்ட உருப்படியை நீக்கவா?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">எப்போதும் ஆன்</string>
+  <string name="pulse_length_very_short">மிக சுருக்கம்</string>
+  <string name="pulse_length_short">சுருக்கம்</string>
+  <string name="pulse_length_normal">இயல்பு</string>
+  <string name="pulse_length_long">நீளம்</string>
+  <string name="pulse_length_very_long">மிக நீளம்</string>
+  <string name="pulse_speed_very_fast">மிக வேகம்</string>
+  <string name="pulse_speed_fast">வேகம்</string>
+  <string name="pulse_speed_normal">இயல்பு</string>
+  <string name="pulse_speed_slow">மெது</string>
+  <string name="pulse_speed_very_slow">மிக மெது</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">பேட்டரி ஒளி</string>
+  <string name="battery_low_pulse_title">பேட்டரி குறைவாக இருந்தால் துடிப்பு</string>
+  <string name="battery_light_list_title">நிறங்கள்</string>
+  <string name="battery_light_low_color_title">பேட்டரி குறைவு</string>
+  <string name="battery_light_medium_color_title">சார்ஜ் ஏறுகிறது</string>
+  <string name="battery_light_full_color_title">முழுவது சார்ஜ்டு</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">அறிவுறுத்தல் ஒளி</string>
+  <string name="notification_light_general_title">பொது</string>
+  <string name="notification_light_applist_title">பயன்பாடுகள்</string>
+  <string name="notification_light_phonelist_title">ஃபோன்</string>
+  <string name="notification_light_use_custom">தனிப்பயனாக்கிய மதிப்புகளை பயன்படுத்தவும்</string>
+  <string name="notification_light_default_value">இயல்புநிலை</string>
+  <string name="notification_light_missed_call_title">தவறிய அழைப்பு</string>
+  <string name="notification_light_voicemail_title">குரலஞ்சல்</string>
+  <string name="notification_light_screen_on">திரை ஆனாக இருக்கும்போது விளக்குகள்</string>
+  <string name="notification_light_zen_mode">தொந்தரவு செய்ய வேண்டாம் என்ற பயன்முறையில் லைட்கள் உள்ளன</string>
+  <string name="notification_light_use_multiple_leds">பல LEDகள்</string>
+  <string name="keywords_lights_brightness_level">மங்கலான Ledகளின் பிரகாசம்</string>
+  <string name="notification_light_automagic">தானாகவே நிறங்கள் தேர்வுசெய்</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ஒளி அமைப்புகள்</string>
+  <string name="led_notification_text">LED ஒளி அமைப்பினால் செயல்படுத்தப்படுதல்</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">ஆண்ட்ராய்டு பிழைநீக்கல்</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">ஆண்ட்ராய்டு பிழைநீக்கல் பாள (adb) இடைமுகத்தை செயல்படுத்து</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">பிணையத்தின் மீது ADB</string>
+  <string name="adb_over_network_summary">பிணைய இடைமுகங்கள்  (Wi\u2011Fi, USB நெட்வொர்க்குகள்) மீது TCP/IP பிழைநீக்கலை செயல்படுத்து. இந்த அமைப்பு மறுயியக்கத்தில் மீட்டமைக்கப்பட்டது</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">எச்சரிக்கை: நெட்வொர்க் மீது ADB செயல்படுத்தப்பட்டு இருக்கும்போது, அனைத்து இணைக்கப்பட்ட நெட்வொர்க்கள் மீதுமான தலையீட்டிற்கும் உங்கள் தொலைப்பேசி திறந்திருக்கும்! \nn நம்பகமான நெட்வொர்க்களுடன் இணைந்திருக்கும்போது மட்டும் இந்த அம்சத்தை நீங்கள் பயன்படுத்துங்கள். \n\n நீங்கள் உண்மையாகவே இந்த செயல்பாட்டை செயல்படுத்த விரும்புகிறீர்களா?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">பிழைநீக்கல் அறிவுறுத்தல்</string>
+  <string name="adb_notify_summary">USB அல்லது நெட்வொர்க் பிழைநீக்கல் செயல்படுத்தப்பட்டு இருகும்போது அறிவுறுத்தலை திரையிடவும்</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">இருப்பிடம்</string>
+  <string name="app_ops_categories_personal">தனிப்பட்டவை</string>
+  <string name="app_ops_categories_messaging">செய்தியிடல்</string>
+  <string name="app_ops_categories_media">மீடியா</string>
+  <string name="app_ops_categories_device">சாதனம்</string>
+  <string name="app_ops_categories_bootup">பூட்டப்</string>
+  <string name="app_ops_categories_su">மூல அணுகல்</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">கோர்ஸ் இடம்</string>
+  <string name="app_ops_summaries_fine_location">ஃபைன் இடம்</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">அதிர்</string>
+  <string name="app_ops_summaries_read_contacts">தொடர்புகளை வாசி</string>
+  <string name="app_ops_summaries_modify_contacts">தொடர்புகளை மாற்றியமை</string>
+  <string name="app_ops_summaries_read_call_log">அழைப்புப் பதிவைப் படித்தல்</string>
+  <string name="app_ops_summaries_modify_call_log">அழைப்பு பதிவை மாற்றியமை</string>
+  <string name="app_ops_summaries_read_calendar">நாள்காட்டியை வாசி</string>
+  <string name="app_ops_summaries_modify_calendar">நாள்காட்டியை மாற்றியமை</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi ஸ்கேன்</string>
+  <string name="app_ops_summaries_notification">அறிவிப்பு/டோஸ்ட்</string>
+  <string name="app_ops_summaries_cell_scan">செல் ஸ்கேன்</string>
+  <string name="app_ops_summaries_call_phone">செல்ஃபோன்</string>
+  <string name="app_ops_summaries_read_sms">SMS வாசி</string>
+  <string name="app_ops_summaries_write_sms">SMS எழுது</string>
+  <string name="app_ops_summaries_receive_sms">SMS பெறு</string>
+  <string name="app_ops_summaries_receive_emergency_sms">அவசர SMS பெறு</string>
+  <string name="app_ops_summaries_receive_mms">MMS பெறு</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP புஷ் பெறு</string>
+  <string name="app_ops_summaries_send_sms">SMS அனுப்பு</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMS வாசி</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMS எழுது</string>
+  <string name="app_ops_summaries_modify_settings">அமைப்புகளை மாற்று</string>
+  <string name="app_ops_summaries_draw_on_top">மேலே வரை</string>
+  <string name="app_ops_summaries_access_notifications">அறிவிப்புகளின் அணுகல்</string>
+  <string name="app_ops_summaries_camera">கேமரா</string>
+  <string name="app_ops_summaries_record_audio">ஆடியோவைப் பதிவுசெய்தல்</string>
+  <string name="app_ops_summaries_play_audio">ப்ளே ஆடியோ</string>
+  <string name="app_ops_summaries_read_clipboard">க்ளிப்போர்ட் வாசி</string>
+  <string name="app_ops_summaries_modify_clipboard">க்ளிப்போர்ட் மாற்றியமை</string>
+  <string name="app_ops_summaries_media_buttons">ஊடக பட்டன்கள்</string>
+  <string name="app_ops_summaries_audio_focus">ஆடியோ ஃபோக்கஸ்</string>
+  <string name="app_ops_summaries_master_volume">மாஸ்டர் வால்யூம்</string>
+  <string name="app_ops_summaries_voice_volume">வாய்ஸ் வால்யூம்</string>
+  <string name="app_ops_summaries_ring_volume">ரிங் வால்யூம்</string>
+  <string name="app_ops_summaries_media_volume">ஊடக வால்யூம்</string>
+  <string name="app_ops_summaries_alarm_volume">அலாரம் வால்யூம்</string>
+  <string name="app_ops_summaries_notification_volume">அறிவுறுத்தல் வால்யூம்</string>
+  <string name="app_ops_summaries_bluetooth_volume">புளுடூத் ஒலியளவு</string>
+  <string name="app_ops_summaries_keep_awake">விழிப்பிலே வை</string>
+  <string name="app_ops_summaries_monitor_location">இடத்தை கண்காணி</string>
+  <string name="app_ops_summaries_monitor_high_power_location">உயர் பவர் இடத்தை கண்காணி</string>
+  <string name="app_ops_summaries_get_usage_stats">பயன்பாட்டு புள்ளிவிவரங்களை பெறு</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">மைக்ரோஃபோனை மௌனமாக்கு/மௌனம்நீக்கு</string>
+  <string name="app_ops_summaries_toast_window">டோஸ்ட்களை காட்டு</string>
+  <string name="app_ops_summaries_project_media">ஊடகத்தை வெளிப்படுத்து</string>
+  <string name="app_ops_summaries_activate_vpn">VPN செயல்படுத்து</string>
+  <string name="app_ops_summaries_write_wallpaper">வால்பேப்பரை எழுது</string>
+  <string name="app_ops_summaries_assist_structure">உதவி கட்டமைப்பு</string>
+  <string name="app_ops_summaries_assist_screenshot">உதவி ஸ்க்ரீன்ஷாட்</string>
+  <string name="app_ops_summaries_read_phone_state">தொலைப்பேசி நிலையைப் படி</string>
+  <string name="app_ops_summaries_add_voicemail">குரலஞ்சலைச் சேர்த்தல்</string>
+  <string name="app_ops_summaries_use_sip">SIP பயன்படுத்து</string>
+  <string name="app_ops_summaries_make_call">அழைப்பை ஏற்படுத்து</string>
+  <string name="app_ops_summaries_use_fingerprint">கைரேகையைப் பயன்படுத்து</string>
+  <string name="app_ops_summaries_use_body_sensors">உடல் உணர்கருவிகளைப் பயன்படுத்து</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">கலம் ஒளிபரப்புகளை படி</string>
+  <string name="app_ops_summaries_mock_location">போலி இருப்பிடம்</string>
+  <string name="app_ops_summaries_read_external_storage">வெளிப்புற சேமிப்பகத்தைப் படி</string>
+  <string name="app_ops_summaries_write_external_storage">வெளிப்புற சேமிப்பகத்தில் எழுது</string>
+  <string name="app_ops_summaries_turn_screen_on">திரையை ஆன் செய்</string>
+  <string name="app_ops_summaries_get_accounts">கணக்குகளைப் பெறு</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi நிலைமாற்று</string>
+  <string name="app_ops_summaries_toggle_bluetooth">புளுடூத் நிலைமாற்று</string>
+  <string name="app_ops_summaries_start_at_boot">இயக்கத்தில் தொடங்கு</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC நிலைமாற்று</string>
+  <string name="app_ops_summaries_toggle_mobile_data">மொபைல் தரவு நிலைமாற்று</string>
+  <string name="app_ops_summaries_superuser">ரூட் அணுகள்</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">கோர்ஸ் இருப்பிடம்</string>
+  <string name="app_ops_labels_fine_location">நேர்த்தியான இடம்</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">அதிர்வு</string>
+  <string name="app_ops_labels_read_contacts">தொடர்புகளை வாசி</string>
+  <string name="app_ops_labels_modify_contacts">தொடர்புகளை மாற்றியமை</string>
+  <string name="app_ops_labels_read_call_log">அழைப்பு பதிவை வாசி</string>
+  <string name="app_ops_labels_modify_call_log">அழைப்பு பதிவை மாற்றியமை</string>
+  <string name="app_ops_labels_read_calendar">நாள்காட்டியை வாசி</string>
+  <string name="app_ops_labels_modify_calendar">நாள்காட்டியை மாற்றியமை</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi ஸ்கேன்</string>
+  <string name="app_ops_labels_notification">அறிவுறுத்தல்/டோஸ்ட்</string>
+  <string name="app_ops_labels_cell_scan">செல் ஸ்கேன்</string>
+  <string name="app_ops_labels_call_phone">தொலைப்பேசியை அழை</string>
+  <string name="app_ops_labels_read_sms">SMS படி</string>
+  <string name="app_ops_labels_write_sms">SMS எழுது</string>
+  <string name="app_ops_labels_receive_sms">SMS பெறு</string>
+  <string name="app_ops_labels_receive_emergency_sms">அவசர SMS பெறு</string>
+  <string name="app_ops_labels_receive_mms">MMS பெறு</string>
+  <string name="app_ops_labels_receive_wap_push">WAP அழுத்தம் பெறு</string>
+  <string name="app_ops_labels_send_sms">SMS அனுப்பு</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS படி</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS எழுது</string>
+  <string name="app_ops_labels_modify_settings">அமைப்புகளை மாற்று</string>
+  <string name="app_ops_labels_draw_on_top">மேலே வரை</string>
+  <string name="app_ops_labels_access_notifications">அறிவுறுத்தல்களை அணுகு</string>
+  <string name="app_ops_labels_camera">கேமரா</string>
+  <string name="app_ops_labels_record_audio">ஆடியோவைப் பதிவுசெய்</string>
+  <string name="app_ops_labels_play_audio">ப்ளே ஆடியோ</string>
+  <string name="app_ops_labels_read_clipboard">க்ளிப்போர்டை வாசி</string>
+  <string name="app_ops_labels_modify_clipboard">க்ளிப்போர்ட்டை மாற்றியமை</string>
+  <string name="app_ops_labels_media_buttons">ஊடக பட்டன்கள்</string>
+  <string name="app_ops_labels_audio_focus">ஆடியோ ஃபோக்கஸ்</string>
+  <string name="app_ops_labels_master_volume">மாஸ்டர் வால்யூம்</string>
+  <string name="app_ops_labels_voice_volume">ஆடியோ வால்யூம்</string>
+  <string name="app_ops_labels_ring_volume">அழைப்பு - ஒலியளவு</string>
+  <string name="app_ops_labels_media_volume">மீடியா ஒலியளவு</string>
+  <string name="app_ops_labels_alarm_volume">அலார ஒலியளவு</string>
+  <string name="app_ops_labels_notification_volume">அறிவிப்பின் ஒலியளவு</string>
+  <string name="app_ops_labels_bluetooth_volume">புளூடூத் ஒலியளவு</string>
+  <string name="app_ops_labels_keep_awake">எப்போதும் விழிப்பில்</string>
+  <string name="app_ops_labels_monitor_location">இருப்பிடத்தை கண்காணி</string>
+  <string name="app_ops_labels_monitor_high_power_location">உயர் சக்தி இருப்பிடத்தை கண்காணி</string>
+  <string name="app_ops_labels_get_usage_stats">பயன்பாட்டு புள்ளிவிவரங்களை பெறு</string>
+  <string name="app_ops_labels_mute_unmute_microphone">மைக்ரோஃபோனை மௌனமாக்கு/மௌனம்நீக்கு</string>
+  <string name="app_ops_labels_toast_window">டோஸ்ட்களை காட்டு</string>
+  <string name="app_ops_labels_project_media">ஊடகத்தை வெளிப்படுத்து</string>
+  <string name="app_ops_labels_activate_vpn">VPN செயல்படுத்து</string>
+  <string name="app_ops_labels_write_wallpaper">வால்பேப்பரை எழுது</string>
+  <string name="app_ops_labels_assist_structure">உதவி கட்டமைப்பு</string>
+  <string name="app_ops_labels_assist_screenshot">உதவி ஸ்க்ரீன்ஷாட்</string>
+  <string name="app_ops_labels_read_phone_state">தொலைப்பேசி நிலையைப் படி</string>
+  <string name="app_ops_labels_add_voicemail">குரலஞ்சலை சேர்</string>
+  <string name="app_ops_labels_use_sip">SIP பயன்படுத்து</string>
+  <string name="app_ops_labels_make_call">அழைப்பை ஏற்படுத்து</string>
+  <string name="app_ops_labels_use_fingerprint">கைரேகையைப் பயன்படுத்து</string>
+  <string name="app_ops_labels_use_body_sensors">உடல் உணர்கருவிகளைப் பயன்படுத்து</string>
+  <string name="app_ops_labels_read_cell_broadcasts">கலம் ஒளிபரப்புகளை படி</string>
+  <string name="app_ops_labels_mock_location">போலி இருப்பிடம்</string>
+  <string name="app_ops_labels_read_external_storage">வெளிப்புற சேமிப்பகத்தைப் படி</string>
+  <string name="app_ops_labels_write_external_storage">வெளிப்புற சேமிப்பகத்தில் எழுது</string>
+  <string name="app_ops_labels_turn_screen_on">திரையை ஆன் செய்</string>
+  <string name="app_ops_labels_get_accounts">கணக்குகளைப் பெறு</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-fi நிலைமாற்று</string>
+  <string name="app_ops_labels_toggle_bluetooth">புளுடூத்  நிலைமாற்று</string>
+  <string name="app_ops_labels_start_at_boot">இயக்கத்தில் தொடங்கு</string>
+  <string name="app_ops_labels_toggle_nfc">NFC நிலைமாற்று</string>
+  <string name="app_ops_labels_toggle_mobile_data">மொபைல் தரவு நிலைமாற்று</string>
+  <string name="app_ops_labels_superuser">மூல அணுகல்</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">அனுமதிக்கப்பட்டது</string>
+  <string name="app_ops_permissions_ignored">புறக்கணிக்கப்பட்டது</string>
+  <string name="app_ops_permissions_always_ask">எப்போதும் கேள்</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> ( <xliff:g id="count">%2$s</xliff:g>பயன்படுத்தப்பட்டது)</string>
+  <string name="app_ops_allowed_count">அனுமதிக்கப்படுகிறது <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">மறுக்கப்படுகிறது <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">அனுமதிக்கப்படுகிறது <xliff:g id="count">%1$s</xliff:g>, மறுக்கப்படுகிறது <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">பயனர் ஆப்களை காட்டு</string>
+  <string name="app_ops_show_system_apps">உள்ளமைந்த ஆப்களை காட்டு</string>
+  <string name="app_ops_reset_counters">கவுண்ட்டர்களை அனுமதி/மறு மறுவமை</string>
+  <string name="app_ops_reset_confirm_title">கவுண்ட்டர் மறுவமைப்பை உறுதிசெய்</string>
+  <string name="app_ops_reset_confirm_mesg">நீங்கள் கவுண்ட்டர்களை மறுவமைக்க நிச்சயம் விரும்புகிறீர்களா?</string>
+  <string name="ok">சரி</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">கருவி ஹோஸ்ட்நேம்</string>
+  <string name="unlock_scramble_pin_layout_title">ஸ்க்ராம்பில் லேயவுட்</string>
+  <string name="unlock_scramble_pin_layout_summary">கருவியை திறக்கும்போது PIN லேயவுட்டை ஸ்க்ராம்பில் செய்</string>
+  <string name="button_pref_title">பட்டன்கள்</string>
+  <string name="hardware_keys_power_key_title">பவர் பட்டன்</string>
+  <string name="hardware_keys_home_key_title">முகப்பு பட்டன்</string>
+  <string name="hardware_keys_back_key_title">கறுப்பு பட்டன்</string>
+  <string name="hardware_keys_menu_key_title">மெனு பொத்தான்</string>
+  <string name="hardware_keys_assist_key_title">பட்டனை தேடுதல்</string>
+  <string name="hardware_keys_appswitch_key_title">சமீபத்திய பட்டன்</string>
+  <string name="hardware_keys_camera_key_title">கேமரா பட்டன்</string>
+  <string name="hardware_keys_volume_keys_title">ஒலியளவு பொத்தான்கள்</string>
+  <string name="hardware_keys_short_press_title">சுருக்க அழுத்த செயல்பாடு</string>
+  <string name="hardware_keys_long_press_title">நீண்ட அழுத்த செயல்பாடு</string>
+  <string name="hardware_keys_double_tap_title">இரட்டை தட்டுதல் செயல்பாடு</string>
+  <string name="hardware_keys_action_nothing">செயல்பாடு இல்லை</string>
+  <string name="hardware_keys_action_menu">பட்டியலை திற/மூடு</string>
+  <string name="hardware_keys_action_app_switch">சமீபத்திய ஆப்ஸ் ஸ்விட்சர்</string>
+  <string name="hardware_keys_action_search">தேடல் உதவியாளர்</string>
+  <string name="hardware_keys_action_voice_search">குரல் தேடல்</string>
+  <string name="hardware_keys_action_in_app_search">ஆப்-உள் தேடல்</string>
+  <string name="hardware_keys_action_launch_camera">கேமராவை தொடங்கு</string>
+  <string name="hardware_keys_action_sleep">திரையை ஆஃப் செய்க</string>
+  <string name="hardware_keys_action_last_app">கடைசி ஆப்</string>
+  <string name="camera_sleep_on_release_title">திரை பீக்</string>
+  <string name="camera_sleep_on_release_summary">அரை அழுத்தமானது அந்த விசை அழுத்தப்பட்டிருக்கும் போது மட்டும் திரையை இயக்கத்தில் வைத்திருக்கும்</string>
+  <string name="camera_launch_title">கேமராவை தொடங்கு</string>
+  <string name="camera_launch_summary">ஒரு நீண்ட அழுத்தம் மற்றும் விடுவிப்பு கேமராவை தொடங்கும்</string>
+  <string name="volbtn_music_controls_title">ப்ளேபேக் கட்டுப்பாடு</string>
+  <string name="volbtn_music_controls_summary">திரை ஆஃப் ஆக இருக்கும்போது, வால்யூம் விசைகளை நீண்ட அழுத்தம் செய்வது இசை ட்ராக்குகளை தேடும்</string>
+  <string name="volbtn_cursor_control_title">விசைப்பலகை கர்சர் கட்டுப்பாடு</string>
+  <string name="volbtn_cursor_control_off">முடக்கப்பட்டது</string>
+  <string name="volbtn_cursor_control_on">வால்யூம் மேல்/கீழ் கர்சரை இடது/வலது பக்கம் நகர்த்தும்</string>
+  <string name="volbtn_cursor_control_on_reverse">வால்யூம் மேல்/கீழ் கர்சரை வலது/இடது பக்கம் நகர்த்தும்</string>
+  <string name="power_end_call_title">அழைப்பை முடி</string>
+  <string name="power_end_call_summary">பவர் பட்டனை அழுத்துதல் தற்போதைய அழைப்பை முடிக்கும்</string>
+  <string name="swap_volume_buttons_title">மறுசீரமை</string>
+  <string name="swap_volume_buttons_summary">திரை சுழற்றப்படும்போது வால்யூம் பட்டன்களை இடமாற்றவும்</string>
+  <string name="button_wake_title">கருவியை எழுப்புக</string>
+  <string name="home_answer_call_title">அழைப்புக்கு பதிலளி</string>
+  <string name="home_answer_call_summary">முகப்பு பட்டனை அழுத்துதல் தற்போதையை உள்வரும் அழைப்புக்கு பதிலளிக்கும்</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">அடாப்டிவ் பேக்லைட்</string>
+  <string name="adaptive_backlight_summary">திரையின் பேக்லைட் பிரகாசத்தை ஆற்றலுடன் சரிசெய்து பயன்பாட்டை பராமரிக்கையில் பேட்டரி ஆயுளை அதிகரிக்கிறது</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">சூரியவொளி மிகைப்படுத்தல்</string>
+  <string name="sunlight_enhancement_summary">பிரகாசமான சூரியவொளியின் கீழ் காட்சியின் பிரகாசத்தையும் வாசிக்கும் தன்மையையும் அதிகரிக்கிறது</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">நிற மிகைப்படுத்தல்</string>
+  <string name="color_enhancement_summary">காட்சியின் நிறத்தை ஆற்றலுடன் மிகைப்படுத்துகின்றது</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">பேக்லைட்</string>
+  <string name="button_backlight_enabled">பட்டன்களை ஒளிரச்செய்</string>
+  <string name="keyboard_backlight_enabled">விசைப்பலகையை ஒளிரச்செய்</string>
+  <string name="button_backlight_seekbar_title">பட்டன் பிரகாசம்</string>
+  <string name="keyboard_backlight_seekbar_title">விசைப்பலகை பிரகாசம்</string>
+  <string name="backlight_timeout_title">ஒளிரச்செய்தல் நேரம்முடிந்தது</string>
+  <string name="backlight_timeout_unlimited">அனைக்காதே</string>
+  <string name="backlight_summary_disabled">முடக்கப்பட்டது</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g>க்கு செயல்படுத்தப்பட்டது</string>
+  <string name="backlight_summary_enabled">இயக்கப்பட்டவை</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">சைகைகள்</string>
   <!-- Power menu -->
+  <string name="power_menu_title">பவர் பட்டியல்</string>
+  <string name="power_menu_reboot_title">மறுதுவக்க பட்டியல்</string>
+  <string name="power_menu_screenshot_title">திரைப்பிடிப்பு</string>
+  <string name="power_menu_airplane_title">விமானப் பயன்முறை</string>
+  <string name="power_menu_users_title">பயனர் ஸ்விட்சர்</string>
+  <string name="power_menu_settings_title">அமைப்பு</string>
+  <string name="power_menu_lockdown_title">கருவி லாக்டவுன்</string>
+  <string name="power_menu_bug_report_title">பிழை அறிக்கை</string>
+  <string name="power_menu_sound_title">ஆடியோ பேனல்</string>
+  <string name="power_menu_bug_report_disabled">வளர்ச்சி அமைப்புகளில் பிழை தெரிவித்தல் முடக்கப்பட்டுள்ளது</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">திரை மீதான உலாவி பட்டையை செயல்படுத்துக</string>
+  <string name="disable_navkeys_summary">திரை மீதான உலாவி பட்டையை செயல்படுத்தி வன்பொருள் பட்டனை முடக்குக</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">உறங்குவதற்கு இருமுறை தட்டு</string>
+  <string name="double_tap_to_sleep_summary">காட்சியை ஆஃப் செய்ய நிலை பட்டை மீது இருமுறை தட்டு</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">தற்செயலான விழித்தலை தடு</string>
+  <string name="proximity_wake_summary">திரையை விழிப்லாக்வதற்கு முன்பாக அருகாமை சென்சரை சரிபார்க்கவும்</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">பிளக் செய்தால் விழி</string>
+  <string name="wake_when_plugged_or_unplugged_summary">ஒரு மின் வளத்தை இணைத்தல் அல்லது துண்டித்தலின் போது திரையை ஆன் செய்க</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">மாதிரி</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">வால்யூம் சரிசெய்தல் ஆடியோகள்</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">அதிர்வான் அளவு</string>
+  <string name="vibrator_warning">%1$dஐவிட உயர்வான மதிப்புகள் பரிந்துரைக்கப்படுவதில்லை</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">நிற அளவிடுதல்</string>
+  <string name="color_calibration_summary">திரைமீதுள்ள நிறங்களை அளவிடு</string>
+  <string name="color_red_title">சிவப்பு</string>
+  <string name="color_green_title">பச்சை</string>
+  <string name="color_blue_title">நீலம்</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">காமா அளவிடுதல்</string>
+  <string name="gamma_tuning_summary_head">டிவீக் காமா மதிப்புகள்</string>
+  <string name="gamma_tuning_control_set_header">குழு <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">மாறுபாடு</string>
+  <string name="gamma_tuning_brightness">ஒளிர்வு</string>
+  <string name="gamma_tuning_saturation">சாச்சுரேசன்</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">இசை ஆப்-ஐ தொடங்குக</string>
+  <string name="headset_connect_player_summary">ஹெட்செட் இணைக்கப்பட்டு இருக்கும்போது இயல்நிலை இசை ஆப்-ஐ தொடங்குக</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">தானியக்க முன்னுரிமை</string>
+  <string name="auto_brightness_reset_button">மீட்டமை</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">சுழற்சி</string>
+  <string name="display_rotation_disabled">முடக்கப்பட்டது</string>
+  <string name="display_rotation_unit">டிகிரிக்கள்</string>
+  <string name="display_lockscreen_rotation_title">திரை லாக்கை சுழற்று</string>
+  <string name="display_rotation_category_title">சுழற்சி முறைகள்</string>
+  <string name="display_rotation_0_title">0 டிகிரீ</string>
+  <string name="display_rotation_90_title">90 டிகிரீ</string>
+  <string name="display_rotation_180_title">180 டிகிரீ</string>
+  <string name="display_rotation_270_title">270 டிகிரீ</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">திரை நிறம்</string>
+  <string name="screencolor_summary">திரை வண்ணக்கூறு, கான்டிராஸ்ட் அல்லது தீவிரத்தை டியூன் செய்</string>
+  <string name="custom_screencolor">தனிப்பயனாக்கப்பட்ட திரை நிறம்</string>
+  <string name="screencolor_save">சேமி</string>
+  <string name="screencolor_cancel">ரத்துசெய்</string>
+  <string name="restore_preview">இயல்நிலை படத்தை காண்</string>
+  <string name="selectnewfile_menu">கேலரியில் இருந்து புது படத்தைக் காண்</string>
+  <string name="selectfile_menu">கேலரியில் இருநந்து படத்தைக் காண்</string>
+  <string name="restore_default_str">மீட்டமை</string>
+  <string name="hue_str">வண்ணக்கூறு: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">சாச்சுரேசன்: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">கான்டிராஸ்ட்: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">இன்டென்சிட்டி: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">வாசிக்கும்தன்மையை மேம்படுத்தவும் கண்ணுக்கு சிரமத்தை குறைக்கவும் நாளின் நேரத்தையும் சுற்றுச்சூழல் நிலைமைகளையும் பொருத்து உங்கள் திரையை உகந்ததாக்குங்கள்</string>
+  <string name="live_display_mode">காட்சி முறை</string>
+  <string name="live_display_color_temperature_title">நிற தட்பவெப்பம்</string>
+  <string name="live_display_color_temperature_summary">நாள்: <xliff:g id="day_temperature">%1$d</xliff:g>K  இரவு: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">பகல்</string>
+  <string name="live_display_night">இரவு</string>
+  <string name="live_display_outdoor_mode_title">தானியக்க வெளியிட முறை</string>
+  <string name="live_display_outdoor_mode_summary">பிரகாசமான சூரியவொளியின் கீழ் பிரகாசத்தையும் செறிவையும் தானாக அதிகரி</string>
+  <string name="live_display_low_power_title">மின் பயன்பாட்டை குறை</string>
+  <string name="live_display_low_power_summary">குறைபடுதல் இல்லாமல் குறைந்தபட்ச மின் பயன்பாட்டிற்காக காட்சியை சரிசெய்</string>
+  <string name="live_display_enhance_color_title">நிறங்களை மேம்படுத்து</string>
+  <string name="live_display_enhance_color_summary">சதை நிறங்கள், இயற்கை காட்சிகள் மற்றும் பிற படங்களுக்கு நிற பிரகாசத்தை மேம்படுத்து</string>
+  <string name="live_display_color_profile_title">நிற சுயவிவரம்</string>
+  <string name="live_display_color_profile_standard_title">நிலையான</string>
+  <string name="live_display_color_profile_standard_summary">துல்லியமான நிறங்களும் பிரகாசமான வெண்மையும்</string>
+  <string name="live_display_color_profile_natural_title">இயற்கை</string>
+  <string name="live_display_color_profile_natural_summary">உண்மைத்துவமான நிறங்கள் மற்றும் சதை நிறங்கள்</string>
+  <string name="live_display_color_profile_dynamic_title">ஆற்றல்மிக்க</string>
+  <string name="live_display_color_profile_dynamic_summary">மேம்பட்ட நிறங்களும் பிரகாசமான வெண்மையும்</string>
+  <string name="live_display_color_profile_cinema_title">சினிமா</string>
+  <string name="live_display_color_profile_cinema_summary">வீடியோவுக்கான கச்சிதமான வண்ன மறு உருவாக்கம்</string>
+  <string name="live_display_color_profile_astronomy_title">வான்வெளி</string>
+  <string name="live_display_color_profile_astronomy_summary">இரவு காட்சியை பாதுகாப்பதற்காக ஆழ்ந்த சிவப்பு</string>
+  <string name="live_display_color_profile_photography_title">புகைப்படம்</string>
+  <string name="live_display_color_profile_photography_summary">புகைப்படங்களுக்கான கச்சிதமான வண்ன மறு உருவாக்கம்</string>
+  <string name="live_display_color_profile_basic_title">அடிப்படை</string>
+  <string name="live_display_color_profile_basic_summary">காட்சியை அளவிடாமல் பயன்படுத்து</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">தேர்ந்தெடுக்கும் ஐகான்</string>
+  <string name="ime_switcher_notify_summary">உள்ளீட்டு முறை தேர்ந்தெடுத்தல் ஐகானை காட்டு</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">ஹெட்ஸ் அப்</string>
+  <string name="summary_heads_up_enabled">பாப்-அப் அறிவுறுத்தல்கள் செயல்படுத்தப்பட்டுள்ளன</string>
+  <string name="summary_heads_up_disabled">பாப்-அப் அறிவுறுத்தல்கள் முடக்கப்பட்டுள்ளன</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">அனைத்து கோப்பு வகைகளுக்காகவும் ஏற்றுக்கொள்</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">உயர்ந்த தொடல் உணர்திறன்</string>
+  <string name="high_touch_sensitivity_summary">கையுறை அணிந்தும் அதை பயன்படுத்தும்படி தொடல்திறை உணர்திறனை அதிகரிக்கவும்</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD அடர்த்தி</string>
+  <string name="dialog_title_lcd_density">LCD அடர்த்தி</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (default)</string>
+  <string name="restarting_ui">மறுதொடக்கம் செய்கிறது UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">ஸ்டைலசை பயன்படுத்தும்போது ஐகானை காட்டு</string>
+  <string name="stylus_icon_enabled_summary">ஸ்டைலசுடன் மேலே உலாவும்போது அல்லது வரையும்போது சுட்டி ஐகானை காட்டு</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">ஸ்டைலஸ் சைகைகள்</string>
+  <string name="category_spen_title">ஸ்டைலஸ் சைகைகள்</string>
+  <string name="enable_subcat_title">ஸ்டைலஸ்</string>
+  <string name="enable_spen_title_head">சைகைகளை செயல்படுத்து</string>
+  <string name="enable_spen_summary_head">ஸ்டைலஸ் பட்டனை அழுத்தி பிடிப்பதன் மூலம் சைகைகள் ஸ்வைப்பை பயன்படுத்தவும்</string>
+  <string name="gestures_subcat_title">சைகைகள்</string>
+  <string name="gestures_left_spen_title_head">இடது ஸ்வைப்</string>
+  <string name="gestures_right_spen_title_head">வலது ஸ்வைப்</string>
+  <string name="gestures_up_spen_title_head">மேல் ஸ்வைப்</string>
+  <string name="gestures_down_spen_title_head">கீழ் ஸ்வைப்</string>
+  <string name="gestures_long_spen_title_head">நீண்ட அழுத்தம்</string>
+  <string name="gestures_double_spen_title_head">இருமுறை தட்டுதல்</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">செயல்பாடு இல்லை</string>
+  <string name="gestures_action_home">முகப்பு</string>
+  <string name="gestures_action_back">பின் செல்</string>
+  <string name="gestures_action_menu">மெனு</string>
+  <string name="gestures_action_search">தேடலை தூண்டிவிடு</string>
+  <string name="gestures_action_recent">சமீபத்திய பயன்பாடுகள்</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s நிறுவப்படவில்லை.</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">தொடல்திறைக்கு மேல் நகர்தல்</string>
+  <string name="touchscreen_hovering_summary">வலைதள உலாவிகள், ரிமோட்-டெஸ்க்டாப்புகள் உள்ளிட்டவற்றில் மவுஸ் போன்று நீங்கள் திரையின் மீது உலாவ உங்களை அனுமதிக்கிறது</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">ரிங் வால்யூமை அதிகரித்தல்</string>
+  <string name="increasing_ring_min_volume_title">வால்யூமை தொடங்கு</string>
+  <string name="increasing_ring_ramp_up_time_title">ராம்ப்-அப் நேரம்</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS உதவிசெய்யும் தரவு பதிவிறக்கம்</string>
+  <string name="lto_download_data_wifi_only_on">எந்த நெட்வொர்க் மீதும்</string>
+  <string name="lto_download_data_wifi_only_off">Wi\u2011Fi நெட்வொர்க்கள் மீது மட்டும்</string>
+  <string name="volume_keys_control_ring_stream_title">ரிங்டோன் வால்யூமை கட்டுப்படுத்து</string>
+  <string name="volume_keys_control_ring_stream_summary_on">வால்யூம் விசைகள் ரிங்டோன் வால்யூமை கட்டுப்படுத்துகின்றன</string>
+  <string name="volume_keys_control_ring_stream_summary_off">வால்யூம் விசைகள் ஊடக வால்யூமை கட்டுப்படுத்துகின்றன</string>
+  <string name="category_calibration">அளவிடுதல்</string>
+  <string name="display_and_lights">காட்சி &amp; ஒளிகள்</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">சார்ஜிங்கின் போது</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">இயக்கு</string>
+  <string name="power_notifications_enable_summary">ஒரு பவர் வளத்தை இணைக்கும்போது அல்லது துண்டிக்கும்போது ஒரு ஆடியோயை ப்ளே செய்கிறது</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">அதிர்வு</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">அறிவுறுத்தல் ஆடியோ</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">நிசப்தம்</string>
   <!-- Status bar -->
+  <string name="status_bar_title">நிலை பட்டி</string>
+  <string name="status_bar_toggle_brightness">பிரகாச கட்டுப்பாடு</string>
+  <string name="status_bar_toggle_brightness_summary">நிலை பட்டை மீது வழுக்கிச் செல்வதன் மூலம் பிரகாசத்தை சரிசெய்</string>
+  <string name="status_bar_notif_count_title">அறிவுறுத்தல் எண்ணிக்கையை காட்டு</string>
+  <string name="status_bar_notif_count_summary">நிலுவையிலுள்ள அறிவுறுத்தல்களின் எண்ணிக்கையை காட்டு</string>
+  <string name="status_bar_quick_qs_pulldown_title">துரித புல்டவுன்</string>
+  <string name="status_bar_quick_qs_pulldown_summary">நிலை பட்டையின் %1$s முனை துரித அமைப்புகளை கீழே இழுக்கிறது</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">இடது</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">வலது</string>
+  <string name="status_bar_quick_qs_pulldown_off">அணை</string>
+  <string name="status_bar_quick_qs_pulldown_left">இடது</string>
+  <string name="status_bar_quick_qs_pulldown_right">வலது</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">கடிகார ஸ்டைல்</string>
+  <string name="status_bar_clock_style_right">வலது</string>
+  <string name="status_bar_clock_style_left">இடது</string>
+  <string name="status_bar_clock_style_center">மையம்</string>
+  <string name="status_bar_clock_style_hidden">மறைந்துள்ளது</string>
+  <string name="status_bar_am_pm_title">AM/PM ஸ்டைல்</string>
+  <string name="status_bar_am_pm_info">24-மணிநேர கடிகாரம் செயல்படுத்தப்பட்டுள்ளது</string>
+  <string name="status_bar_am_pm_normal">இயல்பு</string>
+  <string name="status_bar_am_pm_small">சிறிய</string>
+  <string name="status_bar_am_pm_hidden">மறைந்துள்ளது</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">பேட்டரி நிலை ஸ்டைல்</string>
+  <string name="status_bar_battery_style_icon_portrait">ஐகான் போர்ட்ரெய்ட்</string>
+  <string name="status_bar_battery_style_icon_landscape">ஐகான் லேண்ட்ஸ்கேப்</string>
+  <string name="status_bar_battery_style_circle">வட்டம்</string>
+  <string name="status_bar_battery_style_text">உரை</string>
+  <string name="status_bar_battery_style_hidden">மறைந்துள்ளது</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">பேட்டரி சதவிகிதம்</string>
+  <string name="status_bar_battery_percentage_default">மறைந்துள்ளது</string>
+  <string name="status_bar_battery_percentage_text_inside">ஐகானுக்குள்</string>
+  <string name="status_bar_battery_percentage_text_next">அடுத்த ஐகான்</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">நிலைப் பட்டி படவுருக்கள்</string>
+  <string name="status_bar_icons_summary">எந்த நிலை பட்டி படவுருக்கள் காட்டப்படுகின்றன என்பதைக் கட்டுப்படுத்து</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">சைகை தொடல் நிகழ்வுகளை தடைசெய்</string>
+  <string name="edge_gesture_service_summary">உலாவல் மற்றும் நிலை பட்டை சைகைகளுக்கான தொடல் நிகழ்வுகளை ஆப்களுக்கு அனுப்பாதே</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">எப்போதும் வேண்டாம்</string>
+  <string name="keep_screen_on_debugging">USB பிழைநீக்கலின்போது</string>
+  <string name="keep_screen_on_charging">சார்ஜ் செய்யப்படும்போது</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">தனியுரிமை</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">இயல்நிலையால் செயல்படுத்தப்பட்டது</string>
+  <string name="privacy_guard_default_summary">புதிதாக நிருவப்பட்ட ஆப்களுக்காக இயல்நிலையால் செயல்படுத்தப்பட்டது</string>
+  <string name="privacy_guard_manager_title">அந்தரங்கம் பாதுகாப்பான்</string>
+  <string name="privacy_guard_manager_summary">உங்கள் தனிப்பட்ட தரவுகளுக்கு எந்த ஆப்களுக்கு அணுகள் இருக்கும் என்பதை நிர்வகி</string>
+  <string name="privacy_guard_no_user_apps">எந்த ஆப்களும் நிருவப்படவில்லை</string>
+  <string name="privacy_guard_help_title">உதவி</string>
+  <string name="privacy_guard_reset_title">மீட்டமை</string>
+  <string name="privacy_guard_reset_text">அனுமதிகளை மறுவமைக்கவா?</string>
+  <string name="privacy_guard_help_text">இந்த திரையிலே எந்த ஆப்களின் அந்தரங்க பாதுகாப்பான் செயல்படுத்தப்பட வேண்டும் என்பதை எளிமையாக அவற்றை தட்டுவதன் மூலம் தேர்ந்தெடுக்கலாம். உள்ளடக்கங்கள், மெசேஜ்கள் அல்லது அழைப்பு பதிவுகள் போன்ற உங்கள் தனிப்பட்ட தரவுகளை தேர்ந்தெடுக்கப்பட்ட ஆப்களால் அணுக முடியாது. ஒரு ஆப்-இன் நுழைவாயிலை நீண்ட அழுத்தம் செய்தல் அதன் விவரங்கள் திரையை திறக்கும். \n\nஉள்ளமைந்த ஆப்கள் இயல்நிலையாக காட்டப்படுவதில்லை ஆனால் அதற்குரிய பட்டியல் தெரிவை தேர்ந்தெடுப்பதன் மூலம் வெளிப்படுத்தப்படுகின்றது.</string>
+  <string name="privacy_guard_manager_show_system_apps">உள்ளமைந்த ஆப்களை காட்டு</string>
+  <string name="privacy_guard_advanced_settings_title">மேம்பட்டது</string>
+  <string name="privacy_guard_notification_title">அறிவுறுத்தலை காட்டு</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">பேட்டர்ன் பிழையை காட்டு</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">பேட்டர்ன் புள்ளிகளை காட்டு</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">நேரடியாக கடவுச்சொல் உள்ளீடு காட்டு</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">நேரடியாக களவடிவம் காட்சியை காட்டு</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">நேரடியாக PIN உள்ளீடு காட்டு</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">காட்சி இசை விஷூவலைஸர்</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">விரைவு அமைப்புகள் ஓட்டினால் முடக்கப்பட்டது</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">பூட்டுத் திரையை செயல்படுத்த தட்டு</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">பூட்டுத் திரை செயல்படுத்தப்பட்டது!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">பேட்டரி பாதுகாப்பான் வரையளவு</string>
+  <string name="battery_saver_summary">செயல்திறனை குறைத்து பின்னணி தரவுகளை கட்டுப்படுத்து</string>
+  <string name="battery_saver_summary_unavailable">சார்ஜ் செய்யும்போது கிடைக்கப்பெறுவதில்லை</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">ஒரு ஆப் சுயவிவரத்திற்கான செயல்படுத்துதல்</string>
+  <string name="autoperf_summary">பல்வேறு ஆப்களுக்கு பொருத்தமான பேட்டரி முறையை தானாக தேர்தெடுக்கவும்</string>
+  <string name="perf_profile_title">பேட்டரி முறை</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">பயன்பாடுகள் இயக்கத்திலே தொடங்கின</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">அறிவுறுத்தல் டோன்</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">மேம்பட்ட மறுதுவக்கம்</string>
+  <string name="advanced_reboot_summary">திறக்கப்படும்போது,  மீட்டல், பூட்லோடர் அல்லது மென் மறுதுவக்கத்திற்குள் மறுதுவங்குவதற்கான பவர் பட்டியலில் தெரிவுகளை சேர்க்கவும்</string>
+  <string name="category_interface">இடைமுகம்</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">விரிவுபடுத்தப்பட்ட டெஸ்க்டாப்</string>
+  <string name="expanded_hide_nothing">எதையும் மறைக்காதே</string>
+  <string name="expanded_hide_status">நிலை பட்டையை மறை</string>
+  <string name="expanded_hide_navigation">உலாவி பட்டையை மறை</string>
+  <string name="expanded_hide_both">இரண்டையும் மறை</string>
+  <string name="expanded_nothing_to_show">விரிவுபடுத்தப்பட்ட நிலைக்கான ஒரு ஆப் கட்டமைப்புக்கான தனிப்பயனாக்கத்தை சேர்க்க, \’அனைத்திற்கும் செயல்படுத்து\’ என்பதை ஆஃப் நிலைக்கு அமை</string>
+  <string name="expanded_enabled_for_all">அனைத்திற்கும் செயல்படுத்து</string>
+  <string name="expanded_desktop_style">விரிவுபடுத்தப்பட்ட டெஸ்க்டாப் ஸ்டைல்</string>
+  <string name="expanded_desktop_style_description">இயல்நிலை விரிவுபடுத்தப்பட்ட டெஸ்க்டாப் ஸ்டைலை தேர்ந்தெடு</string>
+  <string name="expanded_desktop_title">விரிவுபடுத்தப்பட்ட டெஸ்க்டாப் தெரிவுகள்</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">ஆப் பின்புற பட்டனை கொல்க</string>
+  <string name="kill_app_longpress_back_summary">பின்புற பட்டனை நீண்ட அழுத்தம் செய்வதன் மூலம் முன்புற ஆப்-ஐ கொல்க</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">சமீபத்திய பட்டியலில் தேடல் பட்டையை காட்டு</string>
+  <string name="keywords_recents_show_searchbar">சமீபத்திய சமீபத்தியவைகள் முடக்கு செயல்படுத்து காட்டு மறை தேடல் பட்டை தேடல்பட்டை</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">குரல் விழிப்பு</string>
+  <string name="voice_wakeup_retrain_title">உங்கள் குரலை மறுபயிற்சி செய்யவும்</string>
+  <string name="voice_wakeup_activity_title">தொடங்குவதற்கான செயல்</string>
+  <string name="voice_wakeup_default_activity">இப்போது கூகுள் செய்</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">குரல் விழித்தல் ஒரு நேரடி டயல் தொடர்பை தேர்வுசெய்ய தொலைப்பேசி அழைப்பு அனுமதிகளைப் பெற்றிருக்க வேண்டும்.</string>
+  <string name="picker_activities">செயல்பாடுகள்</string>
+  <string name="select_custom_app_title">தனிப்பயனாக்கப்பட்ட ஆப்-ஐ தேர்ந்தெடு</string>
+  <string name="select_custom_activity_title">தனிப்பயனாக்கப்பட்ட செயல்பாட்டை தேர்ந்தெடு</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">தடைசெய்யப்பட்ட அழைப்பாளர் பட்டியல்</string>
+  <string name="blacklist_edit_dialog_title">தடைசெய்யப்பட்ட தொலைப்பேசி எண்களை திருத்து</string>
+  <string name="blacklist_prefs">அமைப்புகள்</string>
+  <string name="blacklist_button_delete">நீக்கு</string>
+  <string name="blacklist_empty_text">உங்களிடம் தடைசெய்யப்பட்ட எண்கள் எதுவும் இல்லை சேர்(+) பட்டனை தொடுவதன் மூலம் ஒரு உள்ளீட்டை சேர்</string>
+  <string name="blacklist_disabled_empty_text">தொலைப்பேசி எண்கள் உங்களை அழைத்தல் அல்லது மெசேஜ் செய்தலை தடுக்க, தடைசெய்யப்பட்ட அழைப்பாளர் பட்டியலை இயக்கவும்</string>
+  <string name="blacklist_summary_disabled">முடக்கப்பட்டது</string>
+  <string name="blacklist_summary">தடைசெய்யப்பட்ட அழைப்பாளர் பட்டியலில் இருந்து நீங்கள் அழைப்புகள் அல்லது மெசேஜ்களை பெற மாட்டீர்கள்</string>
+  <string name="blacklist_notify">அறிவுறுத்தலை காட்டு</string>
+  <string name="blacklist_private_numbers_title">தனியார் எண்கள்</string>
+  <string name="blacklist_private_numbers_summary_disabled">தனியார் எண்களில் இருந்து வரும் அழைப்புகளை தடைசெய்ய வேண்டாம்</string>
+  <string name="blacklist_private_numbers_summary">தனியார் எண்களில் இருந்து உள்வரும் <xliff:g id="type">%s</xliff:g>களை தடைசெய்</string>
+  <string name="blacklist_unknown_numbers_title">அறியாத எண்கள்</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">தொடர்பு பட்டியலில் இல்லாத எண்களில் இருந்து வரும் அழைப்புகள் அல்லது மெசேஜ்களை தடைசெய்யாதே</string>
+  <string name="blacklist_unknown_numbers_summary">தொடர்பு பட்டியலில் இல்லாத எண்களில் இருந்து உள்வரும் <xliff:g id="type">%s</xliff:g>களை தடைசெய்</string>
+  <string name="blacklist_summary_type_calls_only">அழைப்புகள்</string>
+  <string name="blacklist_summary_type_messages_only">மெசேஜ்கள்</string>
+  <string name="blacklist_summary_type_calls_and_messages">அழைப்புகள் மற்றும் மெசேஜ்கள்</string>
+  <string name="blacklist_regex_title">வைல்ட்கார்டுகளை பயன்படுத்து</string>
+  <string name="blacklist_regex_summary">.ஐ வைல்ட்கார்டாகவும் *ஐ மறுநிகவுக்காகவும் பயன்படுத்து எ.கா.123.* ’123’ என தொடங்கும் எண்களை தடைசெய்கிறது மற்றும் .*123.* ’123’ உடைய எண்களை தடைசெய்கிறது</string>
+  <string name="blacklist_policy_block_calls">உள்வரும் அழைப்புகளை தடைசெய்</string>
+  <string name="blacklist_policy_block_messages">உள்வரும் மெசேஜ்களை தடைசெய்</string>
+  <string name="blacklist_bad_number_add">தடைசெய்யப்பட்ட அழைப்பாளர் பட்டியலில் செல்லாத தொலைப்பேசி எண்னை சேர்க்க முடியவில்லை</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">எண்னை நீக்கு</string>
+  <string name="remove_blacklist_entry">இந்த தடைசெய்யப்பட்ட தொலைப்பேசி எண்னை நீங்கள் நீக்க விரும்புகிறீர்களா?</string>
+  <string name="select_contact">தொடர்பை தேர்ந்தெடு</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">ஆப் பாதுகாப்பு</string>
+  <string name="sms_security_check_limit_title">SMS மெசேஜ் எல்லை</string>
+  <string name="sms_security_check_limit_summary">உறுதிப்படுத்துதல் தேவைப்படுவதற்கு 1 நிமிடத்திற்குள் ஆப்ஸ் %d மெசேஜ்களை அனுப்ப முடியும்</string>
+  <string name="sms_security_check_limit_summary_none">உறுதிப்படுத்துதல் இல்லாமல் ஆப்ஸ் எந்த மெசேஜ்களையும் அனுப்ப அனுமதிக்கப்படுவதில்லை</string>
+  <string name="sms_security_check_limit_none">ஏதுமில்லை</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s சேர்க்கப்பட்டது</string>
+  <string name="spam_last_blocked_title">கடைசியாக தடைசெய்யப்பட்டது %1$s</string>
+  <string name="block_notifications_title">அறிவுறுத்தல்களை வடிகட்டு</string>
+  <string name="block_notifications_summary">புறக்கணித்த அறிவுறுத்தல்களையும் வடிகட்டிகளையும் நிர்வகி</string>
+  <string name="no_filters_title">வடிகட்டிகள் எதுவும் அமைக்கப்படவில்லை</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod புள்ளிவிவரங்கள்</string>
+  <string name="anonymous_statistics_summary">CyanogenMod மேம்பட்டு செயல்பட பெயரில்லா புள்ளிவிவர அறிவிப்பை தெரிந்துகொள்ளவும்</string>
+  <string name="anonymous_statistics_warning_title">இதுபற்றி</string>
+  <string name="anonymous_statistics_warning">CyanogenMod புள்ளிவிவரங்களை தேர்ந்தெடுத்தல் தனிப்பட்டது அல்லாத தரவுகளை CyanogenMod உருவாக்கியவர்களுக்கு சமர்பிக்க அனுமதித்து கருவிகளுக்கு இடையே தனித்துவமான நிறுவல்களை கண்காணிக்க உதவும் சமர்பிக்கப்பட்ட தகவல்களில் ஒரு தனித்துவமான அடையாளம் காண்பான் உள்ளது, அது உங்கள் அந்தரங்கத்தை அல்லது தனிப்பட்ட தரவை சமரசம் செய்யாது. இந்த தரவு ஒவ்வொரு பூட்டிலும் சமர்பிக்கபப்டுகின்றது. \n\n சமர்பிக்கப்பட்ட தரவுகளுக்கான உதாரணத்திற்கு தரவுகள் முன்னோட்டத்தை தட்டவும்</string>
+  <string name="enable_reporting_title">தெரிவித்தலை செயல்படுத்து</string>
+  <string name="preview_data_title">தரவுகளை முன்னோட்டம்பார்</string>
+  <string name="view_stats_title">புள்ளிவிவரங்களை காண்</string>
+  <string name="anonymous_learn_more">மேலும் அறிக</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">தனித்துவமான ID</string>
+  <string name="preview_device_title">சாதனம்</string>
+  <string name="preview_version_title">பதிப்பு</string>
+  <string name="preview_country_title">நாடு</string>
+  <string name="preview_carrier_title">சேவை வழங்குநர்</string>
+  <string name="stats_collection_title">புள்ளிவிவர சேகரிப்பு</string>
+  <string name="stats_collection_summary">செயல்படுத்தப்படும்போது, மெர்ட்ரிக்ஸ் சேகரிப்பை அனுமதிக்கிறது</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">பேட்டர்னை மறுவமை</string>
+  <string name="lockpattern_settings_reset_summary">பேட்டர்ன் லாக்கை மறுவமைக்க மின்னஞ்சல் கணக்கையும் தொடர்புடைய கடவுச்சொல்லையும் உள்ளிடு</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">மீட்டமை</string>
+  <string name="menu_hidden_apps_reset_lock">பேட்டர்ன் லாக்கை மறுவமை</string>
+  <string name="protected_apps">பாதுகாக்கப்பட்ட ஆப்ஸ்</string>
+  <string name="protected_apps_summary">எந்த பயன்பாடுகள் பாதுகாப்பான பூட்டிற்கு பின் மறைந்திருக்கின்றன என்பதை நிர்வகி</string>
+  <string name="saving_protected_components">காம்போனென்ட் நிலையை சேமிக்கிறது\u2026</string>
+  <string name="pa_login_username_hint">பயனர்பெயர் (மின்னஞ்சல்)</string>
+  <string name="pa_login_password_hint">கடவுச்சொல்</string>
+  <string name="pa_login_submit_button">உள்நுழைக</string>
+  <string name="pa_login_checking_password">கணக்கைச் சரிபார்க்கிறது…</string>
+  <string name="pa_login_incorrect_login">புகுபதிகை தவறு</string>
+  <string name="pa_pattern_or_fingerprint_header">களவடிவத்தை வரைய வேண்டும் அல்லது பூட்டுநீக்க கைரேகையை பயன்படுத்த வேண்டும்.</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">பங்களிப்பாளர்கள்</string>
+  <string name="contributors_cloud_loading_message">பங்களிப்போர் தரவுகள்\u2026 லோடிங்</string>
+  <string name="contributors_cloud_failed_message">பங்களிப்போர் தரவுகள் லோட் செய்ய முடியவில்லை</string>
+  <string name="contributor_info_menu">பங்களிப்போர் விவரம்</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>பெயர்:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Nick:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Commits:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">பங்களிப்போர் விவரம்</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>மொத்த பங்களிப்பாளர்கள்:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>மொத்த கம்மிட்ஸ்:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>கடைசி புதுப்பிப்பு:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ஒலிகள்</string>
+  <string name="notification_manager">அறிவிப்புகள்</string>
+  <string name="lockscreen_settings">பூட்டுத் திரை</string>
+  <string name="category_lights">ஒளிகள்</string>
+  <string name="category_volume">ஒலியளவு</string>
+  <string name="category_vibrate">அதிர்வு</string>
+  <string name="category_misc">இதர அமைப்பு</string>
+  <string name="title_general">பொது</string>
+  <string name="advanced">மேம்பட்டது</string>
+  <string name="link_volume_option_title">ரிங்டோன் &amp; அறிவுறுத்தல் சத்தங்களை இணை</string>
+  <string name="lcd_density_prompt_message">சில பயன்பாடுகள் தரநிலை இல்லாத DPIஇல் இயங்காமல் இருக்கலாம்.\n\n இது உங்கள் சாதனத்தை மறுதுவக்கம் செய்யும்</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP தொலைப்பேசி எண்</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">டுபிலிகேட் APN</string>
+  <string name="duplicate_apn_error_message">இந்த APN ஏற்கனவே உள்ளது. நிராகரி அல்லது மதிப்புகளை மாற்றவும்.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> என்பது <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+  <string name="sim_disabled">முடக்கப்பட்டது</string>
+  <string name="sim_missing">காணவில்லை அல்லது கோளாறு</string>
+  <string name="sim_enabler_need_disable_sim">SIM கார்டு முடக்கப்படும். நீங்கள் தொடர விரும்புகிறீர்களா?</string>
+  <string name="sim_enabler_will_disable_sim_title">கவனத்திற்கு</string>
+  <string name="sim_enabler_need_switch_data_service">இந்த SIM முடக்கப்படும் மற்றும் SIM <xliff:g id="slotid">%1$s</xliff:g> தரவு சேவைகளுக்காக பயன்படுத்தப்படும். நீங்கள் உறுதியாக தொடர விரும்புகிறீர்களா?</string>
+  <string name="sim_enabler_airplane_on">ஏர்ப்ளேன் முறை ஆன் ஆக இருக்கும்போது செயல்பாட்டை செய்ய முடியவில்லை</string>
+  <string name="sim_enabler_in_call">அழைப்பின் போது செயல்பாட்டை செய்ய முடியவில்லை</string>
+  <string name="sim_enabler_both_inactive">அனைத்து SIM கார்டுகளையும் முடக்க முடியவில்லை</string>
+  <string name="sim_enabler_enabling">செயல்படுத்துகிறது\u2026</string>
+  <string name="sim_enabler_disabling">முடக்குகிறது\u2026</string>
+  <string name="sub_activate_success">SIM செயல்படுத்துகிறது.</string>
+  <string name="sub_activate_failed">செயல்படுத்துதல் தோல்வியடைந்தது.</string>
+  <string name="sub_deactivate_success">SIM முடக்கப்பட்டது.</string>
+  <string name="sub_deactivate_failed">முடக்குதல் தோல்வியடைந்தது.</string>
+  <string name="primary_sub_select_title">இயல்நிலை 3G/LTE சந்தா</string>
+  <string name="select_sim_card">சிம் கார்டைத் தேர்ந்தெடுக்கவும்</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d நிலை</string>
+  <string name="sim_card_lock_settings_title">SIM %d லாக் அமைப்புகள்</string>
+  <string name="sim_card_summary_empty">SIM சொருகப்படவில்லை</string>
+  <string name="sim_mobile_network_settings_category_title">மொபைல் நெட்வொர்க் அமைப்புகள்</string>
+  <string name="sim_mobile_network_settings_title">SIM %d அமைப்புகள்</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">நினைவூட்டல்கள்</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">நிகழ்வுகள்</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">தேர்வுசெய்யப்பட்ட அழைப்பாளர்கள்</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">தேர்வுசெய்யப்பட்ட செய்திகள்</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">தலை: %1$s W/கிலோ</string>
+  <string name="maximum_body_level">உடல்: %1$s W/கிலோ</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">மாதிரி %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">SIM %d ரிங்டோன்</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">பயன்பாடு:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">கடந்த முறை பயன்படுத்தப்பட்டது:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">பயன்பாட்டு நேரம்:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">இது உங்கள் டேப்லெட்டின் <b>உள்ளார்ந்த சேமிப்பகத்தின்</b> அனைத்து தரவுகளையும் அழித்துவிடும், அதில் உள்ளடங்குபவை: \n\n<li>உங்கள் கருவி கணக்குகள்</li>\n<li>சிஸ்டம் மற்றும் ஆப் தரவுகள் மற்றும் அமைப்புகள்</li>\n<li>தரவிறக்கம்செய்த ஆப்கள்</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">இது உங்கள் தொலைப்பேசியின் <b>உள்ளார்ந்த சேமிப்பகத்தின்</b> அனைத்து தரவுகளையும் அழித்துவிடும், அதில் உள்ளடங்குபவை: \n\n<li>உங்கள் கருவி கணக்குகள்</li>\n<li>சிஸ்டம் மற்றும் ஆப் தரவுகள் மற்றும் அமைப்புகள்</li>\n<li>தரவிறக்கம்செய்த ஆப்கள்</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">தனிப்பட்ட தரவுகள் &amp; ஆப்கள்</string>
+  <string name="factory_reset_instructions_summary">இது இந்த கருவியில் உள்ள உங்கள் கணக்குகள், ஆப்கள், ஆப் தரவுகள், மற்றும் சிஸ்டம் அமைப்புகள் அனைத்தையும் அழித்துவிடும்.</string>
+  <string name="factory_reset_personal_content">தனிப்பட்ட உள்ளடக்கம்</string>
+  <string name="factory_reset_erase_stored_content">சேமிக்கப்பட்ட உள்ளடக்கத்தை அழி</string>
+  <string name="factory_reset_erase_stored_content_summary">இந்த கருவியில் உள்ள இசை, புகைப்படங்கள், வீடியோக்கள் மற்றும் பிற சேமிக்கப்பட்ட பயனர் தரவுகளை அழி</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">இந்த கருவியில் உள்ள இசை, புகைப்படங்கள், வீடியோக்கள் மற்றும் பிற சேமிக்கப்பட்ட பயனர் தரவுகளை அழி \n\n <b>கருவி என்கிரிப்ஷன் காரணமாக உள்ளடக்கம் சேமிக்கப்பட முடியாது.</b></string>
+  <string name="factory_reset_erase_sd_card">SD கார்டை ஃபார்மாட் செய்</string>
+  <string name="factory_reset_erase_sd_card_summary">SD கார்டில் உள்ள இசை மற்றும் புகைப்படம் உள்ளிட்ட அனைத்து தரவுகளையும் அழி</string>
+  <string name="factory_reset_warning_text_reset_now">இப்போது மறுவமை</string>
+  <string name="factory_reset_warning_text_message">இந்த கருவியில் இருந்து உங்கள் கணக்குகள், ஆப்கள், ஆப் தரவுகள் மற்றும் சிஸ்டம் அமைப்புகள் அனைத்தும் நீக்கப்படும் இது திரும்பப்பெற முடியாதது</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">பிற</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi ஹாட்ஸ்பாட் டைம்அவுட்</string>
+  <string name="hotstpot_inactivity_timeout_never">எப்போதும் வேண்டாம்</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 நிமிடம்</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 நிமிடங்கள்</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 நிமிடங்கள்</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">போர்டபல் Wi\u2011Fi ஹாட்ஸ்பாட் காலமுடிவு ஆகாது</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">போர்டபல் Wi\u2011Fi ஹாட்ஸ்பாட் <xliff:g id="timeout">%1$s</xliff:g>பிறகு காலமுடிவடைந்தது</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">நேரலை பூட்டுத் திரை	</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">நேரலை பூட்டுத் திரையை இயக்கவும் மற்றும் கட்டமைக்கவும்	</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">அமைப்புகள்</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">கிடைக்கின்ற நேரலை பூட்டுத் திரைகளைப் பார்க்க, நேரலை பூட்டுத் திரையை ஆன் செய்யவும்.	</string>
+  <string name="interruptions_ignore_while_media_title">ஆடியோ டக்கிங்கை தடு</string>
+  <string name="interruptions_ignore_while_media_summary">ஒரு அறிவுறுத்தல் வரும்போது ஊடக மறுஇயக்கம் வால்யூமை குறைக்காதே</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">CyanogenMod சட்டம்</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">புள்ளிவிவரங்களை மீட்டமை</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">மின்கலம் வரலாற்று புள்ளிவிவரங்கள் மீட்டமைக்கப்பட இருக்கின்றன</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">டாக் மின்கலம் இல்லை</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">டாக் ACயில் சார்ஜ் செய்கிறது</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">டாக் USB மீது சார்ஜ் செய்கிறது</string>
 </resources>
diff --git a/res/values-te-rIN/cm_plurals.xml b/res/values-te-rIN/cm_plurals.xml
new file mode 100644
index 0000000..5edb64e
--- /dev/null
+++ b/res/values-te-rIN/cm_plurals.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> సెకను</item>
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> సెకనులు</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="one">ఒకసారి</item>
+    <item quantity="other">%d సార్లు</item>
+  </plurals>
+</resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 5fd19c8..556d925 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -17,161 +17,980 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">డెవలప్మెంట్ సెట్టింగులను ప్రారంభించడానికి ఇప్పుడు మీరు <xliff:g id="step_count">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు.</item>
+    <item quantity="other">డెవలప్మెంట్ సెట్టింగులను ప్రారంభించడానికి ఇప్పుడు మీరు <xliff:g id="step_count">%1$d</xliff:g> అడుగుల దూరంలో ఉన్నారు.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">మీరు ఇప్పుడు డెవలప్మెంట్ సెట్టింగులను ప్రారంభించారు!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">అవసరం లేదు, మీరు ఇప్పటికే డెవలప్మెంట్ సెట్టింగులను ప్రారంభించేశారు.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">అభివృద్ధి సాధనాలు</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">డెవలప్మెంటుకు సత్వరమార్గం</string>
+  <string name="development_shortcut_summary">ఇటీవలి అనువర్తనాల లిస్టులో యాప్ నిర్వహణ సత్వరమార్గాలను చేతనపరచండి</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">మూల ప్రాప్తి</string>
+  <string name="root_access_warning_title">మూల ప్రాప్తిని అనుమతించాలా?</string>
+  <string name="root_access_warning_message">ప్రోగ్రాంలు మూల ప్రాప్తి కొరకు అభ్యర్థించడానికి అనుమతించడం చాలా ప్రమదకరం మరియు మీ సిస్టం యొక్క భద్రతతో రాజీపడడం వంటిదే!</string>
+  <string name="root_access_none">నిలిపివేయబడింది</string>
+  <string name="root_access_apps">అనువర్తనాలు మాత్రమే</string>
+  <string name="root_access_adb">ADB మాత్రమే</string>
+  <string name="root_access_all">అనువర్తనాలు మరియు ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">సయనోజెన్ మోడ్ సంస్కరణ</string>
+  <string name="mod_version_default">తెలియదు</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">పరికరం మోడల్</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">పరికరం పేరు</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">సయనోజెన్ మోడ్ API స్థాయి</string>
+  <string name="mod_api_level_default">తెలియదు</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">నిర్మించబడిన తేదీ</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">సయనోజెన్ మోడ్ అప్డేట్లు</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">సయనోజెన్ పునరుద్ధరణను నవీకరించుము</string>
+  <string name="update_recovery_summary">సిస్టమ్ అప్డేట్లతో పునరుద్ధరణను అప్డేట్ చేయుము</string>
+  <string name="update_recovery_on_warning">గమనిక: ఈ విశేషాంశాన్ని అమలు చేసినప్పుడు, అప్పుడు నడుస్తున్న OS యొక్క ప్రస్తుత సంస్కరణతో పాటుగా చేర్చబడిన దానితో మీ యొక్క ఇన్స్టాల్డ్ మెమరీ భర్తీ చేయబడుతుంది. \n\nభవిష్యత్ సంస్కరణలతో సరితూగేలా ఉండేందుకై మీ పునరుద్ధరణ మీ యొక్క సిస్టమ్ ఆధునీకరణలతో అప్ గ్రేడ్  చేయబడుతుంది.  \n\nమీరు ఈ విశేషాంశం అమలు చేయాలనుకుంటున్నారా?</string>
+  <string name="update_recovery_off_warning">హెచ్చ్జరిక: ఈ లక్షణం నిలిపివేయబడినప్పుడు, మీ యొక్క వ్యవస్థాపించబడిన పునరుద్ధరణ OS ఉన్నతీకరణలతో నవీకరించబడదు.\n\nభవిష్యత్ OS నవీకరణలు కాలంచెల్లిన లేదా అనుకూల పునరుద్దరణ సంస్కరణలతో వ్యవస్థాపించకబడపోవచ్చు.\n\nమీరి నిజంగా ఈ లక్షణాన్ని నిలిపివేయాలని అనుకుంటున్నారా?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">థీములు</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">రింగ్ మోడ్</string>
+  <string name="ring_mode_normal">సాధారణం</string>
+  <string name="ring_mode_vibrate">వైబ్రేట్</string>
+  <string name="ring_mode_mute">నిశ్శబ్దం</string>
+  <string name="settings_reset_button">రీసెట్ చేయి</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">సిస్టమ్ ప్రోఫైళ్ళు</string>
+  <string name="profiles_add">జోడించండి</string>
+  <string name="profile_menu_delete">తొలగించు</string>
+  <string name="profile_settings_title">ప్రొఫైల్</string>
+  <string name="profile_empty_list_profiles_off">సిస్టమ్ యొక్క ప్రొఫైళ్ళను నిర్మితీకరించడానికి మరియు ఉపయోగించడానికి, ప్రొఫైళ్ళను ఆన్ చేయండి.</string>
+  <string name="profile_trigger_configure">కాన్ఫిగర్ ప్రారంభమయ్యింది</string>
+  <string name="profile_write_nfc_tag">NFC ట్యాగ్‌కు వ్రాయండి</string>
+  <string name="profile_write_touch_tag">వ్రాసేందుకు ట్యాగును తాకు</string>
+  <string name="profile_write_success">ట్యాగ్ విజయవంతంగా వ్రాయబడింది</string>
+  <string name="profile_write_failed">ట్యాగ్ వ్రాయబడడం విఫలమయ్యింది</string>
+  <string name="profile_selected">ప్రొఫైల్ ఎంపిక చేయబడింది: %1$s</string>
+  <string name="profile_nfc_text">ఒక NFC ట్యాగుకు ప్రొఫైలును వ్రాసేటప్పుడు ప్రొఫైలును ఎంచుకునేందుకు ట్యాగును తట్టడానికి అనుమతిని ఇస్తుంది. రెండవసారి తట్టినట్లయితే అంతకు మునుపు ఎంపిక చేసుకోబడిన ప్రొఫైల్ ఎంచుకోబడుతుంది.</string>
+  <string name="profile_unknown_nfc_tag">అజ్ఞాత ప్రొఫైల్</string>
+  <string name="profile_add_nfc_text">ఈ NFC ట్యాగ్ ఒక అజ్ఞాత ప్రొఫైలును సూచిస్తుంది. అప్పటికే ఉన్న ప్రొఫైలుకు ఈ  NFC ట్యాగును జోడించడం భవిష్యత్తులో ప్రొఫైలును ఎంచుకోవడానికి అనుమతిని ఇస్తుంది.</string>
+  <string name="profile_select">ప్రొఫైలును ఎంచు</string>
+  <string name="profile_remove_dialog_message">%1$s ప్రొఫైలును తొలిగించండి?</string>
+  <string name="profile_populate_profile_from_state">పరికరం యొక్క ప్రస్తుత సెట్టింగులను ఉపయోగించి ప్రొఫైలును కాన్ఫిగర్ చేయాలా?</string>
+  <string name="profile_menu_fill_from_state">పరికరం యొక్క ప్రస్తుత సెట్టింగులను దిగుమతి చేయుము</string>
+  <string name="profile_remove_current_profile">ప్రస్తుత ప్రొఫైలును డిలీట్ చేయడం కుదరలేదు!</string>
+  <string name="profile_app_group_category_title">నోటిఫికేషన్ అధిగమనాలు</string>
+  <string name="profile_app_group_item_instructions">గ్రూపులను జోడించండి లేదా తొలిగించుము</string>
+  <string name="profile_app_group_item_instructions_summary">నోటిఫికేషన్ అధిగమనాల ప్రోగ్రాం సమూహాలను ఈ ప్రొఫైలుకు జోడించుము లేదా దాని నుండి తొలిగించుము</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">ఆన్</string>
+  <string name="profile_entries_off">ఆఫ్‌లో ఉంది</string>
+  <string name="profile_entries_no_override">అధిగమనం లేదు</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">పేరు</string>
+  <string name="new_profile_name">&lt;క్రొత్త ప్రొఫైల్&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">పేరు మార్చు</string>
+  <string name="rename_dialog_message">ఒక క్రొత్త పేరును ఎంటర్ చేయండి</string>
+  <string name="duplicate_appgroup_name">నకిలీ ప్రోగ్రాం సమూహం పేరు!</string>
+  <string name="rename_dialog_hint">ప్రొఫైల్ పేరును ఎంటర్ చేయండి</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">రీసెట్ చేయి</string>
+  <string name="profile_reset_message">వినియోగాదారునిచే సృష్టించబడిన ప్రోఫైళ్ళు మరియు ప్రోగ్రాం సమూహాలను తొలిగించి వాటిని స్వయంసిద్ధాలకు పునరుద్ధరించాలా?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">ఈ ప్రోగ్రాం తొలిగించాలా?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2జి</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">వాల్యూమ్ అధిగమనాలు</string>
+  <string name="connection_state_enabled">ప్రారంభించు</string>
+  <string name="volume_override_summary">%1$s/%2$s కు సెట్ చేయుము</string>
+  <string name="profile_volume_override_checkbox_label">అధిగమనాల వాల్యూమ్</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">ప్రొఫైళ్ళు</string>
+  <string name="profile_profile_manage">ప్రొఫైలును మేనేజ్ చేయుము</string>
+  <string name="profile_appgroups_manage">ప్రోగ్రాం గ్రూపులు</string>
+  <string name="profile_appgroup_manage">ప్రోగ్రాం సమూహాన్ని నిర్వహించుము</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">ప్రొఫైల్ సెట్టింగ్‌లు</string>
+  <string name="profile_trigger_connect">కనెక్ట్ చేసి ఉన్నప్పుడు</string>
+  <string name="profile_trigger_disconnect">డిస్కనెక్ట్ చేసి ఉన్నప్పుడు</string>
+  <string name="profile_trigger_notrigger">ట్రిగ్గర్ లేదు</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">నోటిఫికేషన్ మోడ్</string>
+  <string name="ringer_mode">రింగ్ మోడ్</string>
+  <string name="lights_mode">లైట్స్ మోడ్</string>
+  <string name="vibrate_mode">వైబ్రేట్ మోడ్</string>
+  <string name="choose_soundtone">నోటిఫికేషన్ టోనును ఎంపిక చేయము</string>
+  <string name="choose_ringtone">రింగ్‌టోన్ ఎంచుకో</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">నోటిఫికేషన్ టోన్</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ప్రోగ్రాం గ్రూపులు</string>
+  <string name="profile_applist_title">అనువర్తనాలు</string>
+  <string name="profile_new_appgroup">క్రొత్త ప్రోగ్రాం సమూహం</string>
+  <string name="profile_delete_appgroup">ఈ ప్రోగ్రాం సమూహాన్ని తొలిగించాలా?</string>
+  <string name="profile_appgroup_name_prompt">క్రొత్త ప్రోగ్రాం సమూహానికి ఒక క్రొత్త పేరును నమోదు చేయుము</string>
+  <string name="profile_appgroup_name_title">పేరు</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">అనువర్తనాన్ని ఎంచుకోండి</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">సిస్టమ్ సెట్టింగులు</string>
+  <string name="profile_lockmode_title">లాక్ స్క్రీన్ మోడ్</string>
+  <string name="profile_lockmode_policy_disabled_summary">పరికర నిర్వాహకుని విధానంచే ఈ ప్రొఫైల్ ఆప్షన్ నిలిపివేయబడింది</string>
+  <string name="profile_lockmode_insecure_summary">PIN లేదా పాస్వర్డ్ కొరకు అడగవద్దు</string>
+  <string name="profile_lockmode_disabled_summary">లాక్ స్క్రీనును నిర్వీర్యం చేయుము</string>
+  <string name="profile_airplanemode_title">ఎయిర్‌ప్లైన్ మోడ్</string>
+  <string name="profile_brightness_title">స్క్రీన్ ప్రకాశవంతం</string>
+  <string name="profile_brightness_override_summary">%1$d%%కు సెట్ చేయండి</string>
+  <string name="profile_brightness_override_checkbox_label">అధిగామనాల ప్రకాశం</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi‑Fi</string>
+  <string name="toggleWifiAp">పోర్టబుల్ Wi‑Fi హాట్‌స్పాట్</string>
+  <string name="toggleBluetooth">బ్లూటూత్</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">డేటా అనుసంధానం</string>
+  <string name="toggleSync">డేటాను స్వయంచాలకంగా సమకాలీకరించు</string>
+  <string name="toggle2g3g4g">ప్రాధాన్య నెట్‌వర్క్ రకం</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi ప్రాంతం కోడ్</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fiకు ప్రాంతం కోడును పేర్కొనుము</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">ప్రాంతం కోడును సెట్ చేయడంలో సమస్య ఉంది.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">తొలగించు</string>
+  <string name="profile_action_none">మార్పు చేయకుండా వదిలివేయి</string>
+  <string name="profile_action_system">సిస్టమ్ స్వయంసిద్ధంగా</string>
+  <string name="profile_action_disable">ఆపివేయి</string>
+  <string name="profile_action_enable">ప్రారంభించు</string>
+  <string name="profile_trigger_a2dp_connect">A2DPకు అనుసంధానం చేసినప్పుడు</string>
+  <string name="profile_trigger_a2dp_disconnect">A2DP నుండి నిరానుసంధానించినప్పుడు</string>
+  <string name="profile_tabs_wifi">Wi‑Fi</string>
+  <string name="profile_tabs_bluetooth">బ్లూటూత్</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">ట్రిగ్గర్లు ఈ ప్రొఫైలును క్రియాశీలం చేస్తాయి</string>
+  <string name="profile_setup_setup_triggers_title">1వ దశ: ట్రిగ్గర్లను జోడించుము</string>
+  <string name="profile_setup_setup_triggers_title_config">ట్రిగ్గర్లను సవరించుము <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">2వ దశ: సెటప్ చర్యలు</string>
+  <string name="profile_setup_actions_title_config">తిరిగి నిర్మితీకరణ చేసే చర్యలు</string>
+  <string name="profile_appgroups_manage">ప్రోగ్రాం గ్రూపులు</string>
+  <string name="profile_appgroup_manage">ప్రోగ్రాం సమూహాన్ని నిర్వహించుము</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">ప్రోగ్రాం గ్రూపులు</string>
+  <string name="profile_new_appgroup">క్రొత్త ప్రోగ్రాం సమూహం</string>
+  <string name="profile_delete_appgroup">ఈ ప్రోగ్రాం సమూహాన్ని తొలిగించాలా?</string>
+  <string name="profile_appgroup_name_prompt">క్రొత్త ప్రోగ్రాం సమూహానికి ఒక క్రొత్త పేరును నమోదు చేయుము</string>
+  <string name="profile_appgroup_name_title">పేరు</string>
+  <string name="duplicate_appgroup_name">నకిలీ ప్రోగ్రాం సమూహం పేరు!</string>
+  <string name="profile_app_delete_confirm">ఈ ప్రోగ్రాం తొలిగించాలా?</string>
+  <string name="no_bluetooth_triggers">ఎటువంటి బ్లూత్ టూత్ పరికరాలు జత చేయబడలేదు. ట్రిగ్గర్లను కాన్ఫిగర్ చేసే ముందు బ్లూటూత్ పరికరాన్ని జతచేసేందుకు ట్యాప్ చేయండి.</string>
+  <string name="no_wifi_triggers">Wi\u2011Fi ప్రాప్యత పాయింట్లు నిర్మితీకరించబడలేదు.\n ట్రిగ్గర్లను కాన్ఫిగర్ చేసేముందు Wi\u2011Fiను అనుసంధానించేందుకు ట్యాప్ చేయండి.</string>
+  <string name="no_triggers_configured">ఎటువంటి ట్రిగ్గర్లు నిర్మితీకరించబడలేదు. ఎక్కువగా జోడించేందుకు ట్యాప్ చేయుము.</string>
+  <string name="no_triggers_configured_nfc">ఒక క్రొత్త NFC ట్రిగ్గరును సెటప్ చేసేందుకు ట్యాప్ చేయండి.</string>
+  <string name="profile_setup_setup_triggers_description">దయచేసి ఈ ప్రొఫైలును క్రియాశీలం చేసే ట్రిగ్గర్లను ఎంచుకోండి.</string>
+  <string name="profile_setup_actions_description">ఇప్పుడు తరువాతి ప్రొఫైల్ క్రియాశీలం చేయబడినప్పుడు ఏమి జరుగుతుందో దానిని నిర్మితీకరించండి</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">సంచార పట్టీ</string>
+  <string name="navigation_bar_left_title">ఎడమ-చేతి వాటం ఉన్నవి</string>
+  <string name="navigation_bar_left_summary">నావిగేషన్ బారును స్క్రీనుకు ఎడమ వైపున సమాంతర రీతిలో (లాండ్ స్కేప్ మోడ్) ఉంచండి</string>
+  <string name="navigation_bar_title">బటన్స్ మరియు అమరిక</string>
+  <string name="navigation_bar_help_text">ప్రారంభించేటప్పుడు ఎడిటింగ్ కొరకు నావిగేషన్ బారును అన్లాక్ చేయడానికి ఎడిట్ చిహ్నాన్ని ట్యాప్ చేయండి. \n\nదాని యొక్క సత్వరమార్గాన్ని మార్చేందుకు మీరు చిహ్నం పైన ట్యాప్ చేయవచ్చు, లేదా అమరికను తిరిగి సరిదిద్దేందుకు ఎక్కువ సేపు నొక్కి పట్టుకుని ఉంచండి. \n\nమీ మార్పులను అంతే ఉంచడానికి \'సేవ్\' ను, లేదా అమరికను తిరిగి స్వయంసిద్ధ సెట్టింగులకు సెట్ చేసేందుకు \'రిస్టోర్ డీఫాల్ట్స్\'ను ట్యాప్ చేయండి.</string>
+  <string name="navigation_restore_button_text">\nస్వయంసిద్ధాలను పునరుద్ధరించుము</string>
+  <string name="navigation_edit_button_text">సవరించు</string>
+  <string name="navigation_save_button_text">సేవ్ చేయి</string>
+  <string name="navigation_bar_reset_message">ప్రస్తుత సెట్టింగులను తొలిగించి స్వయంసిద్ధ అమరికను పునరుద్ధరించాలా?</string>
+  <string name="navigation_bar_arrow_keys_title">టైప్ చేసేటప్పుడు బాణం కీలను చూపుము</string>
+  <string name="navigation_bar_arrow_keys_summary">టైప్ చేసేటప్పుడు ఎడమ మరియు కుడి కర్సర్ బటన్లను ప్రదర్శించుము. IME స్విచ్చరును అధిగమిస్తుంది.</string>
+  <string name="navigation_bar_recents_title">ఇటీవలి ఎక్కువ-సేపు నొక్కి పట్టుకుని ఉన్న చర్య</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">లైట్ సెట్టింగులను సవరించుము</string>
+  <string name="pulse_speed_title">పల్స్ పొడవు మరియు వేగం</string>
+  <string name="default_time">సాధారణం</string>
+  <string name="custom_time">అనుకూలం</string>
+  <string name="dialog_delete_title">తొలగించు</string>
+  <string name="dialog_delete_message">ఎంచుకోబడిన అంశాన్ని తొలిగించాలా?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">ఎప్పుడూ ఆన్‌లో ఉంచు</string>
+  <string name="pulse_length_very_short">చాలా చిన్నది</string>
+  <string name="pulse_length_short">చిన్నది</string>
+  <string name="pulse_length_normal">సాధారణం</string>
+  <string name="pulse_length_long">పొడవైనది</string>
+  <string name="pulse_length_very_long">చాలా పొడవైనది</string>
+  <string name="pulse_speed_very_fast">చాలా వేగవంతం</string>
+  <string name="pulse_speed_fast">వేగవంతం</string>
+  <string name="pulse_speed_normal">సాధారణం</string>
+  <string name="pulse_speed_slow">నిదానం</string>
+  <string name="pulse_speed_very_slow">చాలా నిదానం</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">బ్యాటరీ లైట్</string>
+  <string name="battery_low_pulse_title">ఒకవేళ బ్యాటరీ తక్కువలో ఉంటే పల్స్</string>
+  <string name="battery_light_list_title">రంగులు</string>
+  <string name="battery_light_low_color_title">బ్యాటరీ తక్కువ</string>
+  <string name="battery_light_medium_color_title">ఛార్జింగ్</string>
+  <string name="battery_light_full_color_title">పూర్తిగా చార్జ్ చేయబడింది</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">నోటిఫికేషన్ లైట్</string>
+  <string name="notification_light_general_title">సాధారణం</string>
+  <string name="notification_light_applist_title">అనువర్తనాలు</string>
+  <string name="notification_light_phonelist_title">ఫోన్</string>
+  <string name="notification_light_use_custom">కస్టం విలువలను ఉపయోగించుము</string>
+  <string name="notification_light_default_value">డిఫాల్ట్</string>
+  <string name="notification_light_missed_call_title">మిస్డ్ కాల్</string>
+  <string name="notification_light_voicemail_title">వాయిస్‌మెయిల్</string>
+  <string name="notification_light_screen_on">స్క్రీన్ ఆన్లో ఉండి లైట్స్</string>
+  <string name="notification_light_zen_mode">లైట్స్ క్రమపద్దతిలో లేకుండా చెయ్యవద్దు</string>
+  <string name="notification_light_use_multiple_leds">అనేక LEDలు</string>
+  <string name="keywords_lights_brightness_level">డిమ్ LEDల ప్రకాశం</string>
+  <string name="notification_light_automagic">స్వయంచలిత రంగులను ఎంచుకోండి</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">లైట్ సెట్టింగ్స్</string>
+  <string name="led_notification_text">సెట్టింగ్సుచే చేతనపరచబడిన LED లైట్</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Android డీబగ్గింగ్</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">ఆండ్రాయిడ్ డీబగ్గింగ్ బ్రిడ్జ్ (adb)ను చేతనపరచండి</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB ఓవర్ నెట్వర్క్</string>
+  <string name="adb_over_network_summary">నెట్వర్క్ ఇంటర్ ఫేస్ పైన TCP/IP డీబగ్గింగును అమలు చెయ్యి  (Wi\u2011Fi, USB నెట్వర్కులు). ఈ సెట్టింగ్ రీబూటు పైన రీసెట్ చేయబడుతుంది</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">హెచ్చ్జరిక: ADB ఓవర్ నెట్వర్క్ చేతనపరచబడి ఉన్నప్పుడు, అనుసంధానం చేయబడి ఉన్న అన్ని నెట్వర్కుల పైన అనధికార చొరబాట్లకు మీ ఫోన్ సిద్ధంగా ఉంటుంది!\\n\nమీరు విశ్వసనీయ నెట్వర్క్లులకు అనుసంధానించబడి ఉన్నప్పుడు మాత్రమే ఈ లక్షణాన్ని ఉపయోగించండి. \n\nమీరు నిజంగా ఈ సౌలభ్యాన్ని చేతనపరచాలని అనుకుంటున్నారా?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">డీబగ్గింగ్ తెలియజేయడం</string>
+  <string name="adb_notify_summary">USB లేదా నెట్వర్క్ డీబగ్గింగ్ చేతనపరచబడి ఉన్నప్పుడు ఒక నోటిఫికేషనును ప్రదర్శించు</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">స్థానం</string>
+  <string name="app_ops_categories_personal">వ్యక్తిగతం</string>
+  <string name="app_ops_categories_messaging">సందేశ సేవ</string>
+  <string name="app_ops_categories_media">మీడియా</string>
+  <string name="app_ops_categories_device">పరికరం</string>
+  <string name="app_ops_categories_bootup">బూటప్</string>
+  <string name="app_ops_categories_su">మూల ప్రాప్తి</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">సరైనది కాని స్థానం</string>
+  <string name="app_ops_summaries_fine_location">ఖచ్చితమైన స్థానం</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">వైబ్రేట్</string>
+  <string name="app_ops_summaries_read_contacts">కాంటాక్టులను చదువుము</string>
+  <string name="app_ops_summaries_modify_contacts">కాంటాక్టులను సవరించుము</string>
+  <string name="app_ops_summaries_read_call_log">కాల్ లాగ్‌ను చదవడం</string>
+  <string name="app_ops_summaries_modify_call_log">కాల్ లాగును సవరించుము</string>
+  <string name="app_ops_summaries_read_calendar">క్యాలెండరును చదువుము</string>
+  <string name="app_ops_summaries_modify_calendar">క్యాలెండరును సవరించుము</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi స్కాన్</string>
+  <string name="app_ops_summaries_notification">నోటిఫికేషన్/టోస్ట్</string>
+  <string name="app_ops_summaries_cell_scan">సెల్ స్కాన్</string>
+  <string name="app_ops_summaries_call_phone">ఫోనుకు కాల్ చేయుము</string>
+  <string name="app_ops_summaries_read_sms">SMSను చదువుము</string>
+  <string name="app_ops_summaries_write_sms">SMSను వ్రాయి</string>
+  <string name="app_ops_summaries_receive_sms">SMSను అందుకో</string>
+  <string name="app_ops_summaries_receive_emergency_sms">అత్యవసర SMSను అందుకో</string>
+  <string name="app_ops_summaries_receive_mms">MMSను అందుకో</string>
+  <string name="app_ops_summaries_receive_wap_push">WAP పుష్ ను అందుకో</string>
+  <string name="app_ops_summaries_send_sms">SMSను పంపు</string>
+  <string name="app_ops_summaries_read_icc_sms">ICC SMSను చదువు</string>
+  <string name="app_ops_summaries_write_icc_sms">ICC SMSను వ్రాయి</string>
+  <string name="app_ops_summaries_modify_settings">సెట్టింగులను సవరించు</string>
+  <string name="app_ops_summaries_draw_on_top">పై భాగంలో గీయుము</string>
+  <string name="app_ops_summaries_access_notifications">నోటిఫికేషన్‌లను ప్రాప్యత చేయడం</string>
+  <string name="app_ops_summaries_camera">కెమెరా</string>
+  <string name="app_ops_summaries_record_audio">ఆడియోను రికార్డ్ చేయడం</string>
+  <string name="app_ops_summaries_play_audio">ఆడియోను ప్లే చేయుము</string>
+  <string name="app_ops_summaries_read_clipboard">క్లిప్ బోర్డును చదువుము</string>
+  <string name="app_ops_summaries_modify_clipboard">క్లిప్ బోర్డును సవరించుము</string>
+  <string name="app_ops_summaries_media_buttons">మీడియా బటన్లు</string>
+  <string name="app_ops_summaries_audio_focus">ఆడియో ఫోకస్</string>
+  <string name="app_ops_summaries_master_volume">మాస్టర్ వాల్యూమ్</string>
+  <string name="app_ops_summaries_voice_volume">స్వర వాల్యూమ్</string>
+  <string name="app_ops_summaries_ring_volume">రింగర్ వాల్యూమ్</string>
+  <string name="app_ops_summaries_media_volume">మీడియా వాల్యూమ్</string>
+  <string name="app_ops_summaries_alarm_volume">అలారం వాల్యూమ్</string>
+  <string name="app_ops_summaries_notification_volume">నోటిఫికేషన్ వాల్యూమ్</string>
+  <string name="app_ops_summaries_bluetooth_volume">బ్లూటూత్ వాల్యూమ్</string>
+  <string name="app_ops_summaries_keep_awake">సక్రియంగా ఉంచండి</string>
+  <string name="app_ops_summaries_monitor_location">మానిటర్ స్థానం</string>
+  <string name="app_ops_summaries_monitor_high_power_location">మానిటర్ యొక్క అధిక శక్తివంతమైన స్థానం</string>
+  <string name="app_ops_summaries_get_usage_stats">వినియోగ గణాంకాలను పొందుము</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">మైక్రోఫోన్ మ్యూట్/అన్‌మ్యూట్ చేయుము</string>
+  <string name="app_ops_summaries_toast_window">టోస్ట్ నోటిఫికేషనును డిస్ప్లే చేయుము</string>
+  <string name="app_ops_summaries_project_media">మీడియాను ప్రదర్శించుము</string>
+  <string name="app_ops_summaries_activate_vpn">VPN ను క్రియాశీలం చెయ్యి</string>
+  <string name="app_ops_summaries_write_wallpaper">వాల్ పేపరును వ్రాయుము</string>
+  <string name="app_ops_summaries_assist_structure">ఆకృతికి సహాయం చేయుము</string>
+  <string name="app_ops_summaries_assist_screenshot">స్క్రీన్‌షాటుకు సహాయం చేయుము</string>
+  <string name="app_ops_summaries_read_phone_state">ఫోన్ యొక్క స్థితిని చదువుము</string>
+  <string name="app_ops_summaries_add_voicemail">వాయిస్ మెయిల్‌ను జోడించడం</string>
+  <string name="app_ops_summaries_use_sip">SIPను ఉపయోగించుము</string>
+  <string name="app_ops_summaries_make_call">కాల్ చేయుము</string>
+  <string name="app_ops_summaries_use_fingerprint">వేలిముద్రను ఉపయోగించుము</string>
+  <string name="app_ops_summaries_use_body_sensors">శరీర సెన్సార్లను ఉపయోగించుము</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">గడి ప్ర్రసారాలను చదువుము</string>
+  <string name="app_ops_summaries_mock_location">నకిలీ స్థానం</string>
+  <string name="app_ops_summaries_read_external_storage">బాహ్య నిల్వను చదువుము</string>
+  <string name="app_ops_summaries_write_external_storage">బాహ్య నిల్వకు వ్రాయుము</string>
+  <string name="app_ops_summaries_turn_screen_on">స్క్రీనును ఆన్ చేయుము</string>
+  <string name="app_ops_summaries_get_accounts">అకౌంట్లను పొందుము</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fiను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_summaries_toggle_bluetooth">బ్లూటూతును ద్విక్రియ చేయుము</string>
+  <string name="app_ops_summaries_start_at_boot">బూట్ వద్ద ప్రారంభించుము</string>
+  <string name="app_ops_summaries_toggle_nfc">NFCను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_summaries_toggle_mobile_data">మొబైల్ డేటాను ద్విక్రియం చేయుము</string>
+  <string name="app_ops_summaries_superuser">మూలాంశ ప్రాప్యత</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">ముతక స్థానం</string>
+  <string name="app_ops_labels_fine_location">ఉత్తమ స్థానం</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">వైబ్రేట్</string>
+  <string name="app_ops_labels_read_contacts">పరిచయాలను చదువుము</string>
+  <string name="app_ops_labels_modify_contacts">పరిచయాలను సవరించుము</string>
+  <string name="app_ops_labels_read_call_log">కాల్ లాగ్‌ను చదువుము</string>
+  <string name="app_ops_labels_modify_call_log">కాల్ లాగును సవరించుము</string>
+  <string name="app_ops_labels_read_calendar">క్యాలెండరును చదువుము</string>
+  <string name="app_ops_labels_modify_calendar">క్యాలెండరును సవరించుము</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi స్కాన్</string>
+  <string name="app_ops_labels_notification">నోటిఫికేషన్/టోస్ట్</string>
+  <string name="app_ops_labels_cell_scan">సెల్ స్కాన్</string>
+  <string name="app_ops_labels_call_phone">ఫోన్ నంబరుకు కాల్ చేయుము</string>
+  <string name="app_ops_labels_read_sms">SMSను చదువుము</string>
+  <string name="app_ops_labels_write_sms">SMSను వ్రాయుము</string>
+  <string name="app_ops_labels_receive_sms">SMS అందుకొనుము</string>
+  <string name="app_ops_labels_receive_emergency_sms">అత్యవసర SMSను అందుకో</string>
+  <string name="app_ops_labels_receive_mms">MMS అందుకొనుము</string>
+  <string name="app_ops_labels_receive_wap_push">WAP పుష్ ను అందుకో</string>
+  <string name="app_ops_labels_send_sms">SMS పంపుము</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMSను చదువు</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMSను వ్రాయుము</string>
+  <string name="app_ops_labels_modify_settings">సెట్టింగులను సవరించుము</string>
+  <string name="app_ops_labels_draw_on_top">పై భాగంలో గీయుము</string>
+  <string name="app_ops_labels_access_notifications">నోటిఫికేషన్లకు ప్రాప్యత</string>
+  <string name="app_ops_labels_camera">కెమెరా</string>
+  <string name="app_ops_labels_record_audio">ఆడియోను రికార్డ్ చేయి</string>
+  <string name="app_ops_labels_play_audio">ఆడియోను ప్లే చేయుము</string>
+  <string name="app_ops_labels_read_clipboard">క్లిప్ బోర్డును చదువుము</string>
+  <string name="app_ops_labels_modify_clipboard">క్లిప్ బోర్డును సవరించుము</string>
+  <string name="app_ops_labels_media_buttons">మీడియా బటన్లు</string>
+  <string name="app_ops_labels_audio_focus">ఆడియో ఫోకస్</string>
+  <string name="app_ops_labels_master_volume">మాస్టర్ వాల్యూమ్</string>
+  <string name="app_ops_labels_voice_volume">వాయిస్ వాల్యూమ్</string>
+  <string name="app_ops_labels_ring_volume">రింగ్ వాల్యూమ్</string>
+  <string name="app_ops_labels_media_volume">మీడియా వాల్యూమ్</string>
+  <string name="app_ops_labels_alarm_volume">అలారం వాల్యూమ్</string>
+  <string name="app_ops_labels_notification_volume">నోటిఫికేషన్ వాల్యూమ్</string>
+  <string name="app_ops_labels_bluetooth_volume">బ్లూటూత్ వాల్యూమ్</string>
+  <string name="app_ops_labels_keep_awake">సక్రియంగా ఉంచండి</string>
+  <string name="app_ops_labels_monitor_location">మానిటర్ స్థానం</string>
+  <string name="app_ops_labels_monitor_high_power_location">మానిటర్ యొక్క అధిక శక్తివంతమైన స్థానం</string>
+  <string name="app_ops_labels_get_usage_stats">వినియోగ గణాంకాలను పొందుము</string>
+  <string name="app_ops_labels_mute_unmute_microphone">మైక్రోఫోనును మ్యూట్/అన్‌మ్యూట్ చేయి</string>
+  <string name="app_ops_labels_toast_window">టోస్ట్లను ప్రదర్శించు</string>
+  <string name="app_ops_labels_project_media">మీడియాను ప్రొజెక్ట్ చేయుము</string>
+  <string name="app_ops_labels_activate_vpn">VPNను క్రియాశీలం చెయ్యి</string>
+  <string name="app_ops_labels_write_wallpaper">వాల్ పేపరును వ్రాయుము</string>
+  <string name="app_ops_labels_assist_structure">ఆకృతికి సహాయం చేయుము</string>
+  <string name="app_ops_labels_assist_screenshot">స్క్రీన్‌షాటుకు సహాయం చేయుము</string>
+  <string name="app_ops_labels_read_phone_state">ఫోన్ యొక్క స్థితిని చదువుము</string>
+  <string name="app_ops_labels_add_voicemail">వాయిస్ మెయిల్‌ను జోడించడం</string>
+  <string name="app_ops_labels_use_sip">SIPను వినియోగించుము</string>
+  <string name="app_ops_labels_make_call">కాల్ చేయుము</string>
+  <string name="app_ops_labels_use_fingerprint">వేలిముద్రను వినియోగించుము</string>
+  <string name="app_ops_labels_use_body_sensors">శరీర సెన్సార్లను ఉపయోగించుము</string>
+  <string name="app_ops_labels_read_cell_broadcasts">గడి ప్ర్రసారాలను చదువుము</string>
+  <string name="app_ops_labels_mock_location">నకిలీ స్థానం</string>
+  <string name="app_ops_labels_read_external_storage">బాహ్య నిల్వను చదువుము</string>
+  <string name="app_ops_labels_write_external_storage">బాహ్య నిల్వకు వ్రాయుము</string>
+  <string name="app_ops_labels_turn_screen_on">స్క్రీనును ఆన్ చేయుము</string>
+  <string name="app_ops_labels_get_accounts">అకౌంట్లను పొందుము</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fiను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_labels_toggle_bluetooth">బ్లూటూతును ద్విక్రియ చేయుము</string>
+  <string name="app_ops_labels_start_at_boot">బూట్ వద్ద ప్రారంభించుము</string>
+  <string name="app_ops_labels_toggle_nfc">NFCను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_labels_toggle_mobile_data">మొబైల్ డేటాను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_labels_superuser">మూల ప్రాప్తి</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">అనుమతించబడింది</string>
+  <string name="app_ops_permissions_ignored">విస్మరించబడింది</string>
+  <string name="app_ops_permissions_always_ask">ఎల్లప్పుడూ అడుగు</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (ఉపయోగించబడిన <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">అనుమతించబడిన <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">తిరస్కరించబడిన <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">అనుమతించబడిన <xliff:g id="count">%1$s</xliff:g>, తిరస్కరించబడిన <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">వినియోగదారు అనువర్తనాలను చూపుము</string>
+  <string name="app_ops_show_system_apps">అంతర్నిర్మిత అనువర్తనాలను చూపుము</string>
+  <string name="app_ops_reset_counters">రీసెట్ అనుమతి/తిరస్కృతి కౌంటర్లు</string>
+  <string name="app_ops_reset_confirm_title">కౌంటర్ల రీసెట్ ను నిర్ధారించుము</string>
+  <string name="app_ops_reset_confirm_mesg">మీరు కౌంటర్లను రీసెట్ చేయాలని నిర్ధారించుకున్నారా?</string>
+  <string name="ok">సరే</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">పరికరం అతిధేయ నామం</string>
+  <string name="unlock_scramble_pin_layout_title">క్రమరాహిత్య లేఅవుట్</string>
+  <string name="unlock_scramble_pin_layout_summary">పరికరాన్ని అన్లాక్ చేసేటప్పుడు PIN లేఅవుట్ ను క్రమరాహిత్యం చేయండి</string>
+  <string name="button_pref_title">బటన్లు</string>
+  <string name="hardware_keys_power_key_title">పవర్ బటన్</string>
+  <string name="hardware_keys_home_key_title">హోమ్ బటన్</string>
+  <string name="hardware_keys_back_key_title">బ్యాక్ బటన్</string>
+  <string name="hardware_keys_menu_key_title">మెనూ బటన్</string>
+  <string name="hardware_keys_assist_key_title">శోధన బటన్</string>
+  <string name="hardware_keys_appswitch_key_title">రీసెంట్స్ (ఇటీవలి చర్యలు) బటన్</string>
+  <string name="hardware_keys_camera_key_title">కెమెరా బటన్</string>
+  <string name="hardware_keys_volume_keys_title">వాల్యూమ్ బటన్లు</string>
+  <string name="hardware_keys_short_press_title">కొద్ది సేపు నొక్కి ఉంచే చర్య</string>
+  <string name="hardware_keys_long_press_title">ఎక్కువ సేపు నొక్కి ఉంచే చర్య</string>
+  <string name="hardware_keys_double_tap_title">డబుల్ ట్యాప్ చర్య</string>
+  <string name="hardware_keys_action_nothing">ఎటువంటి చర్య లేదు</string>
+  <string name="hardware_keys_action_menu">ఓపెన్/క్లోస్ మెనూ</string>
+  <string name="hardware_keys_action_app_switch">ఇటీవలి అనువర్తనాలను మార్చేది</string>
+  <string name="hardware_keys_action_search">శోధన సహాయకం</string>
+  <string name="hardware_keys_action_voice_search">వాయిస్ శోధన</string>
+  <string name="hardware_keys_action_in_app_search">అనువర్తన శోధనలో</string>
+  <string name="hardware_keys_action_launch_camera">కెమెరాను ప్రారంభించు</string>
+  <string name="hardware_keys_action_sleep">స్క్రీన్ ఆఫ్ ను ప్రారంభించు</string>
+  <string name="hardware_keys_action_last_app">గత అనువర్తనం</string>
+  <string name="camera_sleep_on_release_title">స్క్రీన్ పీక్ (స్క్రీన్ లోకి తొంగిచూడడం)</string>
+  <string name="camera_sleep_on_release_summary">బటను క్రిందికి నొక్కి ఉంచినప్పుడు మాత్రమే సగం నొక్కడం వలన స్క్రీన్ ఆన్లో ఉంటుంది</string>
+  <string name="camera_launch_title">కెమెరాను ప్రారంభించు</string>
+  <string name="camera_launch_summary">ఎక్కువసేపు నొక్కి ఉంచడం మరియు వదలడం కెమెరాను ప్రారంభిస్తుంది</string>
+  <string name="volbtn_music_controls_title">ప్లేబ్యాక్ నియంత్రణ</string>
+  <string name="volbtn_music_controls_summary">తెర ఆఫ్ చేసి ఉన్నప్పుడు వాల్యూమ్ కీలను ఎక్కువసేపు నొక్కి ఉంచితే సంగీతాన్ని ప్రారంభించడానికి ప్రయత్నిస్తుంది</string>
+  <string name="volbtn_cursor_control_title">కీబోర్డ్ కర్సర్ నియంత్రణ</string>
+  <string name="volbtn_cursor_control_off">నిలిపివేయబడింది</string>
+  <string name="volbtn_cursor_control_on">వాల్యూమ్ పైకి/క్రిందికి చేయడం కర్సర్ ను ఎడమ/కుడి వైపుకు జరుపుతుంది</string>
+  <string name="volbtn_cursor_control_on_reverse">వాల్యూమ్ పైకి/క్రిందికి చేయడం కర్సర్ ను కుడి/ఎడమ వైపుకు జరుపుతుంది</string>
+  <string name="power_end_call_title">కాల్ ముగించు</string>
+  <string name="power_end_call_summary">పవర్ బటన్ నొక్కడం ప్రస్తుత కాలును ముగిస్తుంది</string>
+  <string name="swap_volume_buttons_title">కొత్తరూపం ఇవ్వుము</string>
+  <string name="swap_volume_buttons_summary">తెర తిప్పబడినప్పుడు వాల్యూమ్ బటన్లను మార్చండి</string>
+  <string name="button_wake_title">నిద్రలేపే పరికరం</string>
+  <string name="home_answer_call_title">కాలుకు సమాధానం చెప్పుము</string>
+  <string name="home_answer_call_summary">హోమ్ బటన్ నొక్కడం ద్వారా ప్రస్తుతం వస్తున్న కాలుకు సమాధానం చెప్పవచ్చు</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">అనుకూలిత బ్యాక్ లైట్</string>
+  <string name="adaptive_backlight_summary">బ్యాటరీ యొక్క జీవిత కాలాన్నిపెంచుతూ అదే సమయంలో ఉపయోగ సామర్థ్యాన్ని కొనసాగించడానికి చైతన్యవంతంగా బ్యాక్ లైట్ యొక్క డిస్ప్లే\'లు ప్రకాశాన్ని సవరించుము</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">సూర్యకాంతి మెరుగుదల</string>
+  <string name="sunlight_enhancement_summary">ప్రకాశవంతమైన సూర్యకాంతి క్రింద ప్రదర్శన ప్రకాశం మరియు చదవగలగడాన్ని మెరుగుపరుచుము</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">రంగును మెరుగుపరచడం</string>
+  <string name="color_enhancement_summary">చైతన్యవంతంగా రంగు యొక్క డిస్ప్లేను మెరుగుపరుచుము</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">వెనక లైట్</string>
+  <string name="button_backlight_enabled">ప్రకాశించే బటన్లు</string>
+  <string name="keyboard_backlight_enabled">ప్రకాశించే కీబోర్డ్</string>
+  <string name="button_backlight_seekbar_title">బటన్ ప్రకాశం</string>
+  <string name="keyboard_backlight_seekbar_title">కీబోర్డ్ ప్రకాశం</string>
+  <string name="backlight_timeout_title">ప్రకాశంగా ఉండే సమయం ముగిసింది</string>
+  <string name="backlight_timeout_unlimited">ఆపివేయకండి</string>
+  <string name="backlight_summary_disabled">నిలిపివేయబడింది</string>
+  <string name="backlight_summary_enabled_with_timeout"><xliff:g id="timeout">%s</xliff:g> కోసం ప్రారంభించబడింది</string>
+  <string name="backlight_summary_enabled">ప్రారంభించబడినవి</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">సైగలు</string>
   <!-- Power menu -->
+  <string name="power_menu_title">పవర్ మెనూ</string>
+  <string name="power_menu_reboot_title">రీబూట్ మెనూ</string>
+  <string name="power_menu_screenshot_title">స్క్రీన్‌షాట్</string>
+  <string name="power_menu_airplane_title">ఎయిర్‌ప్లైన్ మోడ్</string>
+  <string name="power_menu_users_title">వినియోగదారును మార్చేది</string>
+  <string name="power_menu_settings_title">సెట్టింగ్‌ల సత్వరమార్గం</string>
+  <string name="power_menu_lockdown_title">పరికరం లాక్ డౌన్</string>
+  <string name="power_menu_bug_report_title">బగ్ నివేదిక</string>
+  <string name="power_menu_sound_title">ధ్వని ప్యానల్</string>
+  <string name="power_menu_bug_report_disabled">డెవలప్మెంట్ సెట్టింగులలో బగ్ నివేదిక నిలిపివేయబడింది</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">ఆన్-స్క్రీన్ నావిగేషన్ బారును చేతనపరుచుము</string>
+  <string name="disable_navkeys_summary">ఆన్-స్క్రీన్ నావిగేషన్ బారును చేతనపరుచుము మరియు హార్డ్ వేర్ బటనులను అచేతనం చేయుము</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">నిర్వీర్యం చేయడానికి రెండుసార్లు ట్యాప్ చేయండి</string>
+  <string name="double_tap_to_sleep_summary">డిస్ప్లేను ఆపివేయడానికి స్టేటస్ బార్ పైన రెండుసార్లు ట్యాప్ చేయండి</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">అప్రయత్నంగా మేల్కొల్పబడటాన్ని నివారించండి</string>
+  <string name="proximity_wake_summary">స్క్రీనును ఉపయోగించే ముందు సమీప సెన్సారును పరిశీలించండి</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">మేల్కొలుపు ప్లగ్</string>
+  <string name="wake_when_plugged_or_unplugged_summary">విద్యుత్ ఆధారాన్ని అనుసంధానం చేసేటప్పుడు లేదా తొలిగించేటప్పుడు స్క్రీనును ఆన్ చేయండి</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">నమూనా</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">వాల్యూమ్ సవరణ శబ్దాలు</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">వైబ్రేటర్ తీవ్రత</string>
+  <string name="vibrator_warning">%1$d కంటే ఎక్కువగా ఉండే విలువలు సిఫార్సు చేయబడవు</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">రంగు క్రమాంకనం</string>
+  <string name="color_calibration_summary">ఆన్-స్క్రీన్ రంగులను క్రమాంకనం చేయుము</string>
+  <string name="color_red_title">ఎరుపు రంగు</string>
+  <string name="color_green_title">పచ్చ రంగు</string>
+  <string name="color_blue_title">నీలి రంగు</string>
   <!-- Hardware tunables - Gamma calibration -->
+  <string name="gamma_tuning_title_head">గామా క్రమాంకనం</string>
+  <string name="gamma_tuning_summary_head">గామా విలువలు సర్దుబాటు చేయుము</string>
+  <string name="gamma_tuning_control_set_header">సమూహం <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
+  <string name="gamma_tuning_contrast">వ్యత్యాసం</string>
+  <string name="gamma_tuning_brightness">ప్రకాశం</string>
+  <string name="gamma_tuning_saturation">సంతృప్తత</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">సంగీతాన్ని ప్రారంభించు అనువర్తనం</string>
+  <string name="headset_connect_player_summary">హెడ్ సెట్ అనుసంధానించబడి ఉన్నప్పుడు స్వయంసిద్ధ సంగీతం అనువర్తనాన్ని ప్రారంభించుము</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">స్వయంచాలక ప్రాధాన్యత</string>
+  <string name="auto_brightness_reset_button">రీసెట్ చేయి</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">పరిభ్రమణం</string>
+  <string name="display_rotation_disabled">నిలిపివేయబడింది</string>
+  <string name="display_rotation_unit">డిగ్రీలు</string>
+  <string name="display_lockscreen_rotation_title">లాక్ స్క్రీనును తిప్పండి</string>
+  <string name="display_rotation_category_title">తిప్పే పద్ధతులు</string>
+  <string name="display_rotation_0_title">0 డిగ్రీలు</string>
+  <string name="display_rotation_90_title">90 డిగ్రీలు</string>
+  <string name="display_rotation_180_title">180 డిగ్రీలు</string>
+  <string name="display_rotation_270_title">270 డిగ్రీలు</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">స్క్రీన్ రంగు</string>
+  <string name="screencolor_summary">స్క్రీన్ వర్ణం, సంతృప్తత, వర్ణ వ్యత్యాసం లేదా తీవ్రతలను ట్యూన్ చేయుము</string>
+  <string name="custom_screencolor">స్క్రీన్ రంగును అనుకూలితం చేయుము</string>
+  <string name="screencolor_save">సేవ్ చేయి</string>
+  <string name="screencolor_cancel">రద్దు చేయి</string>
+  <string name="restore_preview">స్వయంసిద్ధ చిత్రాన్ని వీక్షించుము</string>
+  <string name="selectnewfile_menu">గ్యాలరీ నుండి క్రొత్త చిత్రాన్ని వీక్షించుము</string>
+  <string name="selectfile_menu">గ్యాలరీ నుండి చిత్రాన్ని వీక్షించుము</string>
+  <string name="restore_default_str">రీసెట్ చేయి</string>
+  <string name="hue_str">వర్ణం: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">సంతృప్తత: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">వర్ణ వ్యత్యాసం: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">తీవ్రత: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">చదవడానికి అనుకూలంగా ఉండే విధంగా మరియు కళ్ళ పైన ఒత్తిడిని తగ్గించేందుకు రోజు యొక్క సమయం మరియు పరిసర పరిస్థితులను బట్టి సమయాన్ని సెట్ చేయండి</string>
+  <string name="live_display_mode">ప్రదర్శిత మోడ్</string>
+  <string name="live_display_color_temperature_title">వర్ణ ఉష్ణోగ్రత</string>
+  <string name="live_display_color_temperature_summary">పగలు <xliff:g id="day_temperature">%1$d</xliff:g>K  రాత్రి: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">పగలు</string>
+  <string name="live_display_night">రాత్రి</string>
+  <string name="live_display_outdoor_mode_title">స్వయంచాలక వెలుపలి మోడ్</string>
+  <string name="live_display_outdoor_mode_summary">ప్రకాశవంతమైన సూర్యకాంతి క్రింద స్వయంచాలకంగా ప్రకాశవంతం మరియు సంతృప్తతలను పెంచుము</string>
+  <string name="live_display_low_power_title">విద్యుత్ వినియోగాన్ని తగ్గించుము</string>
+  <string name="live_display_low_power_summary">క్షీణత లేకుండా ప్రదర్శనను అతితక్కువ విద్యుత్ వినియోగానికి సవరించుము</string>
+  <string name="live_display_enhance_color_title">వర్ణాలను మెరుగుపరుచుము</string>
+  <string name="live_display_enhance_color_summary">శరీర ఛాయ టోన్స్, దృశ్యం, మరియు ఇతర చిత్రాల యొక్క వర్ణ వైబ్రెన్సును మెరుగుపరుచుము</string>
+  <string name="live_display_color_profile_title">వర్ణ ప్రొఫైల్</string>
+  <string name="live_display_color_profile_standard_title">ప్రామాణిక</string>
+  <string name="live_display_color_profile_standard_summary">ఖచ్చితమైన వర్ణాలు మరియు ప్రకాశవంతమైన తెలుపులు</string>
+  <string name="live_display_color_profile_natural_title">సహజమైన</string>
+  <string name="live_display_color_profile_natural_summary">వాస్తవిక వర్ణాలు మరియు శరీర ఛాయ టోన్స్</string>
+  <string name="live_display_color_profile_dynamic_title">డైనమిక్</string>
+  <string name="live_display_color_profile_dynamic_summary">మెరుగైన వర్ణాలు మరియు  ప్రకాశవంతమైన తెలుపులు</string>
+  <string name="live_display_color_profile_cinema_title">చలనచిత్రం</string>
+  <string name="live_display_color_profile_cinema_summary">వీడియో కొరకు సరైన వర్ణ పునరుత్పత్తి</string>
+  <string name="live_display_color_profile_astronomy_title">ఖగోళ శాస్త్రం</string>
+  <string name="live_display_color_profile_astronomy_summary">రాత్రిపూట దృష్టిని సంరక్షించడానికి ముదురు ఎరుపు</string>
+  <string name="live_display_color_profile_photography_title">ఫోటోగ్రఫీ</string>
+  <string name="live_display_color_profile_photography_summary">ఫోటోల కొరకు సరైన వర్ణ పునరుత్పత్తి</string>
+  <string name="live_display_color_profile_basic_title">ప్రాధమిక</string>
+  <string name="live_display_color_profile_basic_summary">అన్‌కాలిబ్రేటెడ్ ప్రదర్శనను ఉపయోగించుము</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">సెలెక్టర్ చిహ్నం</string>
+  <string name="ime_switcher_notify_summary">ఇన్పుట్ ప్రక్రియను ఎంచుకునే చిహ్నాన్ని ప్రదర్శించుము</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">హెచ్చరిక</string>
+  <string name="summary_heads_up_enabled">పాప్-అప్ నోటిఫికేషన్లు ప్రారంభించబడ్డాయి</string>
+  <string name="summary_heads_up_disabled">పాప్-అప్ నోటిఫికేషన్లు నిలిపివేయబడ్డాయి</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">అన్ని రకాల ఫైళ్ళను అంగీకరించుము</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">అధిక స్పర్శ సున్నితత్వం</string>
+  <string name="high_touch_sensitivity_summary">టచ్ స్క్రీన్ సున్నితత్వాన్ని పెంచండి ఎందుకంటే చేతి తొడుగులు వేసుకున్నప్పుడు అది ఉపయోగపడుతుంది</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD సాంద్రత</string>
+  <string name="dialog_title_lcd_density">LCD సాంద్రత</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (స్వయంసిద్ధం)</string>
+  <string name="restarting_ui">UI\u2026ను తిరిగి ప్రారంభించడం</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">స్టైలస్ ఉపయోగించేటప్పుడు చిహ్నాన్ని చూపుము</string>
+  <string name="stylus_icon_enabled_summary">స్టైలస్‌తో హోవరింగ్ లేదా రేఖాచిత్రణ చేసేటప్పుడు పాయింటర్ చిహ్నాన్ని చూపుము</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">స్టైలస్ సంజ్ఞలు</string>
+  <string name="category_spen_title">స్టైలస్ సంజ్ఞలు</string>
+  <string name="enable_subcat_title">స్టైలస్</string>
+  <string name="enable_spen_title_head">సంజ్ఞలను చేతనపరుచుము</string>
+  <string name="enable_spen_summary_head">స్టైలస్ బటన్ క్రిందకి నొక్కి పట్టుకోవడం ద్వారా స్వైప్‌ సంజ్ఞలను ఉపయోగించుము</string>
+  <string name="gestures_subcat_title">సైగలు</string>
+  <string name="gestures_left_spen_title_head">ఎడమ స్వైప్</string>
+  <string name="gestures_right_spen_title_head">కుడి స్వైప్</string>
+  <string name="gestures_up_spen_title_head">పైకి స్వైప్</string>
+  <string name="gestures_down_spen_title_head">క్రిందికి స్వైప్</string>
+  <string name="gestures_long_spen_title_head">ఎక్కువసేపు స్వైప్</string>
+  <string name="gestures_double_spen_title_head">డబుల్ ట్యాప్</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">ఎటువంటి చర్య లేదు</string>
+  <string name="gestures_action_home">హోమ్</string>
+  <string name="gestures_action_back">వెనుకకు</string>
+  <string name="gestures_action_menu">మెను</string>
+  <string name="gestures_action_search">శోధనను ప్రారంభించుము</string>
+  <string name="gestures_action_recent">ఇటీవలి అప్లికేషన్స్</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s ఇన్స్టాల్ చేయబడలేదు</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">టచ్ స్క్రీన్ యొక్క హోవరింగ్ స్వభావం</string>
+  <string name="touchscreen_hovering_summary">వెబ్ బౌజర్లు, రిమోట్ డెస్క్‌టాప్‌లు, మొదలైన వాటిలో మౌస్ వలే తెరను హోవర్ చేయడానికి అనుమతిస్తుంది</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">రింగ్ వాల్యూమును పెంచడం</string>
+  <string name="increasing_ring_min_volume_title">ప్రారంభ వాల్యూమ్</string>
+  <string name="increasing_ring_ramp_up_time_title">రాంప్-అప్ సమయం</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS సహకారంతో డేటా డౌన్లోడ్</string>
+  <string name="lto_download_data_wifi_only_on">ఏ నెట్వర్కుల పైన అయినా సరే</string>
+  <string name="lto_download_data_wifi_only_off">కేవలం Wi\u2011Fi నెట్వర్కుల పైన మాత్రమే</string>
+  <string name="volume_keys_control_ring_stream_title">రింగ్ టోన్ వాల్యూమును నియంత్రించుము</string>
+  <string name="volume_keys_control_ring_stream_summary_on">వాల్యూమ్ కీలు రింగ్ టోన్ వాల్యూమును నియంత్రిస్తాయి</string>
+  <string name="volume_keys_control_ring_stream_summary_off">వాల్యూమ్ కీలు మీడియా వాల్యూమును నియంత్రిస్తాయి</string>
+  <string name="category_calibration">క్రమాంకనం</string>
+  <string name="display_and_lights">ప్రదర్శన మరియు లైట్లు</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">ఛార్జింగ్ ధ్వనులు</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">ప్రారంభించు</string>
+  <string name="power_notifications_enable_summary">విద్యుత్ మూలాన్ని అనుసంధానం చేసేటప్పుడు లేదా తొలిగించేటప్పుడు ఒక శబ్దాన్ని ఉత్పన్నం చేయుము</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">వైబ్రేట్</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">నోటిఫికేషన్ శబ్దం</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">నిశ్శబ్దం</string>
   <!-- Status bar -->
+  <string name="status_bar_title">స్థితి పట్టీ</string>
+  <string name="status_bar_toggle_brightness">ప్రకాశం నియంత్రణ</string>
+  <string name="status_bar_toggle_brightness_summary">స్టేటస్ బార్ పొడవునా స్లైడ్ చేయడం ద్వారా ప్రకాశాన్ని సవరించండి</string>
+  <string name="status_bar_notif_count_title">నోటిఫికేషన్ల సంఖ్యను చూపుము</string>
+  <string name="status_bar_notif_count_summary">పెండింగులో ఉన్న నోటిఫికేషన్ల సంఖ్యను చూపుము</string>
+  <string name="status_bar_quick_qs_pulldown_title">త్వరిత పుల్ డౌన్ మెనూ</string>
+  <string name="status_bar_quick_qs_pulldown_summary">స్టేటస్ బార్ యొక్క %1$s అంచు త్వరిత సెట్టింగులను క్రిందికి లాగుతుంది</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">ఎడమ</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">కుడి</string>
+  <string name="status_bar_quick_qs_pulldown_off">ఆఫ్‌లో ఉంది</string>
+  <string name="status_bar_quick_qs_pulldown_left">ఎడమ</string>
+  <string name="status_bar_quick_qs_pulldown_right">కుడి</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">గడియారం శైలి</string>
+  <string name="status_bar_clock_style_right">కుడి</string>
+  <string name="status_bar_clock_style_left">ఎడమ</string>
+  <string name="status_bar_clock_style_center">మధ్య</string>
+  <string name="status_bar_clock_style_hidden">దాగి ఉన్న</string>
+  <string name="status_bar_am_pm_title">AM/PM శైలి</string>
+  <string name="status_bar_am_pm_info">24-గంటల గడియారం ప్రారంభించబడింది</string>
+  <string name="status_bar_am_pm_normal">సాధారణం</string>
+  <string name="status_bar_am_pm_small">చిన్నది</string>
+  <string name="status_bar_am_pm_hidden">దాగి ఉన్న</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">బ్యాటరీ స్థితి శైలి</string>
+  <string name="status_bar_battery_style_icon_portrait">చిహ్నం యొక్క నిలువు చిత్రం (పోర్ట్రైట్)</string>
+  <string name="status_bar_battery_style_icon_landscape">చిహ్నం యొక్క అడ్డ చిత్రం (లాండ్ స్కేప్)</string>
+  <string name="status_bar_battery_style_circle">వృత్తం</string>
+  <string name="status_bar_battery_style_text">పాఠం</string>
+  <string name="status_bar_battery_style_hidden">దాగి ఉన్న</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">బ్యాటరీ శాతం</string>
+  <string name="status_bar_battery_percentage_default">దాగి ఉన్న</string>
+  <string name="status_bar_battery_percentage_text_inside">చిహ్నం లోపల</string>
+  <string name="status_bar_battery_percentage_text_next">చిహ్నం ప్రక్కన</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">స్థితి పట్టీ చిహ్నాలు</string>
+  <string name="status_bar_icons_summary">ఏ స్థితి పట్టీ చిహ్నాలు చూపబడాలో నియంత్రించండి</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">స్పర్శ సంజ్ఞలను నిరోధించుము</string>
+  <string name="edge_gesture_service_summary">నావిగేషన్ మరియు స్టేటస్ బార్ సంజ్ఞల కొరకు అనువర్తనాలకు స్పర్శను పంపకండి</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">ఎప్పటికీ వద్దు</string>
+  <string name="keep_screen_on_debugging">USB డీబగ్గింగ్ సమయంలో</string>
+  <string name="keep_screen_on_charging">ఛార్జింగ్‌లో ఉన్నప్పుడు</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">గోప్యత</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">అప్రయత్నంగా గానే ప్రారంభించబడుతుంది</string>
+  <string name="privacy_guard_default_summary">క్రొత్తగా-ఇన్స్టాల్ చేయబడిన అనువర్తనాలకు అప్రయత్నంగానే చేతనపరచబడుతుంది</string>
+  <string name="privacy_guard_manager_title">గోప్యత రక్షణ</string>
+  <string name="privacy_guard_manager_summary">మీ వ్యక్తిగత డేటాకు ప్రాప్యత ఉన్న అనువర్తనాలను నిర్వహించండి</string>
+  <string name="privacy_guard_no_user_apps">ఎటువంటి అనువర్తనాలు ఇన్స్టాల్ చేయబడలేదు</string>
+  <string name="privacy_guard_help_title">సహాయం</string>
+  <string name="privacy_guard_reset_title">రీసెట్ చేయి</string>
+  <string name="privacy_guard_reset_text">రీసెట్ చేయడానికి అనుమతులు?</string>
+  <string name="privacy_guard_help_text">ఈ స్క్రీనులో కేవలం వాటి పైన ట్యాప్ చేయడం ద్వారా ఏ అనువర్తనాల యొక్క గోప్యత రక్షణ పనిచేస్తూ ఉండాలనే దానిని మీరు ఎంపిక చేసుకోవచ్చు ఎంపిక చేయబడిన అనువర్తనాలు పరిచయాలు, మెసేజులు లేదా కాల్ లాగ్స్ వంటి మీ యొక్క వ్యక్తిగత డేటాకు ప్రాప్యతను కోల్పోతాయి ఒక అనువర్తన ఎంట్రీను ఎక్కువ సేపు నొక్కి పట్టుకుని ఉంచడం దాని యొక్క అనువర్తన వివరాల స్క్రీనును తెరుస్తుంది. \n\nఅంతర్నిర్మిత అనువర్తనాలు అప్రమేయంగా చూపించబడవు కానీ సంబంధిత మెనూను ఎంచుకోవడం ద్వారా బహిర్గతం అవుతాయి.</string>
+  <string name="privacy_guard_manager_show_system_apps">అంతర్నిర్మిత అనువర్తనాలను చూపుము</string>
+  <string name="privacy_guard_advanced_settings_title">అధునాతనం</string>
+  <string name="privacy_guard_notification_title">నోటిఫికేషనులను చూపు</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">నమూనా దోషాన్ని చూపుము</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">నమూనా చుక్కలను చూపుము</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">నేరుగా పాస్వర్డ్ ఎంట్రీను చూపుము</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">నేరుగా నమూనా ఎంట్రీను చూపుము</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">నేరుగా PIN ఎంట్రీను చూపుము</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">సంగీత వీక్షకాన్ని ప్రదర్శించుము</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">త్వరిత సెట్టింగుల టైలుచే నిలిపివేయబడింది</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">లాక్ స్క్రీనును ప్రారంభించేందుకు ట్యాప్ చేయండి</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">లాక్ స్క్రీన్ ప్రారంభించబడింది</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">బ్యాటరీ సేవర్ త్రెష్ హోల్డ్</string>
+  <string name="battery_saver_summary">పనితీరును తగ్గించుము మరియు నేపథ్య డేటాను పరిమితం చేయుము</string>
+  <string name="battery_saver_summary_unavailable">చార్జింగ్ సమయంలో అందుబాటులో ఉండదు</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">పర్-అనువర్తన ప్రొఫైళ్ళను ప్రారంభించుము</string>
+  <string name="autoperf_summary">వివిధ అనువర్తనాలకు సరైన బ్యాటరీ మోడును స్వయంచాలకంగా ఎంపిక చేయుము</string>
+  <string name="perf_profile_title">బ్యాటరీ మోడ్</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">బూట్ పైన అనువర్తనాలు ప్రారంభించబడ్డాయి</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">నోటిఫికేషన్ టోన్</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">అధునాతన రీబూట్</string>
+  <string name="advanced_reboot_summary">అన్ లాక్ చేయబడినప్పుడు, రికవరీ, బూట్ లోడర్లలోకి రీబూటింగ్ చేసేందుకు లేదా సాఫ్ట్ రీబూటును నిర్వహించేందుకు పవర్ మెనూలో ఆప్షన్లను చేర్చండి.</string>
+  <string name="category_interface">ఇంటర్‌ఫేస్</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">విస్తరించబడిన డెస్క్‌టాప్</string>
+  <string name="expanded_hide_nothing">దేనినీ అదృశ్యం చేయవద్దు</string>
+  <string name="expanded_hide_status">స్టేటస్ బారును అదృశ్యం చేయుము</string>
+  <string name="expanded_hide_navigation">నావిగేషన్ బారును అదృశ్యం చేయుము</string>
+  <string name="expanded_hide_both">రెండింటినీ అదృశ్యం చేయుము</string>
+  <string name="expanded_nothing_to_show">విస్తరించబడిన స్థితి కొరకు ఒక్కొక్క-అనువర్తన నిర్మితీకరణకు ఒక వినియోగదారుని జోడించడానికి, \'ఎనేబుల్డ్ ఫర్ ఆల్\'ను ఆఫ్ పోజిషనుకు సెట్ చేయండి</string>
+  <string name="expanded_enabled_for_all">అన్నింటికీ చేతనపరచబడింది</string>
+  <string name="expanded_desktop_style">విస్తరించబడిన డెస్క్‌టాప్ శైలి</string>
+  <string name="expanded_desktop_style_description">స్వయంసిద్ధ విస్తరించబడిన డెస్క్‌టాప్ శైలిని ఎంచుకోండి</string>
+  <string name="expanded_desktop_title">విస్తరించబడిన డెస్క్‌టాప్ ఐచ్ఛికాలు</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">అనువర్తనాన్ని తొలిగించే బ్యాక్ బటన్</string>
+  <string name="kill_app_longpress_back_summary">బ్యాక్ బటనును ఎక్కువసేపు నొక్కి పట్టుకుని ఉంచడం ద్వారా ఉపయోగిస్తున్న అనువర్తనాన్ని తొలిగించవచ్చు</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">ఇటీవలి మెనూలో సర్చ్ బారును చూపుము</string>
+  <string name="keywords_recents_show_searchbar">ఇటీవలి ఇటీవలివి నిలిపివేయు ప్రారంభించు చూపు దాచు శోధన బార్ శోధనబార్</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">స్వర మేల్కొలుపు</string>
+  <string name="voice_wakeup_retrain_title">మీ స్వరానికి మరలా శిక్షణ ఇవ్వండి</string>
+  <string name="voice_wakeup_activity_title">ప్రారంభించేందుకు చర్య</string>
+  <string name="voice_wakeup_default_activity">Google నౌ</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">డైరెక్ట్ డయల్ పరిచయాన్ని ఎంపిక చేసుకునేందుకు స్వర మేల్కొలుపుకు ఫోన్ కాల్ అనుమతులు కావాలి.</string>
+  <string name="picker_activities">కార్యాచరణలు</string>
+  <string name="select_custom_app_title">అనుకూలిత అనువర్తనాన్ని ఎంపిక చేయుము</string>
+  <string name="select_custom_activity_title">అనుకూలిత కార్యాచరణను ఎంపిక చేయుము</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">నిరోధించబడిన కాలర్ జాబితా</string>
+  <string name="blacklist_edit_dialog_title">బ్లాక్ చేయబడిన ఫోన్ నంబరును సవరించుము</string>
+  <string name="blacklist_prefs">సెట్టింగ్‌లు</string>
+  <string name="blacklist_button_delete">తొలగించు</string>
+  <string name="blacklist_empty_text">మీకు ఏవిధమైనటువంటి నిరోధించబడిన నంబర్లు లేవు యాడ్  (+) బటన్ నొక్కడం ద్వారా ఒక ఎంట్రీను జోడించండి</string>
+  <string name="blacklist_disabled_empty_text">ఫోన్ నంబర్లు మీకు కాల్ చేయడం లేదా మెసేజ్ చేయడం నుండి నివారించేందుకు, కాలరును నిరోధించు లిస్టును ప్రారంభించండి</string>
+  <string name="blacklist_summary_disabled">నిలిపివేయబడింది</string>
+  <string name="blacklist_summary">నిరోధించబడిన కాలర్ జాబితాలో ఉన్న ఫోన్ నంబర్ల నుండి మీరు ఇన్‌కమింగ్ కాల్స్ లేదా సందేశాలను అందుకోరు</string>
+  <string name="blacklist_notify">నోటిఫికేషనులను చూపు</string>
+  <string name="blacklist_private_numbers_title">ప్రైవేట్ నంబర్లు</string>
+  <string name="blacklist_private_numbers_summary_disabled">ప్రైవేట్ నంబర్ల నుండి కాల్స్ ను నిరోధించవద్దు</string>
+  <string name="blacklist_private_numbers_summary">ప్రైవేట్ నంబర్ల నుండి వచ్చే ఇన్కమింగ్ <xliff:g id="type">%s</xliff:g> నిరోధించుము</string>
+  <string name="blacklist_unknown_numbers_title">అజ్ఞాత నంబర్లు</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">పరిచయాల లిస్టులో లేని నంబర్ల నుండి వచ్చే కాల్స్ లేదా మెసేజులను నిరోధించవద్దు</string>
+  <string name="blacklist_unknown_numbers_summary">పరిచయాల లిస్టులో లేని నంబర్ల నుండి వచ్చే ఇన్కమింగ్  <xliff:g id="type">%s</xliff:g> నిరోధించుము</string>
+  <string name="blacklist_summary_type_calls_only">కాల్స్</string>
+  <string name="blacklist_summary_type_messages_only">మెసేజులు</string>
+  <string name="blacklist_summary_type_calls_and_messages">కాల్స్ మరియు మెసేజులు</string>
+  <string name="blacklist_regex_title">ప్రాతినిధ్యాంశాలను ఉపయోగించుము</string>
+  <string name="blacklist_regex_summary">. ను ప్రాతినిధ్యాంశముగా మరియు ఇంకొకసారి చేయడానికి *ను ఉపయోగించండి ఉదాహరణకు  123.* 123లతో ప్రారంభమయ్యే నంబర్లను నిరోధిస్తుంది మరియు  .*123.* 123లను కలిగి ఉన్న నంబర్లను నిరోధిస్తుంది</string>
+  <string name="blacklist_policy_block_calls">ఇన్కమింగ్ కాల్స్ నిరోధించుము</string>
+  <string name="blacklist_policy_block_messages">ఇన్కమింగ్ మెసేజులను నిరోధించుము</string>
+  <string name="blacklist_bad_number_add">నిరోధించబడిన కాలర్ లిస్టుకు చెల్లని ఫోన్ నంబరును జోడించడం వీలు పడలేదు</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">నంబరును తొలిగించుము</string>
+  <string name="remove_blacklist_entry">మీరు నిరోధించబడిన ఈ ఫోన్ నంబరును తొలిగించాలని అనుకుంటున్నారా?</string>
+  <string name="select_contact">పరిచయాన్ని ఎంచుకోండి</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">అనువర్తన భద్రత</string>
+  <string name="sms_security_check_limit_title">SMS మెసేజ్ పరిమితి</string>
+  <string name="sms_security_check_limit_summary">నిర్ధారణ అవసరమయ్యే లోపలే అనువర్తనాలు 1 నిమిషంలో %d మెసేజులను పంపగలవు</string>
+  <string name="sms_security_check_limit_summary_none">నిర్ధారణ లేకుండా ఏ విధమైన మెసేజులను పంపడానికి అనువర్తనాలకు అనుమతి లేదు</string>
+  <string name="sms_security_check_limit_none">ఏదీ లేదు</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">%1$s జోడించబడింది</string>
+  <string name="spam_last_blocked_title">చివరిగా %1$s నిరోధించబడింది</string>
+  <string name="block_notifications_title">నోటిఫికేషన్లను ఫిల్టర్ చేయుము</string>
+  <string name="block_notifications_summary">విస్మరించబడిన నోటిఫికేషన్లు మరియు ఫిల్టర్లను నిర్వహించుము</string>
+  <string name="no_filters_title">ఎటువంటి ఫిల్టర్లు సెట్ చేయబడలేదు</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">సయనోజెన్ మోడ్ గణాంకాలు</string>
+  <string name="anonymous_statistics_summary">అజ్ఞాతంగా గణాంకాల నివేదిక పంపడాన్ని ఎంచుకోవడం ద్వారా సయనోజెన్ మోడ్ ను మెరుగుపరిచేందుకు సహాయపడండి</string>
+  <string name="anonymous_statistics_warning_title">గురించి</string>
+  <string name="anonymous_statistics_warning">సయనోజెన్ మోడ్ గణాంకాలను ఎంచుకోవడం ద్వారా సయనోజెన్ మోడ్ డెవలపర్‌లు పరికరాలలో అసాధారణ వ్యవస్థాపనలను ట్రాక్ చేసేందుకు వారికి వ్యక్తిగతం కాని డేటాను సమర్పించే అవకాశాన్ని కల్పిస్తుంది. సమర్పించబడిన సమాచారం ఒక ఏకైక నిర్ధారిణిను కలిగి ఉంటుంది, ఇది మీ యొక్క గోప్యత లేదా వ్యక్తిగత డేటాలను కలిగి ఉండదు ప్రతి ఒక్క బూట్ సందర్భంలో డేటా సమర్పించబడుతుంది. \n\nసమర్పించబడిన డేటాకు ఉదాహరణ కొరకు, పూర్వవీక్షణ డేటా పైన ట్యాప్ చేయండి.</string>
+  <string name="enable_reporting_title">నివేదిక పంపడాన్ని ప్రారంభించుము</string>
+  <string name="preview_data_title">పూర్వవీక్షణ డేటా</string>
+  <string name="view_stats_title">వీక్షణ గణాంకాలు</string>
+  <string name="anonymous_learn_more">మరింత తెలుసుకోండి</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">ఏకైక ID</string>
+  <string name="preview_device_title">పరికరం</string>
+  <string name="preview_version_title">సంస్కరణ</string>
+  <string name="preview_country_title">దేశం</string>
+  <string name="preview_carrier_title">క్యారియర్</string>
+  <string name="stats_collection_title">గణాంకాల సేకరణ</string>
+  <string name="stats_collection_summary">ప్రారంభించబడినప్పుడు, కొలతల సేకరణను అనుమతిస్తుంది</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">ఆకృతిని రీసెట్ చేయండి</string>
+  <string name="lockpattern_settings_reset_summary">ఆకృతి యొక్క లాకును మరలా సెట్ చేసేందుకు ప్రాధమిక ఈమెయిల్ అకౌంట్ మరియు దానికి సంబంధించిన పాస్వర్డ్ లను ఎంటర్ చేయుము</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">రీసెట్ చేయి</string>
+  <string name="menu_hidden_apps_reset_lock">ఆకృతి లాకును రీసెట్ చేయుము</string>
+  <string name="protected_apps">రక్షించబడిన అనువర్తనాలు</string>
+  <string name="protected_apps_summary">సురక్షిత లాక్ వెనుక దాచి ఉంచబడ్డ అనువర్తనాలను నిర్వహించుము</string>
+  <string name="saving_protected_components">సేవ్ చేసే అంశం యొక్క స్థితి\u2026</string>
+  <string name="pa_login_username_hint">వినియోగదారు పేరు (ఇమెయిల్)</string>
+  <string name="pa_login_password_hint">పాస్‌వర్డ్</string>
+  <string name="pa_login_submit_button">సైన్ ఇన్ చేయి</string>
+  <string name="pa_login_checking_password">ఖాతాను తనిఖీ చేస్తోంది…</string>
+  <string name="pa_login_incorrect_login">లాగిన్ తప్పు</string>
+  <string name="pa_pattern_or_fingerprint_header">అన్లాక్ చేసేందుకు ఆకృతిని గీయాలి లేదా వేలిముద్రను ఉపయోగించాలి</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">సహకారులు</string>
+  <string name="contributors_cloud_loading_message">మద్దతుదారుని డేటా లోడ్ చేయడం జరుగుతూ ఉంది\u2026</string>
+  <string name="contributors_cloud_failed_message">మద్దతుదారుని డేటా లోడ్ చేయడం కుదరలేదు</string>
+  <string name="contributor_info_menu">మద్దతుదారుని సమాచారం</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>పేరు:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>నిక్:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>అంగీకారాలు:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">మద్దతు సమాచారం</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>మొత్తం మద్దతుదారులు:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>మొత్తం అంగీకారాలు:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>చివరి నవీకరణ:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">ధ్వనులు</string>
+  <string name="notification_manager">నోటిఫికేషన్‌లు</string>
+  <string name="lockscreen_settings">స్క్రీన్‌ను లాక్ చేయడం</string>
+  <string name="category_lights">లైట్లు</string>
+  <string name="category_volume">వాల్యూమ్</string>
+  <string name="category_vibrate">వైబ్రేట్</string>
+  <string name="category_misc">నానావిధమైనవి</string>
+  <string name="title_general">సాధారణం</string>
+  <string name="advanced">అధునాతనం</string>
+  <string name="link_volume_option_title">రింగ్ టోన్ మరియు నోటిఫికేషన్ వాల్యూములను అనుసంధానించుము</string>
+  <string name="lcd_density_prompt_message">కొన్ని అనువర్తనాలు ప్రామాణికం కాని DPI వద్ద పనిచేయకపోవచ్చు. \n\nఇది మీ పరికరాన్ని తిరిగి ప్రారంభిస్తుంది.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP ఫోన్ నంబర్</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">డూప్లికేట్ APN</string>
+  <string name="duplicate_apn_error_message">ఈ APN ఇప్పటికే ఉంది. వదిలివేయు లేదా పారామితులు మార్చండి.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> is <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
+  <string name="sim_disabled">నిలిపివేయబడింది</string>
+  <string name="sim_missing">గల్లంతయిన లేదా లోపాలున్న</string>
+  <string name="sim_enabler_need_disable_sim">SIM కార్డ్ నిష్క్రియాత్మకం చేయబడుతుంది. మీరు కొనసాగించాలని అనుకుంటున్నారా?</string>
+  <string name="sim_enabler_will_disable_sim_title">సావధానత</string>
+  <string name="sim_enabler_need_switch_data_service">ఈ SIM అచేతనపరచబడుతుంది మరియు డేటా సేవల కొరకుSIM <xliff:g id="slotid">%1$s</xliff:g> ఉపయోగించబడుతుంది. కొనసాగించాలని మీరు నిర్ధారించుకున్నారా?</string>
+  <string name="sim_enabler_airplane_on">విమాన మోడ్ ఆన్లో ఉన్నప్పుడు ఆపరేషన్ నిర్వహించడం సాధ్యపడదు.</string>
+  <string name="sim_enabler_in_call">కాల్ లో ఉన్నప్పుడు ఆపరేషన్ నిర్వహించడం సాధ్యపడదు.</string>
+  <string name="sim_enabler_both_inactive">అన్ని SIM కార్డులను నిలిపివేయడం కుదరదు</string>
+  <string name="sim_enabler_enabling">\u2026 క్రియాత్మకమవుతుంది</string>
+  <string name="sim_enabler_disabling">నిష్క్రియాత్మకం చేయబడుతుంది\u2026</string>
+  <string name="sub_activate_success">SIM సక్రియం చేయబడింది</string>
+  <string name="sub_activate_failed">క్రియాశీలత విఫలమయింది.</string>
+  <string name="sub_deactivate_success">SIM నిష్క్రియాత్మకం చేయబడింది.</string>
+  <string name="sub_deactivate_failed">నిష్క్రియాత్మకం విఫలమయింది.</string>
+  <string name="primary_sub_select_title">డీఫాల్ట్ 3G/LTE సభ్యత్వం</string>
+  <string name="select_sim_card">సిమ్ కార్డ్‌ను ఎంచుకోండి</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d స్థితి</string>
+  <string name="sim_card_lock_settings_title">SIM %d లాక్ సెట్టింగులు</string>
+  <string name="sim_card_summary_empty">SIM చొప్పించబడలేదు</string>
+  <string name="sim_mobile_network_settings_category_title">మొబైల్ నెట్వర్క్ సెట్టింగులు</string>
+  <string name="sim_mobile_network_settings_title">SIM %d సెట్టింగులు</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">జ్ఞాపికలు</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">ఈవెంట్</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">ఎంచుకున్న కాలర్‌లు</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">సందేశాలు ఎంచుకోబడ్డాయి</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">ప్రారంభం: %1$s W/kg</string>
+  <string name="maximum_body_level">ముఖ్య భాగం: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">నమూనా %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">SIM %d రింగ్‌టోన్</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">అనువర్తనం</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">చివరిగా ఉపయోగించినది</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">వినియోగ సమయం:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">ఇది మీ టాబ్లెట్ యొక్క అంతర్గత నిల్వ నుండి మొత్తం <b>డేటాను చెరిపి వేస్తుంది:</b> \n\nతో సహా<li>మీ పరికరం యొక్క అకౌంట్లు</li>\n<li>సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు</li>\n<li>డౌన్లోడ్ చేయబడిన అనువర్తనాలు</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">ఇది మీ ఫోన్ యొక్క అంతర్గత నిల్వ నుండి మొత్తం డేటాను <b>చెరిపి వేస్తుంది: \n\nతో</b> సహా<li>మీ పరికరం యొక్క అకౌంట్లు</li>\n<li>సిస్టమ్ మరియు అనువర్తన డేటా మరియు సెట్టింగ్‌లు</li>\n<li>డౌన్లోడ్ చేయబడిన అనువర్తనాలు</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">వ్యక్తిగత డేటా మరియు అనువర్తనాలు</string>
+  <string name="factory_reset_instructions_summary">ఇది ఈ పరికరంలో ఉన్న మీ యొక్క అన్ని అకౌంట్లు, అనువర్తనాలు, అనువర్తన డేటా, మరియు సిస్టం సెట్టింగులను ఇది చెరిపి వేస్తుంది</string>
+  <string name="factory_reset_personal_content">వ్యక్తిగత విషయాలు</string>
+  <string name="factory_reset_erase_stored_content">నిల్వ చేయబడి ఉన్న విషయయాంశాలను చెరిపి వేయుము</string>
+  <string name="factory_reset_erase_stored_content_summary">ఈ పరికరంలో నిల్వ చేయబడి ఉన్న సంగీతం, ఫోటోలు, వీడియోలు, మరియు ఇతర వినియోగదారు డేటాను చెరిపి వేయుము.</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">ఈ పరికరంలో నిల్వ చేయబడి ఉన్న సంగీతం, ఫోటోలు, వీడియోలు, మరియు ఇతర వినియోగదారు డేటాను చెరిపి వేయుము. \n\n<b>పరికర గుప్తలేఖనం కారణంగా విషయంశాలను సేవ్ చేయడం కుదరలేదు.</b></string>
+  <string name="factory_reset_erase_sd_card">SD కార్డు‌ని ఫార్మాట్ చేయుము?</string>
+  <string name="factory_reset_erase_sd_card_summary">సంగీతం ఫోటోలతో సహా SD కార్డు పైన ఉన్న మొత్తం డేటాను చెరిపి వేయుము</string>
+  <string name="factory_reset_warning_text_reset_now">ఇప్పుడు రీసెట్ చేయుము</string>
+  <string name="factory_reset_warning_text_message">మీ యొక్క మొత్తం అకౌంట్లు, అనువర్తనాలు, అనువర్తన డేటా, మరియు సిస్టం సెట్టింగులు ఈ పరికరం నుండి తొలిగించబడతాయి. దీనిని రివర్స్ చేయడం కుదరదు.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">ఇతర</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi hotspot timeout</string>
+  <string name="hotstpot_inactivity_timeout_never">ఎప్పటికీ వద్దు</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 నిమిషం</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 నిమిషాలు</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 నిమిషాలు</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">పోర్టబుల్ Wifi\u2011Fi హాట్స్పాట్ ఎప్పుడూ గడువు ముగియడానికి ఉంటుంది</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">పోర్టబుల్ Wifi\u2011Fi హాట్స్పాట్ <xliff:g id="timeout">%1$s</xliff:g> తరువాత గడువు ముగియడానికి ఉంటుంది </string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ప్రత్యక్ష లాక్ స్క్రీన్</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">ప్రారంభించు మరియు ప్రత్యక్ష లాక్ తెరలను ఆకృతీకరించు</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">సెట్టింగ్‌లు</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ప్రత్యక్ష లాక్ తెరలు వీక్షించడానికి అందుబాటులో ఉన్నాయి , తిరిగి లైవ్ లాక్ తెరలు ఆన్</string>
+  <string name="interruptions_ignore_while_media_title">ఆడియోను దాచడాన్ని నివారించుము</string>
+  <string name="interruptions_ignore_while_media_summary">నోటిఫికేషన్ వచ్చినప్పుడు మీడియా ప్లేబ్యాక్ వాల్యూమును తగ్గించవద్దు</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">సయనోజెన్ మోడ్ లీగల్</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">రీసెట్ గణాంకాలు</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">బ్యాటరీ చరిత్ర గణాంకాలు రీసెట్ చేయబడబోతున్నాయి</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">డాక్ బ్యాటరీ లేదు</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">డాక్ AC పైన చార్జింగ్ అవుతుంది</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">డాక్ USB పైన చార్జింగ్ అవుతుంది</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index e6c963f..2a7ffed 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -252,8 +252,10 @@
   <string name="notification_light_missed_call_title">สายไม่ได้รับ</string>
   <string name="notification_light_voicemail_title">ข้อความเสียง</string>
   <string name="notification_light_screen_on">แสงพร้อมเปิดจอ</string>
+  <string name="notification_light_zen_mode">ไฟแจ้งเตือนในรูปแบบห้ามรบกวน</string>
   <string name="notification_light_use_multiple_leds">LED หลายดวง</string>
   <string name="keywords_lights_brightness_level">ลดความสว่าง LED</string>
+  <string name="notification_light_automagic">เลือกสีอัตโนมัติ</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">ตั้งค่าความสว่าง</string>
   <string name="led_notification_text">เปิดใช้งาน LED จากการตั้งค่า</string>
@@ -288,6 +290,8 @@
   <string name="app_ops_summaries_modify_call_log">แก้ไขประวัติการโทร</string>
   <string name="app_ops_summaries_read_calendar">อ่านปฏิทิน</string>
   <string name="app_ops_summaries_modify_calendar">แก้ไขปฏิทิน</string>
+  <string name="app_ops_summaries_wifi_scan">ค้นหา Wi-Fi</string>
+  <string name="app_ops_summaries_notification">การแจ้งเตือน/กล่องข้อความ</string>
   <string name="app_ops_summaries_cell_scan">ค้นหาเครือข่าย</string>
   <string name="app_ops_summaries_call_phone">โทรออก</string>
   <string name="app_ops_summaries_read_sms">อ่าน SMS</string>
@@ -355,10 +359,31 @@
   <string name="app_ops_labels_notification_volume">ระดับเสียงแจ้งเตือน</string>
   <string name="app_ops_labels_bluetooth_volume">ระดับเสียงบลูทูธ</string>
   <string name="app_ops_labels_keep_awake">เปิดจอค้าง</string>
+  <string name="app_ops_labels_get_usage_stats">ดูสถิติการใช้งาน</string>
   <string name="app_ops_labels_mute_unmute_microphone">เปิด/ปิด ไมโครโฟน</string>
   <string name="app_ops_labels_toast_window">แสดงกล่องข้อความ</string>
   <string name="app_ops_labels_project_media">สื่อโครงการ</string>
   <string name="app_ops_labels_activate_vpn">เปิดใช้งาน VPN</string>
+  <string name="app_ops_labels_write_wallpaper">เปลี่ยนภาพพื้นหลัง</string>
+  <string name="app_ops_labels_assist_structure">แอปผู้ช่วย</string>
+  <string name="app_ops_labels_assist_screenshot">ช่วยจับหน้าจอ</string>
+  <string name="app_ops_labels_read_phone_state">อ่านสถานะโทรศัพท์</string>
+  <string name="app_ops_labels_add_voicemail">เพิ่มข้อความเสียง</string>
+  <string name="app_ops_labels_use_sip">ใช้ SIP</string>
+  <string name="app_ops_labels_make_call">ทำการโทร</string>
+  <string name="app_ops_labels_use_fingerprint">ใช้ลายนิ้วมือ</string>
+  <string name="app_ops_labels_use_body_sensors">ใช้เซนเซอร์ตรวจร่างกาย</string>
+  <string name="app_ops_labels_read_cell_broadcasts">อ่านการติดต่อเครือข่าย</string>
+  <string name="app_ops_labels_mock_location">จำลองสถานที่</string>
+  <string name="app_ops_labels_read_external_storage">อ่านที่เก็บข้อมูลภายนอก</string>
+  <string name="app_ops_labels_write_external_storage">เขียนที่เก็บข้อมูลภายนอก</string>
+  <string name="app_ops_labels_turn_screen_on">เปิดหน้าจอ</string>
+  <string name="app_ops_labels_get_accounts">เข้าถึงบัญชี</string>
+  <string name="app_ops_labels_toggle_wifi">สลับ Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">สลับบลูทูธ</string>
+  <string name="app_ops_labels_start_at_boot">เริ่มต้นเมื่อบูต</string>
+  <string name="app_ops_labels_toggle_nfc">สลับ NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">สลับข้อมูลโทรศัพท์มือถือ</string>
   <string name="app_ops_labels_superuser">สิทธิผู้ดูแลระบบ</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">อนุญาต</string>
@@ -653,6 +678,8 @@
   <string name="status_bar_battery_percentage_text_inside">ในไอคอน</string>
   <string name="status_bar_battery_percentage_text_next">ถัดจากไอคอน</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">ไอคอนในแถบสถานะ</string>
+  <string name="status_bar_icons_summary">ควบคุมไอคอนที่จะแสดงบนแถบสถานะ</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">บล็อคการแตะเมื่อปัด</string>
   <string name="edge_gesture_service_summary">อย่าส่งกิจกรรมการแตะไปยังแอปสำหรับท่าทางการแตะแถบสถานะหรือแถบนำทาง</string>
@@ -689,6 +716,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">แสดงเส้นจังหวะเพลง</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">ถูกปิดโดยไทล์การตั้งค่าด่วน</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">แตะเพื่อเปิดใช้งานหน้าจอล็อค</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">หน้าจอล็อคเปิดใช้งาน!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">ขีดจำกัดการประหยัดแบตเตอรี่</string>
   <string name="battery_saver_summary">ลดประสิทธิภาพและจำกัดการใช้ข้อมูลเบื้องหลัง</string>
@@ -698,6 +728,7 @@
   <string name="autoperf_summary">เลือกรูปแบบแบตเตอรี่ที่เหมาะสมสำหรับแอปต่าง ๆ โดยอัตโนมัติ</string>
   <string name="perf_profile_title">รูปแบบแบตเตอรี่</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">เริ่มแอปเมื่อบูต</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">เสียงแจ้งเตือน</string>
   <!-- Advanced reboot options -->
@@ -726,6 +757,7 @@
   <string name="voice_wakeup_retrain_title">จดจำเสียงของคุณ</string>
   <string name="voice_wakeup_activity_title">กิจกรรมที่จะเปิดใช้</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">การปลุกด้วยเสียงต้องได้รับอนุญาตในการโทรเพื่อเลือกผู้ติดต่อสำหรับการโทรออกโดยตรง</string>
   <string name="picker_activities">กิจกรรม</string>
   <string name="select_custom_app_title">เลือกแอปเอง</string>
   <string name="select_custom_activity_title">เลือกกิจกรรมเอง</string>
@@ -794,12 +826,14 @@
   <string name="menu_hidden_apps_delete">รีเซ็ต</string>
   <string name="menu_hidden_apps_reset_lock">รีเซ็ตการล็อครูปแบบ</string>
   <string name="protected_apps">แอปที่ได้รับการปกป้อง</string>
+  <string name="protected_apps_summary">จัดการว่าแอปพลิเคชั่นใดที่จะซ่อนไว้ด้านหลังล็อคที่ปลอดภัย</string>
   <string name="saving_protected_components">กำลังบันทึกองค์ประกอบ\u2026</string>
   <string name="pa_login_username_hint">ชื่อผู้ใช้ (อีเมล)</string>
   <string name="pa_login_password_hint">รหัสผ่าน</string>
   <string name="pa_login_submit_button">ลงชื่อเข้าใช้</string>
   <string name="pa_login_checking_password">กำลังตรวจสอบบัญชี\u2026</string>
   <string name="pa_login_incorrect_login">การเข้าสู่ระบบไม่ถูกต้อง</string>
+  <string name="pa_pattern_or_fingerprint_header">ต้องวาดรูปแบบหรือใช้ลายนิ้วมือเพื่อปลดล็อค</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">ผู้ร่วมพัฒนา</string>
   <string name="contributors_cloud_loading_message">การโหลดข้อมูลผู้ร่วมพัฒนา\u2026</string>
@@ -824,18 +858,34 @@
   <string name="title_general">ทั่วไป</string>
   <string name="advanced">ขั้นสูง</string>
   <string name="link_volume_option_title">เชื่อมต่อความดังเสียงเรียกเข้า&amp; เสียงแจ้งเตือน</string>
+  <string name="lcd_density_prompt_message">บางแอปจะไม่สามารถทำงานได้ที่ dpi ไม่มาตราฐาน\n\nโปรดรีสตาร์ทอุปกรณ์ของคุณ</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">หมายเลขโทรศัพท์ APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN ซ้ำกัน</string>
+  <string name="duplicate_apn_error_message">มี APN นี้อยู่แล้ว เลิกทำหรือแก้ไขค่าใหม่</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> ถูก <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">ปิดใช้งานแล้ว</string>
   <string name="sim_missing">สูญหายหรือชำรุด</string>
+  <string name="sim_enabler_need_disable_sim">ซิมการ์ดจะถูกปิดใช้งาน คุณต้องการทำต่อหรือไม่</string>
+  <string name="sim_enabler_will_disable_sim_title">โปรดทราบ</string>
+  <string name="sim_enabler_need_switch_data_service">ซิมการ์ดนี้จะถูกปิดใช้งานและซิม <xliff:g id="slotid">%1$s</xliff:g>จะถูกใช้สำหรับข้อมูลแทน คุณแน่ใจที่จะทำต่อหรือไม่</string>
   <string name="sim_enabler_airplane_on">ไม่สามารถดำเนินการนี้ได้ขณะอยู่ในรูปแบบเครื่องบิน</string>
   <string name="sim_enabler_in_call">ไม่สามารถดำเนินการนี้ได้ขณะใช้สายอยู่</string>
   <string name="sim_enabler_both_inactive">ไม่สามารถปิดการใช้งานทุกซิมการ์ดได้</string>
+  <string name="sim_enabler_enabling">กำลังเปิดใช้\u2026</string>
+  <string name="sim_enabler_disabling">กำลังปิด\u2026</string>
+  <string name="sub_activate_success">เปิดใช้งานซิมแล้ว</string>
+  <string name="sub_activate_failed">เปิดใช้งานล้มเหลว</string>
+  <string name="sub_deactivate_success">ซิมปิดการใช้งานแล้ว</string>
+  <string name="sub_deactivate_failed">การปิดใช้งานล้มเหลว</string>
   <string name="primary_sub_select_title">สมัครข้อมูล 3G/LTE เริ่มต้น</string>
+  <string name="select_sim_card">เลือกซิมการ์ด</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">สถานะซิม %d</string>
   <string name="sim_card_lock_settings_title">ตั้งค่าการล็อคซิม %d</string>
   <string name="sim_card_summary_empty">ไม่ได้ใส่ซิม</string>
+  <string name="sim_mobile_network_settings_category_title">การตั้งค่าเครือข่ายโทรศัพท์</string>
   <string name="sim_mobile_network_settings_title">การตั้งค่าซิม %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
@@ -871,6 +921,9 @@
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">ไม่ต้องเลย</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 นาที</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 นาที</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 นาที</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <!-- Live lock screen summary -->
@@ -881,4 +934,14 @@
   <string name="interruptions_ignore_while_media_summary">ไม่ลดเสียงเพลงเมื่อมีการแจ้งเตือนเข้า</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">เกี่ยวกับกฎหมาย CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">ตั้งค่าสถิติใหม่</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">จะมีการตั้งค่าสถิติประวัติแบตเตอร์รี่ใหม่</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">ไม่มีแท่นชาร์จแบตเตอร์รี่</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">การชาร์จบนแท่น AC</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">การชาร์จผ่านแท่น USB</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index dd99c2e..93e46f4 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -882,4 +882,14 @@
   <string name="interruptions_ignore_while_media_summary">Bir bildirim geldiğinde, medya oynatma ses seviyesini azaltma</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod yasal</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">İstatistikleri sıfırla</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Pil kullanım istatistikleri sıfırlanacak</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Ünite pili mevcut değil</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Ünite AC ile şarj oluyor</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Ünite USB\'si ile şarj oluyor</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index ef88515..a4b1c35 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -38,12 +38,16 @@
   <string name="root_access_adb">ADB لا</string>
   <string name="root_access_all">Apps ۋە ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod نەشرى</string>
   <string name="mod_version_default">يوچۇن</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">ئۈسكىنە تىپى</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">ئۈسكۈنە ئاتى</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod نىڭ API دەرىجىسى</string>
   <string name="mod_api_level_default">يوچۇن</string>
   <!-- About phone screen, build date -->
   <string name="build_date">ھاسىللىغان چېسلا</string>
@@ -77,7 +81,7 @@
   <string name="profile_selected">تاللانغان سەپلىمە ھۆججەت: %1$s</string>
   <string name="profile_nfc_text">بىر سەپلىمە ھۆججەت NFC بەلگىگە يېزىلىپ بەلگىنى چېكىپ سەپلىمە ھۆججەتنى ئۆزگەرتىشكە قولايلىق يارىتىدۇ. ئىككىنچى قېتىم چېكىلگەندە ئەسلىدىكى تاللىغان سەپلىمە ھۆججىتىڭىزگە قايتىدۇ.</string>
   <string name="profile_unknown_nfc_tag">يوچۇن سەپلىمە ھۆججەت</string>
-  <string name="profile_add_nfc_text">بۇ NFC بەلگە يوچۇن بىر سەپلىمە ھۆججەت بىلەن باغلانغان.بۇ NFC بەلگە مەۋجۇت بىر سەپلىمە ھۆججەتكە باغلانسا بۇ سەپلىمە ھۆججەتنى تاللىشىڭىزغا يول قويىدۇ.</string>
+  <string name="profile_add_nfc_text">بۇ NFC بەلگە يوچۇن بىر سەپلىمە ھۆججەت بىلەن باغلانغان. بۇ NFC بەلگە مەۋجۇت بىر سەپلىمە ھۆججەتكە ئۇلانسا بۇ سەپلىمە ھۆججەتنى تاللىشىڭىزغا يول قويىدۇ.</string>
   <string name="profile_select">سەپلىمە ھۆججەت تاللاڭ</string>
   <string name="profile_remove_dialog_message">بۇ %1$s سەپلىمە ھۆججەتنى ئۆچۈرەمدۇ؟</string>
   <string name="profile_populate_profile_from_state">نۆۋەتتىكى ئۈسكۈنە سەپلىگەن سەپلىمە ھۆججەتنى ئىشلىتەمدۇ؟</string>
@@ -87,6 +91,9 @@
   <string name="profile_app_group_item_instructions">گۇرۇپپا قوش ياكى چىقىرىۋەت</string>
   <string name="profile_app_group_item_instructions_summary">ئۇقتۇرۇش قاپلايدىغان ئەپنى بۇ سەپلىمە ھۆججەتتىن چىقىرىۋېتىدۇ ياكى قوشىدۇ</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">ئوچۇق</string>
+  <string name="profile_entries_off">تاقاق</string>
+  <string name="profile_entries_no_override">قاپلىنىش يوق</string>
   <!-- Add Profile -->
   <string name="profile_name_title">ئاتى</string>
   <string name="new_profile_name">&lt;يېڭى سەپلىمە ھۆججەت&gt;</string>
@@ -97,6 +104,7 @@
   <string name="rename_dialog_hint">سەپلىمە ھۆججەت ئاتىنى كىرگۈزۈڭ</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">ئەسلىگە قايتۇرۇش</string>
+  <string name="profile_reset_message">ئىشلەتكۈچى قۇرغان ھەممە سەپلىمە ھۆججەت ۋە ئەپ گۇرۇپپىسىنى ئۆچۈرۈپ كۆڭۈلدىكى تەڭشەككە ئەسلىگە كەلتۈرەمدۇ؟</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">بۇ ئەپنى چىقىرىۋېتەمدۇ؟</string>
   <!-- Profile network mode -->
@@ -117,7 +125,7 @@
   <string name="profile_appgroup_manage">ئەپ گۇرۇپپىلىرىنى باشقۇرۇش</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
   <string name="profile_settings">سەپلىمە ھۆججەت تەڭشەكلىرى</string>
-  <string name="profile_trigger_connect">باغلانغاندا</string>
+  <string name="profile_trigger_connect">ئۇلانغاندا</string>
   <string name="profile_trigger_disconnect">ئۈزۈلگەندە</string>
   <string name="profile_trigger_notrigger">قوزغىتىش يوق</string>
   <!-- Profile Settings sound modes labels -->
@@ -141,24 +149,32 @@
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">سىستېما تەڭشەكلىرى</string>
   <string name="profile_lockmode_title">ئېكران قۇلۇپ ھالىتى</string>
+  <string name="profile_lockmode_policy_disabled_summary">بۇ سەپلەنمە ھۆججەت ئۈسكىنە باشقۇرغۇچى تەرپىدىن چەكلەنگەن</string>
   <string name="profile_lockmode_insecure_summary">ئىم ياكى PIN كودىنى سورىمايدۇ</string>
   <string name="profile_lockmode_disabled_summary">ئېكران قۇلۇپنى چەكلەيدۇ</string>
   <string name="profile_airplanemode_title">ئايروپىلان ھالىتى</string>
+  <string name="profile_brightness_title">ئېكران يورۇقلۇقى</string>
+  <string name="profile_brightness_override_summary">%1$d%% تەڭشىدى</string>
+  <string name="profile_brightness_override_checkbox_label">يورۇقلۇقىنى قاپلاش</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
   <string name="toggleWifiAp">ئەپچىل Wi\u2011Fi قىزىق نۇقتىسى</string>
   <string name="toggleBluetooth">كۆكچىش</string>
   <string name="toggleGPS">GPS</string>
-  <string name="toggleData">سانلىق مەلۇمات باغلىنىشى</string>
+  <string name="toggleData">سانلىق مەلۇمات ئۇلىنىشى</string>
   <string name="toggleSync">سانلىق مەلۇماتىنى ئۆزلۈكىدىن قەدەمداشلا</string>
   <string name="toggle2g3g4g">ئالدىن بەلگىلەنگەن تور تىپى</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Wi\u2011Fi رايون كودى</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Wi\u2011Fi ئۈچۈن رايون كودى بېكىتىڭ</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">رايون كودىنى تەڭشىگەندە مەسىلە كۆرۈلدى.</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ئۆچۈر</string>
   <string name="profile_action_none">ئۆزگەرتمەي قالدۇر</string>
+  <string name="profile_action_system">سىستېما كۆڭۈلدىكى</string>
   <string name="profile_action_disable">تاقاق</string>
   <string name="profile_action_enable">ئوچۇق</string>
   <string name="profile_trigger_a2dp_connect">A2DP باغلانغاندا</string>
@@ -235,7 +251,14 @@
   <string name="notification_light_default_value">كۆڭۈلدىكى</string>
   <string name="notification_light_missed_call_title">سۆزلەشمىگەن چاقىرىش</string>
   <string name="notification_light_voicemail_title">ئۈنخەت</string>
+  <string name="notification_light_screen_on">ئېكران ئېچىلغاندا كۆرسەتكۈچ چىراق يورۇيدۇ</string>
+  <string name="notification_light_zen_mode">ئاۋارە قىلماڭ ھالىتىدىكى كۆرسەتكۈچ چىراق</string>
+  <string name="notification_light_use_multiple_leds">كۆپ LED</string>
+  <string name="keywords_lights_brightness_level">led نىڭ يورۇقلۇقىنى تۆۋەنلىتىش</string>
+  <string name="notification_light_automagic">رەڭنى ئاپتۇماتېك تاللاش</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">يورۇقلۇق تەكشىكى</string>
+  <string name="led_notification_text">تەڭشەكتىن LED نى قوزغىتىش</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android سازلاش</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -267,6 +290,8 @@
   <string name="app_ops_summaries_modify_call_log">چاقىرىش خاتىرىسىنى ئۆزگەرتىدۇ</string>
   <string name="app_ops_summaries_read_calendar">يىلنامە ئوقۇيدۇ</string>
   <string name="app_ops_summaries_modify_calendar">يىلنامە ئۆزگەرتىدۇ</string>
+  <string name="app_ops_summaries_wifi_scan">Wi-Fi سىكاننېرلاش</string>
+  <string name="app_ops_summaries_notification">ئۇقتۇرۇش\ئەسكەرتىش</string>
   <string name="app_ops_summaries_cell_scan">كۆنەكسىمان تور ئىزدە</string>
   <string name="app_ops_summaries_call_phone">تېلېفوننى چاقىر</string>
   <string name="app_ops_summaries_read_sms">قىسقا ئۇچۇر ئوقۇ</string>
@@ -294,15 +319,39 @@
   <string name="app_ops_summaries_media_volume">ۋاسىتە ئاۋازى</string>
   <string name="app_ops_summaries_alarm_volume">قوڭغۇراق ئاۋازى</string>
   <string name="app_ops_summaries_notification_volume">ئۇقتۇرۇش ئاۋازى</string>
+  <string name="app_ops_summaries_bluetooth_volume">كۆكچىش ئاۋازى</string>
   <string name="app_ops_summaries_keep_awake">ئويغاق ھالەتنى ساقلا</string>
   <string name="app_ops_summaries_monitor_location">ئورۇننى كۆزەت</string>
   <string name="app_ops_summaries_monitor_high_power_location">يۇقىرى توك سەرپىياتى ئورنىنى كۆزەت</string>
+  <string name="app_ops_summaries_get_usage_stats">ئىشلىتىش ستاتىستىكىسىغا ئېرىشىش</string>
   <string name="app_ops_summaries_mute_unmute_microphone">مىكروفون ئۈنلۈك/ئۈنسىز</string>
   <string name="app_ops_summaries_toast_window">ئەسكەرتىش ئۇچۇرىنى كۆرسىتىدۇ</string>
   <string name="app_ops_summaries_project_media">ۋاسىتىنى قويىدۇ</string>
   <string name="app_ops_summaries_activate_vpn">VPN نى ئاكتىپلا</string>
+  <string name="app_ops_summaries_write_wallpaper">تەگلىك ئۆزگەرتىش</string>
+  <string name="app_ops_summaries_assist_structure">قوشۇمچە قورۇلما</string>
+  <string name="app_ops_summaries_assist_screenshot">ئېكران رەسىم تۇتۇش ياردەمچىسى</string>
+  <string name="app_ops_summaries_read_phone_state">تېلېفون ھالىتىنى ئوقۇڭ</string>
+  <string name="app_ops_summaries_add_voicemail">ئاۋازلىق ئېلخەت قوشۇڭ</string>
+  <string name="app_ops_summaries_use_sip">sIP ئىشلىتىش</string>
+  <string name="app_ops_summaries_make_call">تېلېفون ئۇرۇش</string>
+  <string name="app_ops_summaries_use_fingerprint">بارماق ئىشلىتىش</string>
+  <string name="app_ops_summaries_use_body_sensors">ئادەم بەدىنى ئىندۇكسىيەسىنى ئىشلىتىش</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">رايونلۇق رادىئونى ئوقۇش</string>
+  <string name="app_ops_summaries_mock_location">ساختا ئورۇن ئىشلىتىش</string>
+  <string name="app_ops_summaries_read_external_storage">سىرتقى ساقلىغۇچنى ئوقۇش</string>
+  <string name="app_ops_summaries_write_external_storage">سىرتقى ساقلىغۇچقا يېزىش</string>
+  <string name="app_ops_summaries_turn_screen_on">ئېكراننى يورۇتۇش</string>
+  <string name="app_ops_summaries_get_accounts">ھېساباتقا ئېرىشىش</string>
+  <string name="app_ops_summaries_toggle_wifi">wiFi نى ئېچىش تاقاش</string>
+  <string name="app_ops_summaries_toggle_bluetooth">كۆكچىشنى ئېچىش تاقاش</string>
+  <string name="app_ops_summaries_start_at_boot">تېلېفون ئېچىلغاندا قوزغىلىش</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC ئېچىش تاقاش</string>
+  <string name="app_ops_summaries_toggle_mobile_data">كۆچمە تورغا ئالماشتۇرۇش</string>
   <string name="app_ops_summaries_superuser">Root ھوقۇقى</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">تەخمىنىي ئورنى</string>
+  <string name="app_ops_labels_fine_location">دەل ئورنى</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">تىترەت</string>
   <string name="app_ops_labels_read_contacts">ئالاقەداشلارنى ئوقۇيدۇ</string>
@@ -311,11 +360,19 @@
   <string name="app_ops_labels_modify_call_log">چاقىرىش خاتىرىسىنى ئۆزگەرتىدۇ</string>
   <string name="app_ops_labels_read_calendar">يىلنامە ئوقۇيدۇ</string>
   <string name="app_ops_labels_modify_calendar">يىلنامە ئۆزگەرتىدۇ</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi سىكاننېرلاش</string>
   <string name="app_ops_labels_notification">ئۇقتۇرۇش/Toast</string>
+  <string name="app_ops_labels_cell_scan">پونكىت سىكاننېرلاش</string>
   <string name="app_ops_labels_call_phone">تېلېفوننى چاقىر</string>
+  <string name="app_ops_labels_read_sms">قىسقا ئۇچۇر ئوقۇش</string>
+  <string name="app_ops_labels_write_sms">قىسقا ئۇچۇر يېزىش</string>
   <string name="app_ops_labels_receive_sms">قىسقا ئۇچۇر قوبۇللا</string>
+  <string name="app_ops_labels_receive_emergency_sms">جىددىي قىسقا ئۇچۇرنى قوبۇللاڭ</string>
   <string name="app_ops_labels_receive_mms">MMS قوبۇللا</string>
+  <string name="app_ops_labels_receive_wap_push">WAP push قوبۇللاڭ</string>
   <string name="app_ops_labels_send_sms">قىسقا ئۇچۇر يوللا</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS ئوقۇڭ</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS يېزىڭ</string>
   <string name="app_ops_labels_modify_settings">تەڭشەكلەرنى ئۆزگەرتىش</string>
   <string name="app_ops_labels_draw_on_top">چوققىسىغا سىزىدۇ</string>
   <string name="app_ops_labels_access_notifications">زىيارەت ئۇقتۇرۇشى</string>
@@ -334,10 +391,33 @@
   <string name="app_ops_labels_notification_volume">ئۇقتۇرۇش ئاۋازى</string>
   <string name="app_ops_labels_bluetooth_volume">كۆكچىش ئاۋازى</string>
   <string name="app_ops_labels_keep_awake">ئويغاق ھالەتنى ساقلا</string>
+  <string name="app_ops_labels_monitor_location">ئورۇننى كۆزىتىڭ</string>
+  <string name="app_ops_labels_monitor_high_power_location">يۇقىرى توك سەرپىياتى ئورنىنى كۆزىتىڭ</string>
+  <string name="app_ops_labels_get_usage_stats">ئىشلىتىش ستاتىستىكىسىغا ئېرىشىش</string>
   <string name="app_ops_labels_mute_unmute_microphone">مىكروفون ئۈنلۈك/ئۈنسىز</string>
   <string name="app_ops_labels_toast_window">ئەسكەرتىش ئۇچۇرىنى كۆرسىتىدۇ</string>
   <string name="app_ops_labels_project_media">ۋاسىتىنى قويىدۇ</string>
   <string name="app_ops_labels_activate_vpn">VPN نى ئاكتىپلا</string>
+  <string name="app_ops_labels_write_wallpaper">تەگلىك ئۆزگەرتىش</string>
+  <string name="app_ops_labels_assist_structure">قوشۇمچە قورۇلما</string>
+  <string name="app_ops_labels_assist_screenshot">ئېكران رەسىم تۇتۇش ياردەمچىسى</string>
+  <string name="app_ops_labels_read_phone_state">تېلېفون ھالىتىنى ئوقۇڭ</string>
+  <string name="app_ops_labels_add_voicemail">ئاۋازلىق ئېلخەت قوشۇڭ</string>
+  <string name="app_ops_labels_use_sip">SIP ئىشلىتىش</string>
+  <string name="app_ops_labels_make_call">تېلېفون ئۇرۇش</string>
+  <string name="app_ops_labels_use_fingerprint">بارماق ئىشلىتىش</string>
+  <string name="app_ops_labels_use_body_sensors">ئادەم بەدىنى ئىندۇكسىيەسىنى ئىشلىتىش</string>
+  <string name="app_ops_labels_read_cell_broadcasts">رايونلۇق رادىئونى ئوقۇش</string>
+  <string name="app_ops_labels_mock_location">ساختا ئورۇن ئىشلىتىش</string>
+  <string name="app_ops_labels_read_external_storage">سىرتقى ساقلىغۇچنى ئوقۇش</string>
+  <string name="app_ops_labels_write_external_storage">سىرتقى ساقلىغۇچقا يېزىش</string>
+  <string name="app_ops_labels_turn_screen_on">ئېكراننى يورۇتۇش</string>
+  <string name="app_ops_labels_get_accounts">ھېساباتقا ئېرىشىش</string>
+  <string name="app_ops_labels_toggle_wifi">WiFi نى ئېچىش تاقاش</string>
+  <string name="app_ops_labels_toggle_bluetooth">كۆكچىشنى ئېچىش تاقاش</string>
+  <string name="app_ops_labels_start_at_boot">تېلېفون ئېچىلغاندا قوزغىلىش</string>
+  <string name="app_ops_labels_toggle_nfc">NFC ئېچىش تاقاش</string>
+  <string name="app_ops_labels_toggle_mobile_data">كۆچمە تورغا ئالماشتۇرۇش</string>
   <string name="app_ops_labels_superuser">Root ھوقۇقى</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">يول قويۇلدى</string>
@@ -366,6 +446,7 @@
   <string name="hardware_keys_menu_key_title">تىزىملىك توپچا</string>
   <string name="hardware_keys_assist_key_title">ئىزدەش توپچىسى</string>
   <string name="hardware_keys_appswitch_key_title">يېقىنقى توپچىلار</string>
+  <string name="hardware_keys_camera_key_title">كامېرا توپچا</string>
   <string name="hardware_keys_volume_keys_title">ئاۋاز توپچىسى</string>
   <string name="hardware_keys_short_press_title">قىسقا بېسىش مەشغۇلاتى</string>
   <string name="hardware_keys_long_press_title">ئۇزۇن بېسىش مەشغۇلاتى</string>
@@ -379,6 +460,10 @@
   <string name="hardware_keys_action_launch_camera">كامېرانى قوزغات</string>
   <string name="hardware_keys_action_sleep">ئېكراننى تاقا</string>
   <string name="hardware_keys_action_last_app">ئاخىرقى ئەپ</string>
+  <string name="camera_sleep_on_release_title">ئېكران كۆزەت</string>
+  <string name="camera_sleep_on_release_summary">توپچە بېسىلغاندا، يېرىم بېسىلسا ئېكران يورۇق ھالەتنى ساقلايدۇ</string>
+  <string name="camera_launch_title">كامېرانى قوزغىتىڭ</string>
+  <string name="camera_launch_summary">ئۇزاق بېسىپ قويىۋەتسىڭىز ئاپارات قايتا قوزغىلىدۇ</string>
   <string name="volbtn_music_controls_title">نەغمە چېلىشنى باشقۇرۇش</string>
   <string name="volbtn_music_controls_summary">ئېكران تاقالغاندا، ئاۋاز كۇنۇپكىسى ئۇزۇن بېسىلسا نەغمە ئىزدەيدۇ</string>
   <string name="volbtn_cursor_control_title">ھەرپتاختا نۇر بەلگە تىزگىنى</string>
@@ -464,6 +549,7 @@
   <string name="headset_connect_player_title">نەغمە ئەپنى قوزغات</string>
   <string name="headset_connect_player_summary">تىڭشىغۇچ قىستۇرۇلغاندا كۆڭۈلدىكى نەغمە چالىدىغان ئەپنى قوزغىتىدۇ</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">ئاپتۇماتېك ئالدىنلىق</string>
   <string name="auto_brightness_reset_button">ئەسلىگە قايتۇرۇش</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">ئايلاندۇر</string>
@@ -503,16 +589,39 @@
   <string name="live_display_low_power_summary">يورۇقلۇقنى تۆۋەنلەتمىگەن ئەھۋالدا ئېكراننى تەڭشەپ توك سەرپىياتىنى تېجەيدۇ</string>
   <string name="live_display_enhance_color_title">كۈچەيتىلگەن رەڭلەر</string>
   <string name="live_display_enhance_color_summary">تېرە رەڭگى، مەنزىرە ۋە باشقا سۈرەتلەرنىڭ رەڭ جانلىقلىقىنى ئاشۇرىدۇ</string>
+  <string name="live_display_color_profile_title">رەڭ سەپلەنمە ھۆججىتى</string>
+  <string name="live_display_color_profile_standard_title">ئۆلچەملىك</string>
+  <string name="live_display_color_profile_standard_summary">توغرا رەڭ ۋە يورۇق ئاق رەڭ</string>
+  <string name="live_display_color_profile_natural_title">تەبىئىي</string>
+  <string name="live_display_color_profile_natural_summary">ئەمەلىي رەڭ ۋە ئەت رەڭ</string>
+  <string name="live_display_color_profile_dynamic_title">ھەرىكەتچان</string>
+  <string name="live_display_color_profile_dynamic_summary">كۈچەيتىلگەن رەڭ ۋە يورۇق ئاق رەڭ</string>
+  <string name="live_display_color_profile_cinema_title">كىنوخانا</string>
+  <string name="live_display_color_profile_cinema_summary">سىنىڭ مۇكەممەل رەڭ بىلەن قايتا نامايەن بۇلۇشى</string>
+  <string name="live_display_color_profile_astronomy_title">ئاسترونومىيە</string>
+  <string name="live_display_color_profile_astronomy_summary">كېچىدىكى توق قىزىل رەڭ</string>
+  <string name="live_display_color_profile_photography_title">سۈرەتكە تارتىش</string>
+  <string name="live_display_color_profile_photography_summary">رەسىمنىڭ مۇكەممەل رەڭ بىلەن قايتا نامايەن بۇلۇشى</string>
+  <string name="live_display_color_profile_basic_title">ئاساسىي</string>
+  <string name="live_display_color_profile_basic_summary">تەڭشەلمىگەن ئېكران ئىشلىتىش</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">تاللىغۇچ سىنبەلگىسى</string>
   <string name="ime_switcher_notify_summary">كىرگۈزگۈچ تاللىغۇچ سىنبەلگىسىنى كۆرسىتىدۇ</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">لەيلىمە ئۇقتۇرۇش</string>
+  <string name="summary_heads_up_enabled">ئۇقتۇرۇش سەكرەپ چىقىش قوزغىتىلدى</string>
+  <string name="summary_heads_up_disabled">ئۇقتۇرۇش سەكرەپ چىقىش چەكلەندى</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
   <string name="bluetooth_accept_all_files">ھەممە ھۆججەت تىپىگە قوشۇل</string>
   <!-- High touch sensitivity -->
   <string name="high_touch_sensitivity_title">سەزگۈر ئېكراننىڭ يۇقىرى سېزىمچانلىقى</string>
   <string name="high_touch_sensitivity_summary">سەزگۈر ئېكراننىڭ سېزىمچانلىقىنى كۈچەيتىپ پەلەي كىيگەندە ئىشلىتىشكە قولايلىق يارىتىدۇ</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">LCD سىغىمچانلىقى</string>
+  <string name="dialog_title_lcd_density">LCD سىغىمچانلىقى</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (دەرقەمسىز)</string>
+  <string name="restarting_ui">كۆرۈنمە كۆزنەكنى قايتا قوزغىتىۋاتىدۇ\u2026</string>
   <!-- Stylus Icon -->
   <string name="stylus_icon_enabled_title">چەكمە قەلەمنى ئىشلەتكەندە سىنبەلگە كۆرسەت</string>
   <string name="stylus_icon_enabled_summary">چەكمە قەلەمنى ئىشلەتكەندە كۆرسەتكۈچ سىنبەلگىنى كۆرسىتىدۇ</string>
@@ -546,6 +655,12 @@
   <string name="increasing_ring_min_volume_title">باشلاش ئاۋازى</string>
   <string name="increasing_ring_ramp_up_time_title">كۈچەيتىش ۋاقتى</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">ياردەمچى GPS سانلىق مەلۇمات چۈشۈرۈش</string>
+  <string name="lto_download_data_wifi_only_on">ھەرقانداق تور ئارقىلىق</string>
+  <string name="lto_download_data_wifi_only_off">پەقەت Wi\u2011Fi تورى ئارقىلىقلا</string>
+  <string name="volume_keys_control_ring_stream_title">قوڭغۇراق ئاۋاز مىقدارىنى كونتىرول قىلىش</string>
+  <string name="volume_keys_control_ring_stream_summary_on">ئاۋاز كۇنۇپكىسى ئاۋاز مىقدارىنى تىزگىنلەيدۇ</string>
+  <string name="volume_keys_control_ring_stream_summary_off">ئاۋاز كونۇپكىسى بىلەن مىدىئا ئاۋازىنى كونتىرول قىلىش</string>
   <string name="category_calibration">توغرىلاش</string>
   <string name="display_and_lights">كۆرسىتىش ۋە چىراغ</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -570,6 +685,7 @@
   <string name="status_bar_quick_qs_pulldown_summary">ھالەت بالداقنىڭ %1$s گىرۋىكىدىن تۆۋەنگە تارتقاندا تېز تەڭشەكلەر تاختىسى بىۋاستە كۆرۈنىدۇ</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">سول</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">ئوڭ</string>
+  <string name="status_bar_quick_qs_pulldown_off">تاقاق</string>
   <string name="status_bar_quick_qs_pulldown_left">سول</string>
   <string name="status_bar_quick_qs_pulldown_right">ئوڭ</string>
   <!-- Status bar - Clock -->
@@ -596,10 +712,15 @@
   <string name="status_bar_battery_percentage_text_inside">سىنبەلگە ئىچىدە</string>
   <string name="status_bar_battery_percentage_text_next">سىنبەلگە يېنىدا</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">ھالەت سىتون سىنبەلگىسى</string>
+  <string name="status_bar_icons_summary">قايسى ھالەت سىتون سىنبەلگىسىنىڭ كۆرۈنىدىغانلىقىنى كونتىرول قىلىش</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">قول ئىشارەت سېزىش ھادىسىسىنى توسۇش</string>
   <string name="edge_gesture_service_summary">ئەپكە يولباشچى ۋە ھالەت بالداق قول ئىشارىتىنىڭ تېگىش ھادىسىسىنى يوللىمايدۇ</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">ھەرگىز</string>
+  <string name="keep_screen_on_debugging">USB تەڭشىگەندە</string>
+  <string name="keep_screen_on_charging">توكلاۋاتقاندا</string>
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">شەخسىيەت</string>
   <!-- Privacy Guard -->
@@ -614,19 +735,34 @@
   <string name="privacy_guard_help_text">بۇ ئېكراندا قايسى ئەپلەردە شەخسىيەت قوغداشنى قوزغىتالايدىغانلىقىڭىزنى ئاددىيلا چېكىپ تاللىيالايسىز. تاللانغان ئەپلەر ئالاقەداش، قىسقا ئۇچۇر ياكى چاقىرىش خاتىرىسىغا ئوخشاش شەخسىي سانلىق مەلۇماتلىرىڭىزنى زىيارەت قىلالمايدۇ. بىر ئەپ تۈرى ئۇزۇن بېسىلسا ئەپنىڭ تەپسىلىي ئېكرانى ئېچىلىدۇ.\n\nكۆڭۈلدىكى ئەھۋالدا ئىچىدىكى ئەپلەرنى كۆرسەتمەيدۇ، تىزىملىكتىن مۇناسىپ تاللانمىنى تاللاپ ئۇلارنى كۆرسەتكىلى بولىدۇ.</string>
   <string name="privacy_guard_manager_show_system_apps">سىڭدۈرۈلگەن ئەپنى كۆرسەت</string>
   <string name="privacy_guard_advanced_settings_title">ئالىي</string>
+  <string name="privacy_guard_notification_title">ئۇقتۇرۇشنى كۆرسەت</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">ئەندىزە خاتالىقىنى كۆرسىتىش</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">ئەندىزە نۇقتىسىنى كۆرسىتىش</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">پارول كىرگۈزۈش رامكىسىنى بىۋاستە كۆرسىتىش</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">رەسىم كۆزنىكىنى بىۋاستە كۆرسىتىش</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Pin كىرگۈزۈش رامكىسىنى بىۋاستە كۆرسىتىش</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">نەغمە كۆرۈنۈشچانلىقىنى كۆرسەت</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">خىش تىز تەڭشەكتە تاقالدى</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">ئېكران قۇلۇپنى چىكىپ قوزغىتىڭ</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">ئېكران قۇلۇپى قوزغالدى!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">توكدان ياردەمچىسىنىڭ بوسۇغا قىممىتى</string>
+  <string name="battery_saver_summary">ئىقتىدارىنى تۆۋەنلىتىپ ئارقا سۇپا ئېقىم مىقدارىنى چەكلەيدۇ</string>
+  <string name="battery_saver_summary_unavailable">توكلاۋاتقاندا ئىشلەتكىلى بولمايدۇ</string>
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">يەككە ئەپ سەپلىمە ھۆججىتىنى قوزغات</string>
+  <string name="autoperf_summary">ئوخشىمىغان ئەپكە ئاپتۇماتېك ئوخشىمىغان باتارىيە ھالىتى تاللايدۇ</string>
   <string name="perf_profile_title">توكدان ھالىتى</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">تېلېفون قوزغالغاندا ئەپمۇ قوزغىلىدۇ</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">ئۇقتۇرۇش ئاۋازى</string>
   <!-- Advanced reboot options -->
@@ -655,13 +791,19 @@
   <string name="voice_wakeup_retrain_title">ئاۋازىڭىزنى قايتا مەشقلەندۈرۈڭ</string>
   <string name="voice_wakeup_activity_title">قوزغىتىدىغان پائالىيەت</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">ئاۋازلىق ئويغىنىش ئىقتىدارى ئالاقىداشنى بىۋاستە چاقىرىش ئۈچۈن تېلېفون ھوقۇقىغا ئېرىشىشكە مۇھتاج.</string>
   <string name="picker_activities">پائالىيەتلەر</string>
   <string name="select_custom_app_title">ئىختىيارىي ئەپنى تاللاڭ</string>
   <string name="select_custom_activity_title">ئىختىيارىي پائالىيەتنى تاللاڭ</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">چاقىرىش قارا تىزىملىكى</string>
+  <string name="blacklist_edit_dialog_title">توسىۋېلىنغان تېلېفون نومۇرىنى تەھرىرلەش</string>
   <string name="blacklist_prefs">تەڭشەكلەر</string>
   <string name="blacklist_button_delete">ئۆچۈر</string>
+  <string name="blacklist_empty_text">سىزنىڭ ھېچقانداق قارا تىزىم نومۇرلىرىڭىز يوق. بىر تۈر قوشۇشتا قوش (+) توپچىنى چېكىڭ.</string>
+  <string name="blacklist_disabled_empty_text">سىزگە ئۇچۇر ياكى تېلېفون كەلگەن نومۇرنى توسماقچى بولسىڭىز، قارا تىزىملىكنى قوزغىتىڭ.</string>
   <string name="blacklist_summary_disabled">چەكلەنگەن</string>
+  <string name="blacklist_summary">سىز قارا تىزىملىكتىكى نومۇردىن تېلېفون ياكى ئۇچۇر قۇبۇل قىلالمايسىز</string>
   <string name="blacklist_notify">ئۇقتۇرۇش كۆرسەت</string>
   <string name="blacklist_private_numbers_title">شەخسىي نومۇرلار</string>
   <string name="blacklist_private_numbers_summary_disabled">شەخسىي نومۇرلاردىن كەلگەن چاقىرىشنى توسمايدۇ</string>
@@ -676,12 +818,17 @@
   <string name="blacklist_regex_summary">چېكىت . نى ئورتاق بەلگە قىلىدۇ، * دا قايتىلايدۇ. مەسىلەن: 123.*  بولسا 123 تىن باشلانغان نومۇرنى توسىدۇ، .*123.* بولسا 123 بار ھەممە نومۇرنى توسىدۇ</string>
   <string name="blacklist_policy_block_calls">چاقىرىلىشلارنى توس</string>
   <string name="blacklist_policy_block_messages">تاپشۇرۇۋالغان ئۇچۇرلارنى توس</string>
+  <string name="blacklist_bad_number_add">ئىناۋەتسىز تېلېفون نومۇرىنى قارا تىزىملىككە قوشالمىدى</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">نومۇرنى چىقىرىۋەت</string>
+  <string name="remove_blacklist_entry">بۇ نومۇرنى قارا تىزىملىكتىن چىقىرىۋېتەمسىز؟</string>
   <string name="select_contact">ئالاقەداش تاللاڭ</string>
   <!-- Sms security limit -->
   <string name="app_security_title">ئەپ بىخەتەرلىكى</string>
   <string name="sms_security_check_limit_title">قىسقا ئۇچۇر چېكى</string>
+  <string name="sms_security_check_limit_summary">ئەپلەر 30 مىنۇت ئىچىدە %d قىسقا ئۇچۇر يوللىغاندىن كېيىن ئىشلەتكۈچى جەزملىگەندىلا ئاندىن داۋاملاشتۇرالايدۇ</string>
+  <string name="sms_security_check_limit_summary_none">مۇقىملاشتۇرۇلمىغاندا ئەپنىڭ ئۇچۇر يوللىشى چەكلىنىدۇ</string>
+  <string name="sms_security_check_limit_none">يوق</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">%1$s قوشۇلدى</string>
   <string name="spam_last_blocked_title">ئاخىرىدا %1$s توسۇلدى</string>
@@ -690,7 +837,20 @@
   <string name="no_filters_title">سۈزگۈچ تەڭشىكى يوق</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">CyanogenMod سىتاتىستىكىسى</string>
+  <string name="anonymous_statistics_summary">ئاتسىز ئىشلىتىش سىتاتىستىكىڭىزنى يوللاپ CyanogenMod نىڭ تېخىمۇ ياخشىلىنىشىغا ياردەم قىلىڭ</string>
+  <string name="anonymous_statistics_warning_title">ھەققىدە</string>
+  <string name="anonymous_statistics_warning">بۇ CyanogenMod سىتاتىستىكىنى قوزغىتىپ شەخسىي ئۇچۇرلار بولمىغان سانلىق مەلۇماتنى CyanogenMod ئىجادكارلىرىغا يوللاپ، ھەر خىل ئۈسكۈنىلەردىكى ئورنىتىشلارنى خاتىرىلەشكە قولايلىق يارىتىدۇ. يوللانغان ئۇچۇردا ئالاھىدە بىر بەلگە بولۇپ شەخسىيەت ۋە شەخسىي سانلىق مەلۇماتلارغا چېتىلمايدۇ. بۇ سانلىق مەلۇماتلار ھەر قېتىم قوزغالغاندا يوللىنىدۇ.\n\nيوللانغان سانلىق مەلۇماتنىڭ ئۈلگىسى سۈپىتىدە سانلىق مەلۇماتنى ئالدىن كۆزەتنى چېكىڭ.</string>
+  <string name="enable_reporting_title">دوكلاتنى قوزغىتىش</string>
+  <string name="preview_data_title">سانلىق مەلۇماتنى ئالدىن كۆزىتىش</string>
+  <string name="view_stats_title">سىتاتىستىكىنى كۆرسىتىش</string>
+  <string name="anonymous_learn_more">تەپسىلات بىلدۈرگۈسى</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">بىردىنبىر كىملىك</string>
+  <string name="preview_device_title">ئۈسكۈنە</string>
+  <string name="preview_version_title">نەشرى</string>
+  <string name="preview_country_title">دۆلەت</string>
+  <string name="preview_carrier_title">مۇلازىمەت سودىگىرى</string>
   <string name="stats_collection_title">ئىستاتىستىكىلار</string>
   <string name="stats_collection_summary">قوزغىتىلغاندا، سانلىق مەلۇمات توپلاشقا يول قويىدۇ</string>
   <!-- Protected apps lockpattern reset button -->
@@ -700,35 +860,76 @@
   <string name="menu_hidden_apps_delete">ئەسلىگە قايتۇر</string>
   <string name="menu_hidden_apps_reset_lock">قۇلۇپ ئەندىزىسىنى ئەسلىگە قايتۇر</string>
   <string name="protected_apps">قوغدالغان ئەپلەر</string>
+  <string name="protected_apps_summary">بىخەتەر قۇلۇپ تەرىپىدىن يوشۇرۇپ قويۇلغان ئەپنى باشقۇرۇش</string>
   <string name="saving_protected_components">بۆلەك ھالىتىنى ساقلاۋاتىدۇ\u2026</string>
   <string name="pa_login_username_hint">ئىشلەتكۈچى ئاتى(تورخەت)</string>
   <string name="pa_login_password_hint">ئىم</string>
   <string name="pa_login_submit_button">تىزىمغا كىر</string>
   <string name="pa_login_checking_password">ھېساباتنى تەكشۈرۈۋاتىدۇ\u2026</string>
   <string name="pa_login_incorrect_login">تىزىمغا توغرا كىرەلمىدى</string>
+  <string name="pa_pattern_or_fingerprint_header">سىز چوقۇم رەسىم ياكى بارماقنى سىزىپ قۇلۇپ ئېچىڭ</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">تۆھپىكارلار</string>
+  <string name="contributors_cloud_loading_message">تۆھپىكارلار ئۇچۇرىنى يۈكلەۋاتىدۇ\u2026</string>
+  <string name="contributors_cloud_failed_message">تۆھپىكارنىڭ سانلىق مەلۇماتىنى ئوقۇيالمىدى</string>
+  <string name="contributor_info_menu">تۆھپىكار ئۇچۇرى</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>ئىسمى: </b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>نامى: </b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>تاپشۇرۇش: </b> <xliff:g id="commits">%3$s</xliff:g></string>
+  <string name="contributions_info_menu">تۆھپە ئۇچۇرى</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>تۆھپىلارلار سانى:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>تاپشۇرۇش سانى:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>ئەڭ ئاخىرى يېڭىلاش:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">ئاۋازلار</string>
+  <string name="notification_manager">ئۇقتۇرۇشلار</string>
   <string name="lockscreen_settings">قۇلۇپ ئېكرانى</string>
   <string name="category_lights">چىراغ</string>
   <string name="category_volume">ئاۋاز مىقدارى</string>
   <string name="category_vibrate">تىترەت</string>
   <string name="category_misc">باشقىلار</string>
+  <string name="title_general">ئادەتتىكى</string>
   <string name="advanced">ئالىي</string>
   <string name="link_volume_option_title">قوڭغۇراق ئاۋازى بىلەن ئۇقتۇرۇش ئاۋازىنى باغلايدۇ</string>
+  <string name="lcd_density_prompt_message">بەزى ئەپلەر ئۆلچەملىك بولمىغان DPI دا ئىشلىمەسلىكى مۇمكىن. \n\n بۇ تېلېفونىڭىزنى قايتا قوزغىتىدۇ.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP تېلېفون نومۇرى</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">قايتىلانغان APN</string>
+  <string name="duplicate_apn_error_message">بۇ APN مەۋجۇت. ۋاز كېچىڭ ياكى پارامېترنى ئۆزگەرتىڭ.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">چەكلەنگەن</string>
   <string name="sim_missing">يوق ياكى بۇزۇلغان</string>
+  <string name="sim_enabler_need_disable_sim">SIM كارتا قۇلۇپلىنىدۇ. داۋاملاشتۇرامسىز؟</string>
+  <string name="sim_enabler_will_disable_sim_title">دىققەت</string>
+  <string name="sim_enabler_need_switch_data_service">بۇ SIM كارتىنى ئىشلەتكىلى بولمايدۇ، ھەمدە SIM كارتا <xliff:g id="slotid">%1$s</xliff:g> نىڭ ئېقىم مۇلازىمىتى ئىشلىتىلدۇ. سىز يەنىلا داۋاملاشتۇرامسىز؟</string>
   <string name="sim_enabler_airplane_on">ئايروپىلان ھالىتى ئوچۇق بولسا بۇ مەشغۇلاتنى تاماملىيالمايدۇ.</string>
   <string name="sim_enabler_in_call">سۆزلىشىۋاتقاندا بۇ مەشغۇلاتنى تاماملىيالمايدۇ.</string>
   <string name="sim_enabler_both_inactive">ھەممە SIM كارتىنى چەكلىيەلمەيدۇ</string>
+  <string name="sim_enabler_enabling">\u2026 نى قوزغىتىۋاتىدۇ</string>
+  <string name="sim_enabler_disabling">\u2026 نى چەكلەۋاتىدۇ</string>
+  <string name="sub_activate_success">SIM كارتا قوزغىتىلدى.</string>
+  <string name="sub_activate_failed">ئاكتىپلاش مەغلۇب بولدى.</string>
+  <string name="sub_deactivate_success">SIM كارتا چەكلەندى.</string>
+  <string name="sub_deactivate_failed">ئىشلىتىشنى توختىتالمىدى.</string>
   <string name="primary_sub_select_title">كۆڭۈلدىكى 3G/LTE مۇشتەرى</string>
+  <string name="select_sim_card">SIM كارتا تاللاش</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">SIM %d ھالىتى</string>
+  <string name="sim_card_lock_settings_title">SIM %d قۇلۇپ تەڭشىكى</string>
+  <string name="sim_card_summary_empty">SIM كارتا يوق</string>
+  <string name="sim_mobile_network_settings_category_title">كۆچمە تور تەڭشىكى</string>
+  <string name="sim_mobile_network_settings_title">SIM %d تەڭشىكى</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">ئەسكەرتىش</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">پائالىيەت</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">تاللانغان كىشىدىن كەلگەن تېلېفون</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">تاللانغان ئۇچۇر</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">باش: %1$s W/kg</string>
@@ -738,21 +939,57 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">SIM كارتا %d قوڭغۇراق ئاۋازى</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">ئەپ:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">ئەڭ ئاخىر قېتىم ئىشلىتىلگىنى بۇيىچە:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">ئىشلىتىش ۋاقتى بۇيىچە:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">تاختا كومپيۇتېرىڭىزنىڭ \"<b>"ئىچىدىكى ساقلىغۇچ"</b>\" تىكى ھەممە سانلىق مەلۇماتلار ئۆچۈرۈلىدۇ، ئۇلار:\"\n\n\"<li>"Google ھېساباتىڭىز"</li>\"\n\"<li>"سىستېما ۋە ئەپلەرنىڭ سانلىق مەلۇماتى ۋە تەڭشىكى"</li>\"\n\"<li>"چۈشۈرگەن ئەپلەر"</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">تاختا كومپيۇتېرىڭىزنىڭ \"<b>"ئىچىدىكى ساقلىغۇچ"</b>\" تىكى ھەممە سانلىق مەلۇماتلار ئۆچۈرۈلىدۇ، ئۇلار:\"\n\n\"<li>"Google ھېساباتىڭىز"</li>\"\n\"<li>"سىستېما ۋە ئەپلەرنىڭ سانلىق مەلۇماتى ۋە تەڭشىكى"</li>\"\n\"<li>"چۈشۈرگەن ئەپلەر"</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">شەخسىي سانلىق مەلۇمات &amp; ئەپ</string>
+  <string name="factory_reset_instructions_summary">بۇ بۇ ئۈسكىنىدىكى بارلىق ھېسابات، ئەپ، ئەپ سانلىق مەلۇماتى ۋە سىستېما تەڭشىكىنى ئۆچۈرىدۇ</string>
+  <string name="factory_reset_personal_content">شەخسىي مەزمۇن</string>
+  <string name="factory_reset_erase_stored_content">ساقلانغان مەزمۇن ئۆچۈرىلدى</string>
+  <string name="factory_reset_erase_stored_content_summary">بۇ بۇ ئۈسكىنىدىكى مۇزىكا، رەسىم، سىن ۋە باشقا ئابونىت سانلىق مەلۇماتىنى ئۆچۈرىدۇ</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">بۇ بۇ ئۈسكىنىدىكى مۇزىكا، رەسىم، سىن ۋە باشقا ئابونىت سانلىق مەلۇماتىنى ئۆچۈرىدۇ \n\n <b>ئۈسكىنە شىفىرلانغان، مەزمۇننى قوغدىيالمايدۇ.</b></string>
+  <string name="factory_reset_erase_sd_card">SD كارتىنى فورماتلاش</string>
+  <string name="factory_reset_erase_sd_card_summary">بۇ SD كارتىدىكى مۇزىكا، رەسىم ۋە بارلىق سانلىق مەلۇماتىنى ئۆچۈرىدۇ</string>
+  <string name="factory_reset_warning_text_reset_now">دەرھال قايتا بېكىتىش</string>
+  <string name="factory_reset_warning_text_message">سىزنىڭ بارلىق ئابونت، ئەپ، ئەپ سانلىق مەلۇماتى ۋە سىستېما تەڭشىكى ئۆچۈرۈلىدۇ. بۇ مەشخۇلاتنى كەينىگە قايتۇرغىلى بولمايدۇ.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">باشقا</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi قىزىق نوقتىسى ۋاقتى ئېشىپ كەتتى</string>
+  <string name="hotstpot_inactivity_timeout_never">ھەرگىز</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 مىنۇت</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 مىنۇت</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 مىنۇت</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">كۆچمە Wi\u2011Fi ھەر زامان ۋاقىت ئېشىمى يوق</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">كۆچمە Wi\u2011Fi قىزىق نوقتىسى <xliff:g id="timeout">%1$s</xliff:g> تىن كىيىن ۋاقىت ھالقىپ كېتىدۇ</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ھەرىكەتچان قۇلۇپ</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">ھەرىكەتچان قۇلۇپنى قوزغىتىش ۋە سەپلەش</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">تەڭشەكلەر</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ئىشلەتكىلى بۇلدىغان قۇلۇپنى كۆرۈش ئۈچۈن، ئاۋۋال ھەرىكەتچان قۇلۇپنى قوزغىتىڭ.</string>
   <string name="interruptions_ignore_while_media_title">ئاۋاز چەتنەشنى  توس</string>
   <string name="interruptions_ignore_while_media_summary">ئۇقتۇرۇش كەلگەندە، ۋاسىتە ئاۋازىنى تۆۋەنلەتمەيدۇ</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod قانۇن ئۇچۇرى</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">ستاتىستىكىلىق سانلىق مەلۇماتنى قايتا بېكىتىش</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">باتارىيە ئىشلىتىش سانلىق مەلۇماتىنى ھازىر قايتا بېكىتىدۇ</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">تەگلىك باتارىيە يوق</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">تەگلىك ئۆزگىرىشچان توك ئارقىلىق توكلاۋاتىدۇ</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">تەگلىك USB ئارقىلىق توكلاۋاتىدۇ</string>
 </resources>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index ade6bc0..1fbc576 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -1941,6 +1941,7 @@
   <string name="call_settings_title">چاقىرىش تەڭشىكى</string>
   <!-- Main settings screen, Call settings summary for item to go into call settings -->
   <string name="call_settings_summary">ئۈنخەت، كەلگەن تېلېفوننى ئۇلاپ يەتكۈزۈش، چاقىرىشنى كۈتۈش، چاقىرغۇچى كىملىك تەڭشىكى</string>
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
   <!-- Tethering controls, item title to go into the tethering settings -->
   <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
   <string name="tether_settings_title_usb">USB ھەمبەھىر</string>
@@ -2274,6 +2275,7 @@
   <string name="ask_compatibility">قوزغالغاندا سورا</string>
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <string name="enable_compatibility">ئەپ ئۆلچەك</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
   <string name="unknown">يوچۇن</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
@@ -2445,6 +2447,7 @@
   <string name="memory">RAM</string>
   <!-- Text to label a process entry with the process name. -->
   <string name="service_process_name"><xliff:g id="process">%1$s</xliff:g></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <string name="running_process_item_user_label">ئىشلەتكۈچى: <xliff:g id="USER_NAME">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
@@ -3132,6 +3135,7 @@
   <string name="menu_stats_total">ئومۇمى ئىشلىتىش مىقدارى</string>
   <!-- Menu label for refreshing with latest usage numbers -->
   <string name="menu_stats_refresh">يېڭىلا</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <string name="process_kernel_label">Android OS</string>
   <!-- Label for mediaserver process in battery usage -->
@@ -3926,8 +3930,10 @@
   <string name="data_usage_sweep_warning"><font size="21">\"<xliff:g id="NUMBER">^1</xliff:g>"</font>\" \"<font size="9">\"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">\"ئاگاھلاندۇرۇش\"</font></string>
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
   <string name="data_usage_sweep_limit"><font size="21">\"<xliff:g id="NUMBER">^1</xliff:g>"</font>\" \"<font size="9">\"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">\"چەكلىمە\"</font></string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps">چىقىرىۋېتىلگەن ئەپلەر</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
   <string name="data_usage_uninstalled_apps_users">چىقىرىۋەتكەن ئەپ ۋە ئىشلەتكۈچىلەر</string>
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
@@ -4145,6 +4151,7 @@
   <string name="user_delete_user_description">ئىشلەتكۈچى ئۆچۈر</string>
   <!-- Delete button text [CHAR LIMIT=25] -->
   <string name="user_delete_button">ئۆچۈر</string>
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
@@ -4507,6 +4514,7 @@
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
   <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for a work profile. [CHAR LIMIT=25] -->
   <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
   <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
@@ -4759,4 +4767,7 @@
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 491546f..3c88c5a 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -918,4 +918,14 @@
   <string name="interruptions_ignore_while_media_summary">Не приглушувати відтворення медіа при надходженні сповіщення</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Політика конфіденційності CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Скинути статистику</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Історія і статистика акумулятора будуть скинуті</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Акумулятор док-станції відсутній</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Заряджаємось від блока живлення док-станції</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Заряджаємось від док-станції по USB</string>
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 0efc994..545c62b 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -47,6 +47,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Tên thiết bị</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">Cấp độ API CyanogenMod</string>
   <string name="mod_api_level_default">Không rõ</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Ngày dựng</string>
@@ -103,6 +104,7 @@
   <string name="rename_dialog_hint">Nhập tên cấu hình</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Đặt lại</string>
+  <string name="profile_reset_message">Xóa mọi cấu hình và nhóm ứng dụng do người dùng tạo và khôi phục về mặc định?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Xoá ứng dụng này?</string>
   <!-- Profile network mode -->
@@ -250,9 +252,13 @@
   <string name="notification_light_missed_call_title">Cuộc gọi nhỡ</string>
   <string name="notification_light_voicemail_title">Hộp thư thoại</string>
   <string name="notification_light_screen_on">Đèn màn hình bật</string>
+  <string name="notification_light_zen_mode">Chiếu sáng trong chế độ Không Làm Phiền</string>
   <string name="notification_light_use_multiple_leds">Đa LED</string>
   <string name="keywords_lights_brightness_level">độ sáng đèn led mờ</string>
+  <string name="notification_light_automagic">Tự chọn màu</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Cài đặt đèn</string>
+  <string name="led_notification_text">Đèn LED được kích hoạt theo cài đặt</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Gỡ lỗi Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -284,6 +290,8 @@
   <string name="app_ops_summaries_modify_call_log">sửa nhật ký cuộc gọi</string>
   <string name="app_ops_summaries_read_calendar">đọc lịch</string>
   <string name="app_ops_summaries_modify_calendar">sửa đổi lịch</string>
+  <string name="app_ops_summaries_wifi_scan">Quét WiFi</string>
+  <string name="app_ops_summaries_notification">thông báo/thông báo nhanh</string>
   <string name="app_ops_summaries_cell_scan">quét sóng di động</string>
   <string name="app_ops_summaries_call_phone">gọi điện thoại</string>
   <string name="app_ops_summaries_read_sms">đọc tin nhắn SMS</string>
@@ -311,15 +319,39 @@
   <string name="app_ops_summaries_media_volume">âm lượng phương tiện</string>
   <string name="app_ops_summaries_alarm_volume">âm lượng báo thức</string>
   <string name="app_ops_summaries_notification_volume">âm lượng thông báo</string>
+  <string name="app_ops_summaries_bluetooth_volume">âm lượng bluetooth</string>
   <string name="app_ops_summaries_keep_awake">giữ màn hình sáng</string>
   <string name="app_ops_summaries_monitor_location">vị trí màn hình</string>
   <string name="app_ops_summaries_monitor_high_power_location">vị trí năng suất cao của màn hình</string>
+  <string name="app_ops_summaries_get_usage_stats">lấy thống kê sử dụng</string>
   <string name="app_ops_summaries_mute_unmute_microphone">tắt/bật tiếng micro</string>
   <string name="app_ops_summaries_toast_window">hiển thị thông báo nhanh</string>
   <string name="app_ops_summaries_project_media">chiếu đa phương tiện</string>
   <string name="app_ops_summaries_activate_vpn">kích hoạt VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">ghi hình nền</string>
+  <string name="app_ops_summaries_assist_structure">hỗ trợ cấu trúc</string>
+  <string name="app_ops_summaries_assist_screenshot">hỗ trợ chụp màn hình</string>
+  <string name="app_ops_summaries_read_phone_state">đọc tình trạng điện thoại</string>
+  <string name="app_ops_summaries_add_voicemail">thêm thư thoại</string>
+  <string name="app_ops_summaries_use_sip">dùng SIP</string>
+  <string name="app_ops_summaries_make_call">thực hiện cuộc gọi</string>
+  <string name="app_ops_summaries_use_fingerprint">dùng vân tay</string>
+  <string name="app_ops_summaries_use_body_sensors">dùng cảm biến cơ thể</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">đọc tin nhắn quảng bá</string>
+  <string name="app_ops_summaries_mock_location">giả vị trí</string>
+  <string name="app_ops_summaries_read_external_storage">đọc bộ nhớ ngoài</string>
+  <string name="app_ops_summaries_write_external_storage">ghi vào bộ nhớ ngoài</string>
+  <string name="app_ops_summaries_turn_screen_on">bật màn hình</string>
+  <string name="app_ops_summaries_get_accounts">lấy thông tin tài khoản</string>
+  <string name="app_ops_summaries_toggle_wifi">bật/tắt Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">bật/tắt bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">bắt đầu lúc khởi động</string>
+  <string name="app_ops_summaries_toggle_nfc">bật/tắt NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">bật/tắt dữ liệu di động</string>
   <string name="app_ops_summaries_superuser">truy cập root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Vị trí tương đối</string>
+  <string name="app_ops_labels_fine_location">Vị trí chính xác</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Rung</string>
   <string name="app_ops_labels_read_contacts">Đọc số liên lạc</string>
@@ -328,11 +360,19 @@
   <string name="app_ops_labels_modify_call_log">Sửa đổi nhật ký cuộc gọi</string>
   <string name="app_ops_labels_read_calendar">Đọc lịch</string>
   <string name="app_ops_labels_modify_calendar">Sửa đổi lịch</string>
+  <string name="app_ops_labels_wifi_scan">Quét Wi-Fi</string>
   <string name="app_ops_labels_notification">Thông báo/Thông báo nhanh</string>
+  <string name="app_ops_labels_cell_scan">Quét sóng di động</string>
   <string name="app_ops_labels_call_phone">Gọi điện thoại</string>
+  <string name="app_ops_labels_read_sms">Đọc SMS</string>
+  <string name="app_ops_labels_write_sms">Viết SMS</string>
   <string name="app_ops_labels_receive_sms">Nhận tin nhắn SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Nhận SMS khẩn cấp</string>
   <string name="app_ops_labels_receive_mms">Nhận tin nhắn MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Nhận tin nhắn đẩy WAP</string>
   <string name="app_ops_labels_send_sms">Gửi tin nhắn SMS</string>
+  <string name="app_ops_labels_read_icc_sms">Đọc SMS ICC</string>
+  <string name="app_ops_labels_write_icc_sms">Viết SMS ICC</string>
   <string name="app_ops_labels_modify_settings">Sửa đổi cài đặt</string>
   <string name="app_ops_labels_draw_on_top">Vẽ trên cùng</string>
   <string name="app_ops_labels_access_notifications">Truy cập thông báo</string>
@@ -351,10 +391,33 @@
   <string name="app_ops_labels_notification_volume">Âm lượng thông báo</string>
   <string name="app_ops_labels_bluetooth_volume">Âm lượng bluetooth</string>
   <string name="app_ops_labels_keep_awake">Giữ màn hình sáng</string>
+  <string name="app_ops_labels_monitor_location">Giám sát vị trí</string>
+  <string name="app_ops_labels_monitor_high_power_location">Giám sát vị trí năng lượng cao</string>
+  <string name="app_ops_labels_get_usage_stats">Lấy thống kê sử dụng</string>
   <string name="app_ops_labels_mute_unmute_microphone">Tắt/bật tiếng micro</string>
   <string name="app_ops_labels_toast_window">Hiển thị thông báo nhanh</string>
   <string name="app_ops_labels_project_media">Chiếu đa phương tiện</string>
   <string name="app_ops_labels_activate_vpn">Kích hoạt VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Ghi hình nền</string>
+  <string name="app_ops_labels_assist_structure">Hỗ trợ cấu trúc</string>
+  <string name="app_ops_labels_assist_screenshot">Hỗ trợ chụp màn hình</string>
+  <string name="app_ops_labels_read_phone_state">Đọc tình trạng điện thoại</string>
+  <string name="app_ops_labels_add_voicemail">Thêm thư thoại</string>
+  <string name="app_ops_labels_use_sip">Dùng SIP</string>
+  <string name="app_ops_labels_make_call">Thực hiện cuộc gọi</string>
+  <string name="app_ops_labels_use_fingerprint">Dùng vân tay</string>
+  <string name="app_ops_labels_use_body_sensors">Dùng cảm biến cơ thể</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Đọc tin nhắn quảng bá</string>
+  <string name="app_ops_labels_mock_location">Giả vị trí</string>
+  <string name="app_ops_labels_read_external_storage">Đọc bộ nhớ ngoài</string>
+  <string name="app_ops_labels_write_external_storage">Ghi vào bộ nhớ ngoài</string>
+  <string name="app_ops_labels_turn_screen_on">Bật màn hình</string>
+  <string name="app_ops_labels_get_accounts">Lấy thông tin tài khoản</string>
+  <string name="app_ops_labels_toggle_wifi">Bật/tắt WiFi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bật/tắt bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Bắt đầu lúc khởi động</string>
+  <string name="app_ops_labels_toggle_nfc">Bật/tắt NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Bật/tắt dữ liệu di động</string>
   <string name="app_ops_labels_superuser">Quyền truy cập root</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Được cho phép</string>
@@ -534,8 +597,13 @@
   <string name="live_display_color_profile_dynamic_title">Động</string>
   <string name="live_display_color_profile_dynamic_summary">Màu sắc được tăng cường và trắng sáng</string>
   <string name="live_display_color_profile_cinema_title">Rạp chiếu phim</string>
+  <string name="live_display_color_profile_cinema_summary">Tái tạo màu sắc hoàn hảo cho video</string>
   <string name="live_display_color_profile_astronomy_title">Thiên văn học</string>
   <string name="live_display_color_profile_astronomy_summary">Đỏ sâu để duy trì tầm nhìn ban đêm</string>
+  <string name="live_display_color_profile_photography_title">Nhiếp ảnh</string>
+  <string name="live_display_color_profile_photography_summary">Tái tạo màu sắc hoàn hảo cho hình ảnh</string>
+  <string name="live_display_color_profile_basic_title">Cơ bản</string>
+  <string name="live_display_color_profile_basic_summary">Dùng màn hình không hiệu chỉnh</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Biểu tượng trình chọn</string>
   <string name="ime_switcher_notify_summary">Hiển thị biểu tượng trình chọn phương thức nhập liệu</string>
@@ -644,6 +712,8 @@
   <string name="status_bar_battery_percentage_text_inside">Nằm trong biểu tượng pin</string>
   <string name="status_bar_battery_percentage_text_next">Kế bên biểu tượng pin</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Biểu tượng thanh trạng thái</string>
+  <string name="status_bar_icons_summary">Kiểm soát những biểu tượng thanh trang thái được hiển thị</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Chặn tín hiệu cử chỉ</string>
   <string name="edge_gesture_service_summary">Không gửi những tín hiệu cử chỉ từ thanh điều hướng và thanh thông báo đến ứng dụng</string>
@@ -680,6 +750,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Hiển thị trình trực quan âm nhạc</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Đã bị vô hiệu hóa bởi ô cài đặt nhanh</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Chạm để kích hoạt màn hình khoá</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Đã kích hoạt màn hình khoá!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Mức tiết kiệm pin</string>
   <string name="battery_saver_summary">Làm giảm hiệu năng và hạn chế dữ liệu nền</string>
@@ -689,6 +762,7 @@
   <string name="autoperf_summary">Tự động chọn chế độ pin thích hợp cho các ứng dụng khác nhau</string>
   <string name="perf_profile_title">Chế độ pin</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Ứng dụng được khởi động cùng hệ thống</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Nhạc chuông thông báo</string>
   <!-- Advanced reboot options -->
@@ -717,6 +791,7 @@
   <string name="voice_wakeup_retrain_title">Thu âm lại giọng nói của bạn</string>
   <string name="voice_wakeup_activity_title">Luôn bật khi khởi động</string>
   <string name="voice_wakeup_default_activity">Google Ngay bây giờ</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Đánh thức bằng giọng nói cần phải có quyền truy cập cuộc gọi để chọn số liên lạc Quay số trực tiếp.</string>
   <string name="picker_activities">Các hoạt động</string>
   <string name="select_custom_app_title">Chọn ứng dụng tùy chỉnh</string>
   <string name="select_custom_activity_title">Chọn hoạt động tùy chỉnh</string>
@@ -785,17 +860,23 @@
   <string name="menu_hidden_apps_delete">Đặt lại</string>
   <string name="menu_hidden_apps_reset_lock">Đặt lại mẫu hình mở khóa</string>
   <string name="protected_apps">Các ứng dụng được bảo vệ</string>
+  <string name="protected_apps_summary">Quản lý các ứng dụng được ẩn sau khoá an toàn</string>
   <string name="saving_protected_components">Đang lưu trạng thái thành phần\u2026</string>
   <string name="pa_login_username_hint">Tên người dùng (email)</string>
   <string name="pa_login_password_hint">Mật khẩu</string>
   <string name="pa_login_submit_button">Đăng nhập</string>
   <string name="pa_login_checking_password">Đang kiểm tra tài khoản\u2026</string>
   <string name="pa_login_incorrect_login">Thông tin đăng nhập không chính xác</string>
+  <string name="pa_pattern_or_fingerprint_header">Phải vẽ hình hoặc dùng vân tay để mở khoá</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Những người đóng góp</string>
   <string name="contributors_cloud_loading_message">Đang tải dữ liệu của người đóng góp\u2026</string>
   <string name="contributors_cloud_failed_message">Không thể tải dữ liệu của người đóng góp</string>
   <string name="contributor_info_menu">Thông tin người đóng góp</string>
+  <string name="contributor_info_msg">
+<![CDATA[<b>Tên:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+<b>Biệt danh:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+<b>Cam kết:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">Thông tin đóng góp</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>Tổng số người đóng góp:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -811,24 +892,44 @@
   <string name="title_general">Tổng quát</string>
   <string name="advanced">Nâng cao</string>
   <string name="link_volume_option_title">Liên kết âm lượng nhạc chuông &amp; thông báo</string>
+  <string name="lcd_density_prompt_message">Một số ứng dụng có thể không hoạt động với DPI không đúng chuẩn.\n\nViệc này sẽ khởi động lại thiết bị của bạn.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Số điện thoại APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Trùng tên APN</string>
+  <string name="duplicate_apn_error_message">APN này đã tồn tại. Huỷ bỏ hoặc thay đổi thông số.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> là <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">đã tắt</string>
   <string name="sim_missing">thiếu hoặc bị lỗi</string>
+  <string name="sim_enabler_need_disable_sim">Thẻ SIM sẽ bị huỷ kích hoạt. Bạn có muốn tiếp tục?</string>
+  <string name="sim_enabler_will_disable_sim_title">Chú ý</string>
+  <string name="sim_enabler_need_switch_data_service">SIM này sẽ bị vô hiệu và SIM <xliff:g id="slotid">%1$s</xliff:g> sẽ được dùng cho dịch vụ dữ liệu. Bạn có chắc muốn tiếp tục?</string>
   <string name="sim_enabler_airplane_on">Không thể thực hiện thao tác trong khi đang ở chế độ máy bay.</string>
   <string name="sim_enabler_in_call">Không thể thực hiện thao tác trong khi đang gọi.</string>
   <string name="sim_enabler_both_inactive">Không thể vô hiệu hóa tất cả các thẻ SIM</string>
+  <string name="sim_enabler_enabling">Đang kích hoạt\u2026</string>
+  <string name="sim_enabler_disabling">Đang huỷ kích hoạt\u2026</string>
+  <string name="sub_activate_success">Đã kích hoạt SIM.</string>
+  <string name="sub_activate_failed">Kích hoạt thất bại.</string>
+  <string name="sub_deactivate_success">Đã huỷ kích hoạt SIM.</string>
+  <string name="sub_deactivate_failed">Huỷ kích hoạt thất bại.</string>
   <string name="primary_sub_select_title">Đăng ký 3G/LTE mặc định</string>
+  <string name="select_sim_card">Chọn thẻ SIM</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Trạng thái %d của SIM</string>
   <string name="sim_card_lock_settings_title">Cài đặt khóa %d của SIM</string>
   <string name="sim_card_summary_empty">SIM không được lắp</string>
+  <string name="sim_mobile_network_settings_category_title">Cài đặt mạng di động</string>
   <string name="sim_mobile_network_settings_title">Cài đặt %d SIM</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">lời nhắc</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">sự kiện</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">người gọi đã chọn</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">tin nhắn đã chọn</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Đầu: %1$s W/kg</string>
@@ -838,8 +939,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Nhạc chuông SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Ứng dụng:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Lần sử dụng gần nhất:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Thời gian sử dụng:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Thao tác này sẽ xóa tất cả dữ liệu từ <b>bộ lưu trữ bên trong</b> của máy tính bảng của bạn, bao gồm:\n\n<li>Tài khoản thiết bị của bạn</li>\n<li>Dữ liệu của hệ thống và ứng dụng và cài đặt</li>\n<li>Các ứng dụng đã tải xuống</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -856,16 +960,36 @@
   <string name="factory_reset_warning_text_reset_now">THIẾT LẬP LẠI NGAY BÂY GIỜ</string>
   <string name="factory_reset_warning_text_message">Tất cả các tài khoản, ứng dụng, dữ liệu ứng dụng và cài đặt hệ thống của bạn sẽ bị xóa khỏi thiết bị này. Thao tác này không thể hoàn lại.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Khác</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Thời gian chờ điểm truy cập Wi\u2011Fi</string>
   <string name="hotstpot_inactivity_timeout_never">Không bao giờ</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 phút</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 phút</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 phút</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Không hết thời gian chờ điểm truy cập Wi\u2011Fi di động</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Điểm truy cập Wi\u2011Fi di động sẽ hết thời gian chờ sau <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Màn hình khoá động</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Kích hoạt và cấu hình Màn hình khoá động</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Cài đặt</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Để xem Màn hình khoá động khả dụng hãy bật Màn hình khoá động.</string>
   <string name="interruptions_ignore_while_media_title">Ngăn chặn giảm âm thanh</string>
   <string name="interruptions_ignore_while_media_summary">Không làm giảm âm lượng phát lại media khi một thông báo đến</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Bộ phận pháp chế của CyanogenMod</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Thiết lập lại thống kê</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Thống kê lịch sử pin đang được thiết lập lại</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Không có pin ở đế sạc</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Đang sạc trên AC của đế</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Đang sạc qua USB của đế</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index c3b7466..5048f82 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -980,4 +980,14 @@
   <string name="interruptions_ignore_while_media_summary">当通知到达时，不要降低媒体播放音量</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod 法律信息</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">重置统计数据</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">即将重置电池使用数据</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">基座电池不存在</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">正在通过基座交流电充电</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">正在通过基座 USB 充电</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 4a2c3a0..7442d01 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -810,4 +810,14 @@
   <string name="interruptions_ignore_while_media_title">阻止音訊閃避</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod 法律條款</string>
+  <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">重設統計</string>
+  <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">將會重設電池記錄數據</string>
+  <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">座架電池不存在</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">正在 AC 插口上充電</string>
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 2d92b02..14fef8c 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -852,4 +852,9 @@
   <string name="interruptions_ignore_while_media_summary">有通知時，不減少媒體播放的音量</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod 法律條款</string>
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 5fd19c8..7e21bf5 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -174,4 +174,9 @@
   <!-- Live lock screen settings content description -->
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
 </resources>
-- 
cgit v1.1


From bd8d39c5d5c6a639a4617223496cbac14f44be9c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sat, 12 Mar 2016 21:06:23 +0200
Subject: Improve protected apps string

Change-Id: I3704910d99b5d93bc2f423229da72558d9fe6fb9
---
 res/values/cm_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8b34535..1328144 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1000,7 +1000,7 @@
     <string name="menu_hidden_apps_delete">Reset</string>
     <string name="menu_hidden_apps_reset_lock">Reset pattern lock</string>
     <string name="protected_apps">Protected apps</string>
-    <string name="protected_apps_summary">Manage which applications are hidden behind a secure lock</string>
+    <string name="protected_apps_summary">Manage which apps are hidden behind a secure lock</string>
     <string name="saving_protected_components">Saving component state\u2026</string>
 
     <string name="pa_login_username_hint">Username (email)</string>
-- 
cgit v1.1


From ef612a67b19d78a9e358a59b3e23dae1f42eaa61 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sun, 13 Mar 2016 18:29:01 +0200
Subject: Settings: Update contributors cloud DB

Change-Id: I2732f74c7271638f02791b26f2fd476b3d6e3440
---
 assets/contributors.db | Bin 265216 -> 276480 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 assets/contributors.db

diff --git a/assets/contributors.db b/assets/contributors.db
old mode 100755
new mode 100644
index 2d75c7c..0bda60d
Binary files a/assets/contributors.db and b/assets/contributors.db differ
-- 
cgit v1.1


From 5ec1a5fa5beb30ff22e48b25ffc96364829ddb78 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 16 Mar 2016 16:18:55 +0100
Subject: Move external input tile inclusion to device repo.

Change-Id: I1afa10da1b9e0cc35c5198d1cbd5c13e2b4c343d
---
 res/drawable/ic_settings_gestures.xml          | 32 ----------------
 res/drawable/ic_settings_oclick.xml            | 53 --------------------------
 res/xml/dashboard_categories.xml               | 21 +---------
 src/com/android/settings/SettingsActivity.java |  4 +-
 4 files changed, 2 insertions(+), 108 deletions(-)
 delete mode 100644 res/drawable/ic_settings_gestures.xml
 delete mode 100644 res/drawable/ic_settings_oclick.xml

diff --git a/res/drawable/ic_settings_gestures.xml b/res/drawable/ic_settings_gestures.xml
deleted file mode 100644
index 9e3992a..0000000
--- a/res/drawable/ic_settings_gestures.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015 The CyanogenMod Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-
-    <path
-            android:fillColor="?android:attr/colorAccent"
-            android:pathData="M4.7,6.9c0.7-0.7,1.4-1.4,1.7-1.2c0.5,0.2,0,1-0.3,1.5c-0.2,0.4-2.8,3.9-2.8,6.3c0,1.3,0.5,2.3,1.3,3
-c0.7,0.6,1.7,0.7,2.6,0.5c1.1-0.3,1.9-1.4,3-2.8c1.2-1.5,2.8-3.4,4-3.4c1.6,0,1.6,1,1.7,1.8c-3.7,0.6-5.3,3.7-5.3,5.4
-s1.4,3.1,3.2,3.1c1.6,0,4.3-1.3,4.6-6.1H21v-2.5h-2.4c-0.1-1.7-1.1-4.2-4-4.2c-2.2,0-4.1,1.9-4.9,2.8c-0.6,0.7-2,2.5-2.3,2.7
-c-0.2,0.3-0.7,0.8-1.1,0.8c-0.4,0-0.7-0.8-0.4-1.9c0.3-1.1,1.4-2.9,1.8-3.5C8.5,8,9.1,7.2,9.1,5.9C9.1,3.7,7.4,3,6.6,3
-C5.3,3,4.1,4,3.9,4.3C3.5,4.6,3.2,4.9,3,5.2L4.7,6.9z
-M13.9,18.6c-0.3,0-0.7-0.3-0.7-0.7c0-0.6,0.7-2.2,2.8-2.8
-C15.8,17.8,14.6,18.6,13.9,18.6z" />
-</vector>
diff --git a/res/drawable/ic_settings_oclick.xml b/res/drawable/ic_settings_oclick.xml
deleted file mode 100644
index cdbf153..0000000
--- a/res/drawable/ic_settings_oclick.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="?android:attr/colorAccent"
-        android:pathData="M13.776,22.844c0.142-0.023,0.287-0.037,0.427-0.065c0.273-0.056,0.538-0.13,0.803-0.205
-c0.08-0.023,0.163-0.038,0.243-0.062c0.316-0.097,0.624-0.212,0.927-0.337c0.024-0.01,0.05-0.017,0.075-0.027
-C20.215,20.484,23,16.568,23,12c0-3.062-1.253-5.83-3.272-7.824l0,0c-0.003-0.003-0.006-0.005-0.008-0.007
-c-0.743-0.733-1.588-1.361-2.515-1.86c-0.008-0.004-0.016-0.007-0.024-0.011c-0.302-0.162-0.611-0.311-0.929-0.444
-c-0.043-0.018-0.088-0.03-0.13-0.048c-0.286-0.116-0.574-0.225-0.871-0.317c-0.097-0.03-0.199-0.049-0.298-0.077
-c-0.247-0.069-0.494-0.139-0.748-0.191c-0.178-0.036-0.362-0.055-0.543-0.083c-0.181-0.027-0.359-0.064-0.542-0.082
-C12.751,1.019,12.378,1,12,1s-0.751,0.019-1.119,0.056c-0.184,0.019-0.362,0.055-0.542,0.082c-0.181,0.028-0.365,0.047-0.543,0.083
-C9.541,1.273,9.295,1.344,9.047,1.413C8.949,1.44,8.847,1.459,8.75,1.489c-0.309,0.096-0.61,0.208-0.906,0.33
-C7.813,1.831,7.78,1.84,7.749,1.853c-0.325,0.136-0.642,0.288-0.95,0.454C6.798,2.308,6.797,2.308,6.796,2.309
-C5.869,2.808,5.022,3.437,4.279,4.17C4.277,4.172,4.274,4.174,4.272,4.176l0,0C2.253,6.17,1,8.938,1,12
-c0,4.568,2.785,8.485,6.75,10.147c0.02,0.009,0.042,0.014,0.063,0.023c0.307,0.126,0.619,0.242,0.939,0.341
-c0.066,0.02,0.135,0.033,0.201,0.052c0.279,0.08,0.558,0.158,0.846,0.216c0.124,0.025,0.252,0.037,0.377,0.057
-c0.235,0.039,0.468,0.083,0.708,0.107c0.292,0.029,0.59,0.039,0.888,0.045C11.847,22.99,11.922,23,12,23s0.153-0.01,0.23-0.012
-c0.298-0.006,0.596-0.015,0.888-0.045C13.341,22.921,13.557,22.879,13.776,22.844z
-M12,4.732c0.334,0,0.606,0.271,0.606,0.606
-S12.334,5.943,12,5.943s-0.606-0.271-0.606-0.606S11.666,4.732,12,4.732z
-M11.394,3.517c0-0.334,0.271-0.606,0.606-0.606
-s0.606,0.271,0.606,0.606S12.334,4.122,12,4.122S11.394,3.851,11.394,3.517z
-M12,6.553c0.334,0,0.606,0.271,0.606,0.606
-S12.334,7.764,12,7.764s-0.606-0.271-0.606-0.606S11.666,6.553,12,6.553z
-M12,8.373c0.334,0,0.606,0.271,0.606,0.606
-c0,0.334-0.271,0.606-0.606,0.606s-0.606-0.271-0.606-0.606S11.666,8.373,12,8.373z
-M12,10.789c0.669,0,1.211,0.542,1.211,1.211
-c0,0.669-0.542,1.211-1.211,1.211c-0.669,0-1.211-0.542-1.211-1.211C10.789,11.331,11.331,10.789,12,10.789z
-M21.789,12
-c0,2.256-0.774,4.329-2.061,5.987V6.013C21.015,7.671,21.789,9.744,21.789,12z
-M2.211,12c0-2.256,0.774-4.329,2.061-5.987v11.973
-C2.985,16.329,2.211,14.256,2.211,12z" />
-</vector>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index dc1effb..56b3b8e 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -152,26 +152,7 @@
                 android:icon="@drawable/ic_settings_buttons"
                 />
 
-        <!-- O-Click -->
-        <dashboard-tile
-                android:id="@+id/oclick"
-                android:icon="@drawable/ic_settings_oclick">
-            <intent
-                    android:action="com.cyanogenmod.action.LAUNCH_BLUETOOTH_INPUT_SETTINGS"
-                    android:targetPackage="com.cyanogenmod.settings.device"
-                    android:targetClass="com.cyanogenmod.settings.device.BluetoothInputSettings" />
-        </dashboard-tile>
-
-        <!-- Gestures -->
-        <dashboard-tile
-                android:id="@+id/device_specific_gesture_settings"
-                android:title="@string/gesture_settings_title"
-                android:icon="@drawable/ic_settings_gestures">
-            <intent
-                    android:action="com.cyanogenmod.action.LAUNCH_TOUCHSCREEN_GESTURE_SETTINGS"
-                    android:targetPackage="com.cyanogenmod.settings.device"
-                    android:targetClass="com.cyanogenmod.settings.device.TouchscreenGestureSettings" />
-        </dashboard-tile>
+        <external-tiles />
 
         <!-- Battery -->
         <dashboard-tile
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index bf3dc84..f837878 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1262,9 +1262,7 @@ public class SettingsActivity extends Activity
                 DashboardTile tile = category.getTile(n);
                 boolean removeTile = false;
                 id = (int) tile.id;
-                if (id == R.id.operator_settings || id == R.id.manufacturer_settings
-                        || id == R.id.device_specific_gesture_settings
-                        || id == R.id.oclick) {
+                if (id == R.id.operator_settings || id == R.id.manufacturer_settings) {
                     if (!Utils.updateTileToSpecificActivityFromMetaDataOrRemove(this, tile)) {
                         removeTile = true;
                     }
-- 
cgit v1.1


From f5dea70443a1c0643be50cf8058ddbfff477712f Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Thu, 14 May 2015 17:29:59 -0700
Subject: Settings: fix BT switch enabling discoverable mode

Signed-off-by: Roman Birg <roman@cyngn.com>

Conflicts:
	src/com/android/settings/bluetooth/BluetoothEnabler.java

Bug: CYNGNOS-2271
Change-Id: I6b2dff88fb858d34a1b534705b2c67f5ab4c2d29
---
 src/com/android/settings/bluetooth/BluetoothEnabler.java  | 1 -
 src/com/android/settings/bluetooth/BluetoothSettings.java | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothEnabler.java b/src/com/android/settings/bluetooth/BluetoothEnabler.java
index 7d6bebe..b6399b0 100644
--- a/src/com/android/settings/bluetooth/BluetoothEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothEnabler.java
@@ -137,7 +137,6 @@ public final class BluetoothEnabler extends GenericSwitchToggle {
                 setChecked(true);
                 setEnabled(true);
                 updateSearchIndex(true);
-                mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
                 break;
             case BluetoothAdapter.STATE_TURNING_OFF:
                 setEnabled(false);
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index d08cb34..0f0952e 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -227,6 +227,10 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
         if (mBluetoothEnabler != null) {
             mBluetoothEnabler.resume(getActivity());
         }
+        if (mLocalAdapter != null) {
+            // enable page and inquiry scan
+            mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+        }
         super.onResume();
 
         mInitiateDiscoverable = true;
-- 
cgit v1.1


From a3549a2715e47ce07297315586ea9c5798da2997 Mon Sep 17 00:00:00 2001
From: Danesh M <daneshm90@gmail.com>
Date: Mon, 7 Mar 2016 15:17:59 -0800
Subject: Settings : Add per app internet/data control

CYAN-3976
CRACKLING-834

Change-Id: I13192df837c057b5cadde8f31532e12daaf3c1b0
---
 res/layout/app_ops_details_item.xml                | 81 ++++++++++------------
 res/layout/preference_category_material.xml        | 27 ++++++++
 res/values/cm_strings.xml                          |  6 ++
 .../settings/applications/AppOpsDetails.java       | 54 ++++++++++++++-
 .../settings/privacyguard/AppInfoLoader.java       |  3 +
 .../settings/privacyguard/PrivacyGuardManager.java | 20 ++++++
 6 files changed, 143 insertions(+), 48 deletions(-)
 create mode 100644 res/layout/preference_category_material.xml

diff --git a/res/layout/app_ops_details_item.xml b/res/layout/app_ops_details_item.xml
index eb206ae..beb04f3 100644
--- a/res/layout/app_ops_details_item.xml
+++ b/res/layout/app_ops_details_item.xml
@@ -17,68 +17,62 @@
 */
 -->
 
-<GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
     android:paddingTop="8dip"
-    android:paddingBottom="8dip"
-    android:columnCount="3">
+    android:paddingBottom="8dip">
 
     <ImageView
         android:id="@+id/op_icon"
         android:layout_width="@android:dimen/app_icon_size"
         android:layout_height="@android:dimen/app_icon_size"
-        android:layout_column="0"
-        android:layout_row="0"
-        android:layout_rowSpan="2"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
         android:contentDescription="@null" />
 
-    <TextView
-        android:id="@+id/op_name"
-        android:layout_column="1"
-        android:layout_row="0"
-        android:layout_columnSpan="2"
-        android:layout_gravity="fill_horizontal"
-        android:layout_marginTop="2dip"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textAlignment="viewStart" />
-
-    <TextView
-        android:id="@+id/op_time"
-        android:layout_column="1"
-        android:layout_row="1"
+    <LinearLayout
+        android:orientation="vertical"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal|top"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textAlignment="viewStart" />
+        android:layout_weight="1"
+        android:layout_height="wrap_content">
+        <TextView
+            android:id="@+id/op_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="fill_horizontal"
+            android:layout_marginTop="2dip"
+            android:singleLine="true"
+            android:ellipsize="marquee"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:textAlignment="viewStart" />
 
-    <TextView
-        android:id="@+id/op_counts"
-        android:layout_column="1"
-        android:layout_row="2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill_horizontal|top"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textAlignment="viewStart" />
+        <TextView
+            android:id="@+id/op_time"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="fill_horizontal|top"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewStart" />
+
+        <TextView
+            android:id="@+id/op_counts"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="fill_horizontal|top"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textAlignment="viewStart" />
+    </LinearLayout>
 
     <Spinner
         android:id="@+id/spinnerWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="end"
         android:layout_marginStart="8dip"
-        android:layout_column="2"
-        android:layout_row="0"
-        android:layout_rowSpan="3"
         android:padding="8dip"
         android:focusable="false"
         android:entries="@+array/app_ops_permissions" />
@@ -87,14 +81,9 @@
         android:id="@+id/switchWidget"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
+        android:layout_gravity="end"
         android:layout_marginStart="8dip"
-        android:layout_column="2"
-        android:layout_row="0"
-        android:layout_rowSpan="3"
         android:padding="8dip"
         android:focusable="false"
         android:clickable="true" />
-
-
-</GridLayout>
+</LinearLayout>
diff --git a/res/layout/preference_category_material.xml b/res/layout/preference_category_material.xml
new file mode 100644
index 0000000..d528464
--- /dev/null
+++ b/res/layout/preference_category_material.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- Layout used for PreferenceCategory in a PreferenceActivity. -->
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+android:id/title"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="16dip"
+    android:textAppearance="@*android:style/TextAppearance.Material.Body2"
+    android:textColor="@*android:color/preference_category_text_color"
+    android:paddingStart="?*android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?*android:attr/listPreferredItemPaddingEnd"
+    android:paddingTop="16dip" />
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 1328144..17099ec 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1156,4 +1156,10 @@
     <string name="battery_info_status_charging_dock_ac">Charging on dock AC</string>
     <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
     <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
+
+    <string name="restrict_app_wlan_title">Disable app wifi usage</string>
+    <string name="restrict_app_wlan_summary">Prevent app from using wifi data connection</string>
+    <string name="restrict_app_cellular_title">Disable app cellular usage</string>
+    <string name="restrict_app_cellular_summary">Prevent app from using cellular data connection</string>
+    <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index 12da8b8..af80367 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.applications;
 
+import android.Manifest;
 import android.app.Activity;
 import android.app.AppOpsManager;
 import android.app.Fragment;
@@ -28,6 +29,7 @@ import android.content.pm.PermissionGroupInfo;
 import android.content.pm.PermissionInfo;
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
+import android.net.NetworkPolicyManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -49,6 +51,9 @@ import com.android.settings.Utils;
 
 import java.util.List;
 
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN;
+
 public class AppOpsDetails extends InstrumentedFragment {
     static final String TAG = "AppOpsDetails";
 
@@ -61,6 +66,7 @@ public class AppOpsDetails extends InstrumentedFragment {
     private LayoutInflater mInflater;
     private View mRootView;
     private LinearLayout mOperationsSection;
+    private NetworkPolicyManager mPolicyManager;
 
     private final int MODE_ALLOWED = 0;
     private final int MODE_IGNORED = 1;
@@ -178,9 +184,9 @@ public class AppOpsDetails extends InstrumentedFragment {
                         entry.getTimeText(res, true));
 
                 Spinner sp = (Spinner) view.findViewById(R.id.spinnerWidget);
-                sp.setVisibility(View.INVISIBLE);
+                sp.setVisibility(View.GONE);
                 Switch sw = (Switch) view.findViewById(R.id.switchWidget);
-                sw.setVisibility(View.INVISIBLE);
+                sw.setVisibility(View.GONE);
 
                 final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());
                 int mode = mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),
@@ -226,9 +232,52 @@ public class AppOpsDetails extends InstrumentedFragment {
             }
         }
 
+        if (mPm.checkPermission(Manifest.permission.INTERNET, mPackageInfo.packageName)
+                == PackageManager.PERMISSION_GRANTED) {
+            TextView internetCategory = (TextView) mInflater.inflate(
+                    R.layout.preference_category_material, null);
+            internetCategory.setText(R.string.privacy_guard_internet_category);
+            mOperationsSection.addView(internetCategory);
+
+            addInternetSwitch(POLICY_REJECT_ON_WLAN);
+            addInternetSwitch(POLICY_REJECT_ON_DATA);
+        }
+
         return true;
     }
 
+    private void addInternetSwitch(final int policy) {
+        // Add internet category permissions
+        final View view = mInflater.inflate(R.layout.app_ops_details_item,
+                mOperationsSection, false);
+        mOperationsSection.addView(view);
+
+        ((TextView)view.findViewById(R.id.op_name)).setText(
+                policy == POLICY_REJECT_ON_DATA ? R.string.restrict_app_cellular_title :
+                        R.string.restrict_app_wlan_title);
+        view.findViewById(R.id.op_counts).setVisibility(View.INVISIBLE);
+        view.findViewById(R.id.op_time).setVisibility(View.INVISIBLE);
+        view.findViewById(R.id.spinnerWidget).setVisibility(View.GONE);
+
+        Switch sw = (Switch) view.findViewById(R.id.switchWidget);
+        sw.setChecked((mPolicyManager.getUidPolicy(
+                mPackageInfo.applicationInfo.uid) & policy) != 0);
+        sw.setTag(policy);
+        sw.setVisibility(View.VISIBLE);
+        sw.setOnCheckedChangeListener(new Switch.OnCheckedChangeListener() {
+            public void onCheckedChanged(CompoundButton buttonView,
+                                         boolean isChecked) {
+                if (isChecked) {
+                    mPolicyManager.addUidPolicy(mPackageInfo.applicationInfo.uid,
+                            policy);
+                } else {
+                    mPolicyManager.removeUidPolicy(mPackageInfo.applicationInfo.uid,
+                            policy);
+                }
+            }
+        });
+    }
+
     private void setIntentAndFinish(boolean finish, boolean appChanged) {
         Intent intent = new Intent();
         intent.putExtra(ManageApplications.APP_CHG, appChanged);
@@ -245,6 +294,7 @@ public class AppOpsDetails extends InstrumentedFragment {
         mPm = getActivity().getPackageManager();
         mInflater = (LayoutInflater)getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE);
         mAppOps = (AppOpsManager)getActivity().getSystemService(Context.APP_OPS_SERVICE);
+        mPolicyManager = NetworkPolicyManager.from(getActivity());
 
         retrieveAppEntry();
 
diff --git a/src/com/android/settings/privacyguard/AppInfoLoader.java b/src/com/android/settings/privacyguard/AppInfoLoader.java
index 6efd7a5..520bd20 100644
--- a/src/com/android/settings/privacyguard/AppInfoLoader.java
+++ b/src/com/android/settings/privacyguard/AppInfoLoader.java
@@ -15,6 +15,7 @@
  */
 package com.android.settings.privacyguard;
 
+import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.AsyncTaskLoader;
 import android.content.Context;
@@ -104,6 +105,8 @@ import java.util.List;
             app.uid = info.applicationInfo.uid;
             app.privacyGuardEnabled = mAppOps.getPrivacyGuardSettingForPackage(
                     app.uid, app.packageName);
+            app.hasInternetPermission = mPm.checkPermission(Manifest.permission.INTERNET,
+                    app.packageName) == PackageManager.PERMISSION_GRANTED;
             apps.add(app);
         }
 
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
index adbe8cc..4cc8214 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
@@ -16,7 +16,10 @@
 
 package com.android.settings.privacyguard;
 
+import android.Manifest;
 import android.app.FragmentTransaction;
+import android.content.pm.PackageManager;
+import android.net.NetworkPolicyManager;
 import android.view.animation.AnimationUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -87,6 +90,7 @@ public class PrivacyGuardManager extends Fragment
 
     // Privacy Guard Fragment
     private final static String PRIVACY_GUARD_FRAGMENT_TAG = "privacy_guard_fragment";
+    private NetworkPolicyManager mPolicyManager;
 
     // holder for package data passed into the adapter
     public static final class AppInfo {
@@ -95,6 +99,13 @@ public class PrivacyGuardManager extends Fragment
         boolean enabled;
         boolean privacyGuardEnabled;
         int uid;
+        boolean hasInternetPermission;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mPolicyManager = NetworkPolicyManager.from(getActivity());
     }
 
     @Override
@@ -280,6 +291,15 @@ public class PrivacyGuardManager extends Fragment
         app.privacyGuardEnabled = !app.privacyGuardEnabled;
         mAppOps.setPrivacyGuardSettingForPackage(app.uid, app.packageName, app.privacyGuardEnabled);
 
+        if (app.hasInternetPermission) {
+            if (app.privacyGuardEnabled) {
+                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
+                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
+            } else {
+                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
+                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
+            }
+        }
         mAdapter.notifyDataSetChanged();
     }
 
-- 
cgit v1.1


From 6207c8769fa77a0cb0c36aec4f7197c8ff9a43e7 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Mon, 21 Mar 2016 16:30:52 +0100
Subject: Settings: Respect config_proximityCheckOnWakeEnabledByDefault

Also, set the correct value for PROXIMITY_ON_WAKE when the feature is
disabled.

Change-Id: Ibf9dd1c64aeb076bc72f328d50825790aef2a50b
---
 src/com/android/settings/DisplaySettings.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 399e1eb..97353a8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -294,7 +294,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
             if (displayPrefs != null && mProximityCheckOnWakePreference != null) {
                 displayPrefs.removePreference(mProximityCheckOnWakePreference);
             }
-            CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 1);
+            CMSettings.System.putInt(getContentResolver(), CMSettings.System.PROXIMITY_ON_WAKE, 0);
+        } else {
+            boolean proximityCheckOnWakeDefault = getResources().getBoolean(
+                    org.cyanogenmod.platform.internal.R.bool.config_proximityCheckOnWakeEnabledByDefault);
+            mProximityCheckOnWakePreference.setChecked(CMSettings.System.getInt(getContentResolver(),
+                    CMSettings.System.PROXIMITY_ON_WAKE,
+                    (proximityCheckOnWakeDefault ? 1 : 0)) == 1);
         }
 
         mWakeWhenPluggedOrUnplugged =
-- 
cgit v1.1


From 1cfc5375a9c1e27b188c3659610dbec655067cf6 Mon Sep 17 00:00:00 2001
From: Danesh M <daneshm90@gmail.com>
Date: Mon, 21 Mar 2016 13:56:22 -0700
Subject: Settings : Fix default privacy guard preference

Ensure we write to the correct table.
CYNGNOS-2264

Change-Id: I1260cf665080631e3e2ec19b371a79eee273c6d2
---
 src/com/android/settings/privacyguard/PrivacyGuardPrefs.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java b/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
index d2417a3..060e617 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardPrefs.java
@@ -55,7 +55,7 @@ public class PrivacyGuardPrefs extends SettingsPreferenceFragment implements
         mPrivacyGuardDefault = (SwitchPreference) findPreference(KEY_PRIVACY_GUARD_DEFAULT);
         mPrivacyGuardDefault.setOnPreferenceChangeListener(this);
 
-        mPrivacyGuardDefault.setChecked(Settings.Secure.getInt(getContentResolver(),
+        mPrivacyGuardDefault.setChecked(CMSettings.Secure.getInt(getContentResolver(),
                 CMSettings.Secure.PRIVACY_GUARD_DEFAULT, 0) == 1);
     }
 
@@ -75,7 +75,7 @@ public class PrivacyGuardPrefs extends SettingsPreferenceFragment implements
     public boolean onPreferenceChange(Preference preference, Object newValue) {
         if (preference == mPrivacyGuardDefault) {
             boolean value = (Boolean) newValue;
-            Settings.Secure.putInt(getContentResolver(),
+            CMSettings.Secure.putInt(getContentResolver(),
                     CMSettings.Secure.PRIVACY_GUARD_DEFAULT, value ? 1 : 0);
             return true;
         }
-- 
cgit v1.1


From 0d512152acf347256bcce0e0bba882ee61e2d366 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 21 Mar 2016 15:17:16 -0700
Subject: Settings: forward decrypt required on boot flag

This wasn't being pass forward and all of the defaults had it set to
true.

Ticket: CYNGNOS-2270

Change-Id: I90a6c918bb5b4b52791bcff18a6ea3bcfb194547
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/ChooseLockPatternSize.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ChooseLockPatternSize.java b/src/com/android/settings/ChooseLockPatternSize.java
index 59b0644..b6f17f1 100644
--- a/src/com/android/settings/ChooseLockPatternSize.java
+++ b/src/com/android/settings/ChooseLockPatternSize.java
@@ -92,8 +92,13 @@ public class ChooseLockPatternSize extends PreferenceActivity {
                         originatingIntent.getLongExtra(
                                 ChooseLockSettingsHelper.EXTRA_KEY_CHALLENGE, 0));
             }
+            // Forward the Encryption interstitial required password selection
+            if (originatingIntent.hasExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD)) {
+                intent.putExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, originatingIntent
+                        .getBooleanExtra(EncryptionInterstitial.EXTRA_REQUIRE_PASSWORD, true));
+            }
             intent.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT);
-                    startActivity(intent);
+            startActivity(intent);
 
             finish();
             return true;
-- 
cgit v1.1


From 9f4ec5ef6b590855da4d53fd2f4d5cd2667c53f9 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Tue, 22 Mar 2016 02:00:39 +0200
Subject: Improve data usage strings

Change-Id: If2770dfdf874006704909f2ec95472956fc4a490
---
 res/values/cm_strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 17099ec..abc44d1 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1157,8 +1157,8 @@
     <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
     <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
 
-    <string name="restrict_app_wlan_title">Disable app wifi usage</string>
-    <string name="restrict_app_wlan_summary">Prevent app from using wifi data connection</string>
+    <string name="restrict_app_wlan_title">Disable app Wi\u2011Fi usage</string>
+    <string name="restrict_app_wlan_summary">Prevent app from using Wi\u2011Fi data connection</string>
     <string name="restrict_app_cellular_title">Disable app cellular usage</string>
     <string name="restrict_app_cellular_summary">Prevent app from using cellular data connection</string>
     <string name="privacy_guard_internet_category">Internet</string>
-- 
cgit v1.1


From e24960434b847e2210c4dd79f519b7d49ac695fa Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Mon, 28 Mar 2016 00:46:11 +0300
Subject: Automatic translation import

Change-Id: I9b569411eef8996b0fa20d164062f54d3162e49e
---
 res/values-af/cm_strings.xml     |    6 +
 res/values-ar/cm_strings.xml     |  121 ++
 res/values-as-rIN/arrays.xml     |  156 ++
 res/values-as-rIN/cm_strings.xml |    1 -
 res/values-as-rIN/strings.xml    | 3100 ++++++++++++++++++++++++++++++++++++++
 res/values-be/cm_strings.xml     |    1 -
 res/values-bg/cm_strings.xml     |   12 +-
 res/values-ca/cm_strings.xml     |    6 +
 res/values-cs/cm_strings.xml     |    6 +
 res/values-da/cm_strings.xml     |   33 +
 res/values-de/cm_strings.xml     |    5 +-
 res/values-el/cm_strings.xml     |    9 +
 res/values-es-rMX/cm_strings.xml |    1 -
 res/values-es-rUS/cm_strings.xml |    1 -
 res/values-es/cm_strings.xml     |    6 +
 res/values-eu-rES/cm_strings.xml |    6 +
 res/values-fi/cm_strings.xml     |    6 +
 res/values-fr/cm_strings.xml     |    1 -
 res/values-gu-rIN/cm_strings.xml |    1 -
 res/values-hr/cm_strings.xml     |    8 +-
 res/values-hu/cm_strings.xml     |    1 -
 res/values-in/cm_plurals.xml     |   25 -
 res/values-in/cm_strings.xml     |  665 --------
 res/values-it/cm_strings.xml     |   42 +-
 res/values-iw/cm_strings.xml     |  278 ++--
 res/values-ja/cm_strings.xml     |    2 +-
 res/values-kn-rIN/cm_strings.xml |    1 -
 res/values-ko/cm_strings.xml     |    1 -
 res/values-ml-rIN/cm_strings.xml |    1 -
 res/values-mr-rIN/cm_strings.xml |    1 -
 res/values-nb/cm_strings.xml     |   21 +
 res/values-nl/cm_strings.xml     |    1 -
 res/values-or-rIN/arrays.xml     |  156 ++
 res/values-or-rIN/cm_strings.xml |    1 -
 res/values-or-rIN/strings.xml    | 3100 ++++++++++++++++++++++++++++++++++++++
 res/values-pl/cm_strings.xml     |    4 +-
 res/values-pt-rBR/cm_strings.xml |    8 +-
 res/values-pt-rPT/cm_strings.xml |    8 +-
 res/values-ro/cm_strings.xml     |    2 +
 res/values-ru/cm_strings.xml     |    5 +
 res/values-sl/cm_strings.xml     |    6 +
 res/values-sr/cm_strings.xml     |    6 +
 res/values-sv/cm_strings.xml     |    8 +-
 res/values-ta-rIN/cm_strings.xml |    1 -
 res/values-te-rIN/cm_strings.xml |    1 -
 res/values-th/cm_strings.xml     |   56 +-
 res/values-tr/cm_strings.xml     |  107 ++
 res/values-ug/cm_strings.xml     |    6 +
 res/values-vi/cm_strings.xml     |    1 -
 res/values-zh-rCN/cm_strings.xml |    6 +
 50 files changed, 7135 insertions(+), 872 deletions(-)
 create mode 100644 res/values-as-rIN/arrays.xml
 create mode 100644 res/values-as-rIN/strings.xml
 delete mode 100644 res/values-in/cm_plurals.xml
 create mode 100644 res/values-or-rIN/arrays.xml
 create mode 100644 res/values-or-rIN/strings.xml

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 97b98da..9a40093 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Data verbinding</string>
   <string name="toggleSync">Outo-Sinkroniseer data</string>
   <string name="toggle2g3g4g">Voorkeur netwerk tipe</string>
+  <string name="toggle2g3g4g_msim">Voorkeur netwerk tipe (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi streek-kode</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Laai op dok krag AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laai oor dok USB</string>
+  <string name="restrict_app_wlan_title">Deaktiveer toep Wi\u2011Fi gebruik</string>
+  <string name="restrict_app_wlan_summary">Voorkom toep om Wi\u2011Fi konneksie te gebruik</string>
+  <string name="restrict_app_cellular_title">Deaktiveer toep sellulêre data gebruik</string>
+  <string name="restrict_app_cellular_summary">Voorkom toep om sellulêre data konneksie te gebruik</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 2916397..6cab1d7 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -52,6 +52,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">اسم الجهاز</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">مستوى CyanogenMod API</string>
   <string name="mod_api_level_default">مجهول</string>
   <!-- About phone screen, build date -->
   <string name="build_date">تاريخ إنشاء</string>
@@ -108,6 +109,7 @@
   <string name="rename_dialog_hint">أدخل اسم الوضع</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">إعادة تعيين</string>
+  <string name="profile_reset_message">حذف كل ملفات التعريف المنشأة ومجموعات التطبيقات واستعادتها إلى الافتراضي؟</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">أتريد إزالة هذا التطبيق؟</string>
   <!-- Profile network mode -->
@@ -167,6 +169,7 @@
   <string name="toggleData">اتصال بالبيانات</string>
   <string name="toggleSync">مزامنة تلقائية للبيانات</string>
   <string name="toggle2g3g4g">نوع الشبكة المفضل</string>
+  <string name="toggle2g3g4g_msim">نوع الشبكة المفضل (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">رمز الواي فاي للمنطقة</string>
@@ -255,9 +258,13 @@
   <string name="notification_light_missed_call_title">مكالمة فائتة</string>
   <string name="notification_light_voicemail_title">البريد الصوتي</string>
   <string name="notification_light_screen_on">الأضواء عند تشغيل الشاشة</string>
+  <string name="notification_light_zen_mode">الأضواء في وضع \"عدم الإزعاج\"</string>
   <string name="notification_light_use_multiple_leds">مصابيح دليلية متعددة</string>
   <string name="keywords_lights_brightness_level">تعتيم سطوع المصابيح الدليلية</string>
+  <string name="notification_light_automagic">اختر الألوان تلقائياً</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">إعدادات الإضاءة</string>
+  <string name="led_notification_text">إضاءة الـ LED ممكنة من الإعدادات</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">تصحيح أخطاء Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -289,6 +296,8 @@
   <string name="app_ops_summaries_modify_call_log">تعديل سجل المكالمات</string>
   <string name="app_ops_summaries_read_calendar">قراءة التقويم</string>
   <string name="app_ops_summaries_modify_calendar">تعديل التقويم</string>
+  <string name="app_ops_summaries_wifi_scan">مسح Wi-Fi</string>
+  <string name="app_ops_summaries_notification">إشعار/ إخطار في علبة النظام</string>
   <string name="app_ops_summaries_cell_scan">مسح الخلية</string>
   <string name="app_ops_summaries_call_phone">مكالمة هاتفية</string>
   <string name="app_ops_summaries_read_sms">قراءة الرسالة النصية القصيرة</string>
@@ -316,15 +325,39 @@
   <string name="app_ops_summaries_media_volume">حجم الوسائط</string>
   <string name="app_ops_summaries_alarm_volume">مستوى التنبيه</string>
   <string name="app_ops_summaries_notification_volume">مستوى الإشعار</string>
+  <string name="app_ops_summaries_bluetooth_volume">صوت بلوتوث</string>
   <string name="app_ops_summaries_keep_awake">البقاء بحالة انتباه</string>
   <string name="app_ops_summaries_monitor_location">مراقبة الموقع</string>
   <string name="app_ops_summaries_monitor_high_power_location">رصد موقع عالي الطاقة</string>
+  <string name="app_ops_summaries_get_usage_stats">الحصول على إحصائيات الاستخدام</string>
   <string name="app_ops_summaries_mute_unmute_microphone">كتم/إلغاء كتم الميكروفون</string>
   <string name="app_ops_summaries_toast_window">عرض الرسائل الإشعارية</string>
   <string name="app_ops_summaries_project_media">وسائط المشروع</string>
   <string name="app_ops_summaries_activate_vpn">تفعيل VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">خلفية بيضاء</string>
+  <string name="app_ops_summaries_assist_structure">هيكل مساعد</string>
+  <string name="app_ops_summaries_assist_screenshot">لقة شاشة مساعدة</string>
+  <string name="app_ops_summaries_read_phone_state">قراءة حالة الهاتف</string>
+  <string name="app_ops_summaries_add_voicemail">إضافة البريد الصوتي</string>
+  <string name="app_ops_summaries_use_sip">استخدام SIP</string>
+  <string name="app_ops_summaries_make_call">إجراء مكالمة</string>
+  <string name="app_ops_summaries_use_fingerprint">استخدام بصمة الإصبع</string>
+  <string name="app_ops_summaries_use_body_sensors">استخدام مستشعرات الجسم</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">قراءة البث الخلوي</string>
+  <string name="app_ops_summaries_mock_location">موقع زائف</string>
+  <string name="app_ops_summaries_read_external_storage">قراءة الذاكرة الخارجية</string>
+  <string name="app_ops_summaries_write_external_storage">الكتابة على الذاكرة الخارجية</string>
+  <string name="app_ops_summaries_turn_screen_on">تشغيل الشاشة</string>
+  <string name="app_ops_summaries_get_accounts">الحصول على الحسابات</string>
+  <string name="app_ops_summaries_toggle_wifi">تبديل Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">تبديل بلوتوث</string>
+  <string name="app_ops_summaries_start_at_boot">بدء تشغيل في التمهيد</string>
+  <string name="app_ops_summaries_toggle_nfc">تبديل NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">تبديل البيانات الخلوية</string>
   <string name="app_ops_summaries_superuser">الوصول إلى الجذر</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">موقع خشن</string>
+  <string name="app_ops_labels_fine_location">موقع جيد</string>
   <string name="app_ops_labels_gps">نظام تحديد المواقع</string>
   <string name="app_ops_labels_vibrate">اهتزاز</string>
   <string name="app_ops_labels_read_contacts">قراءة جهات الاتصال</string>
@@ -333,11 +366,19 @@
   <string name="app_ops_labels_modify_call_log">تعديل سجل المكالمات</string>
   <string name="app_ops_labels_read_calendar">قراءة التقويم</string>
   <string name="app_ops_labels_modify_calendar">تعديل التقويم</string>
+  <string name="app_ops_labels_wifi_scan">مسح Wi-Fi</string>
   <string name="app_ops_labels_notification">إشعار/ إخطار في علبة النظام</string>
+  <string name="app_ops_labels_cell_scan">مسح الخلية</string>
   <string name="app_ops_labels_call_phone">مكالمة هاتفية</string>
+  <string name="app_ops_labels_read_sms">قراءة الرسالة النصية القصيرة</string>
+  <string name="app_ops_labels_write_sms">كتابة الرسالة النصية القصيرة</string>
   <string name="app_ops_labels_receive_sms">تلقي الرسالة النصية القصيرة</string>
+  <string name="app_ops_labels_receive_emergency_sms">تلقي الرسالة النصية القصيرة الخاصة بالطوارئ</string>
   <string name="app_ops_labels_receive_mms">تلقي رسالة متعددة الوسائط</string>
+  <string name="app_ops_labels_receive_wap_push">استقبال دفع WAP</string>
   <string name="app_ops_labels_send_sms">إرسال الرسالة النصية القصيرة</string>
+  <string name="app_ops_labels_read_icc_sms">قراءة الرسالة النصية القصيرة ICC</string>
+  <string name="app_ops_labels_write_icc_sms">كتابة الرسالة النصية القصيرة ICC</string>
   <string name="app_ops_labels_modify_settings">تعديل الإعدادات</string>
   <string name="app_ops_labels_draw_on_top">رسم على أعلى</string>
   <string name="app_ops_labels_access_notifications">إشعارات الوصول</string>
@@ -356,10 +397,33 @@
   <string name="app_ops_labels_notification_volume">مستوى الإشعار</string>
   <string name="app_ops_labels_bluetooth_volume">مستوى بلوتوث</string>
   <string name="app_ops_labels_keep_awake">تبقى مستيقظ</string>
+  <string name="app_ops_labels_monitor_location">مراقبة الموقع</string>
+  <string name="app_ops_labels_monitor_high_power_location">مراقبة موقع الطاقة العالية</string>
+  <string name="app_ops_labels_get_usage_stats">الحصول على إحصائيات الاستخدام</string>
   <string name="app_ops_labels_mute_unmute_microphone">كتم/إلغاء كتم الميكروفون</string>
   <string name="app_ops_labels_toast_window">عرض الرسائل الإشعارية</string>
   <string name="app_ops_labels_project_media">وسائط المشروع</string>
   <string name="app_ops_labels_activate_vpn">تفعيل VPN</string>
+  <string name="app_ops_labels_write_wallpaper">خلفية بيضاء</string>
+  <string name="app_ops_labels_assist_structure">هيكل مساعد</string>
+  <string name="app_ops_labels_assist_screenshot">لقطة شاشة مساعدة</string>
+  <string name="app_ops_labels_read_phone_state">قراءة حالة الهاتف</string>
+  <string name="app_ops_labels_add_voicemail">إضافة البريد الصوتي</string>
+  <string name="app_ops_labels_use_sip">استخدام SIP</string>
+  <string name="app_ops_labels_make_call">إجراء مكالمة</string>
+  <string name="app_ops_labels_use_fingerprint">استخدام بصمة الإصبع</string>
+  <string name="app_ops_labels_use_body_sensors">استخدام مستشعرات الجسم</string>
+  <string name="app_ops_labels_read_cell_broadcasts">قراءة البث الخلوي</string>
+  <string name="app_ops_labels_mock_location">موقع زائف</string>
+  <string name="app_ops_labels_read_external_storage">قراءة الذاكرة الخارجية</string>
+  <string name="app_ops_labels_write_external_storage">الكتابة على الذاكرة الخارجية</string>
+  <string name="app_ops_labels_turn_screen_on">تشغيل الشاشة</string>
+  <string name="app_ops_labels_get_accounts">الحصول على الحسابات</string>
+  <string name="app_ops_labels_toggle_wifi">تبديل Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">تبديل بلوتوث</string>
+  <string name="app_ops_labels_start_at_boot">بدء تشغيل في التمهيد</string>
+  <string name="app_ops_labels_toggle_nfc">تبديل NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">تبديل البيانات الخلوية</string>
   <string name="app_ops_labels_superuser">صلاحيات الجذر</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">مسموح به</string>
@@ -539,8 +603,13 @@
   <string name="live_display_color_profile_dynamic_title">ديناميكي</string>
   <string name="live_display_color_profile_dynamic_summary">ألوان محسنة وبيضاء ساطعة</string>
   <string name="live_display_color_profile_cinema_title">سينما</string>
+  <string name="live_display_color_profile_cinema_summary">إعادة إنتاج لون متطابق للفيديو</string>
   <string name="live_display_color_profile_astronomy_title">علم الفلك</string>
   <string name="live_display_color_profile_astronomy_summary">أحمر عميق للحفاظ على الرؤية الليلية</string>
+  <string name="live_display_color_profile_photography_title">التصوير الفوتوغرافي</string>
+  <string name="live_display_color_profile_photography_summary">إعادة إنتاج لون متطابق للصور</string>
+  <string name="live_display_color_profile_basic_title">أساسي</string>
+  <string name="live_display_color_profile_basic_summary">استخدام العرض غير المعاير</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">رمز التحديد</string>
   <string name="ime_switcher_notify_summary">عرض رمز تحديد طريقة الإدخال </string>
@@ -649,6 +718,8 @@
   <string name="status_bar_battery_percentage_text_inside">داخل الرمز</string>
   <string name="status_bar_battery_percentage_text_next">بجوار الرمز</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">أيقونات شريط الحالة</string>
+  <string name="status_bar_icons_summary">التحكم في أيقونات شريط الحالة التي يتم عرضها</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">حظر أحداث لمس الإيماءة</string>
   <string name="edge_gesture_service_summary">عدم إرسال الأحداث الخاصة بإيماءات شريط التنقل والحالة للتطبيقات</string>
@@ -685,6 +756,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">عرض صورة الغلاف للموسيقى</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">معطل بواسطة شريط إعدادات سريعة</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">اضغط لتمكين شاشة التأمين</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">تم تمكين شاشة التأمين!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">عتبة توفير البطارية</string>
   <string name="battery_saver_summary">خفض الأداء والحد من البيانات الخلفية</string>
@@ -694,6 +768,7 @@
   <string name="autoperf_summary">اختيار وضع بطارية مناسب تلقائياً للتطبيقات المختلفة</string>
   <string name="perf_profile_title">وضع البطارية</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">التطبيقات بدأت في التمهيد</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">نغمة الإشعار</string>
   <!-- Advanced reboot options -->
@@ -722,6 +797,7 @@
   <string name="voice_wakeup_retrain_title">إعادة تدريب صوتك</string>
   <string name="voice_wakeup_activity_title">نشاط مراد إطلاقه</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">التنبيه الصوتي يحتاج إلى أذونات مكالمة هاتفية لتحديد جهة اتصال الاتصال المباشر.</string>
   <string name="picker_activities">الأنشطة</string>
   <string name="select_custom_app_title">حدد التطبيق المخصص</string>
   <string name="select_custom_activity_title">حدد نشاط مخصص</string>
@@ -791,17 +867,23 @@
   <string name="menu_hidden_apps_delete">إعادة تعيين</string>
   <string name="menu_hidden_apps_reset_lock">إعادة تعيين تأمين النمط</string>
   <string name="protected_apps">التطبيقات المحمية</string>
+  <string name="protected_apps_summary">إدارة التطبيقات التي تكون مخفية خلف التأمين الآمن</string>
   <string name="saving_protected_components">حفظ حالة المكون\u2026</string>
   <string name="pa_login_username_hint">اسم المستخدم (البريد الإلكتروني)</string>
   <string name="pa_login_password_hint">كلمة المرور</string>
   <string name="pa_login_submit_button">تسجيل الدخول</string>
   <string name="pa_login_checking_password">التحقق من الحساب\u2026</string>
   <string name="pa_login_incorrect_login">تسجيل دخول غير صحيح</string>
+  <string name="pa_pattern_or_fingerprint_header">يجب رسم نمط أو استخدام بصمة الأصابع لإلغاء التأمين</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">المُساهمون</string>
   <string name="contributors_cloud_loading_message">يُحمِّل بيانات المُساهمين\u2026</string>
   <string name="contributors_cloud_failed_message">تعذّر تحميل بيانات المُساهمين</string>
   <string name="contributor_info_menu">معلومات المُساهم</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>الاسم:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Nick:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>التزامات:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="contributions_info_menu">معلومات المساهمون</string>
   <string name="contributions_info_msg">
 <![CDATA[<b>إجمالي المساهمين:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
@@ -817,24 +899,45 @@
   <string name="title_general">عام</string>
   <string name="advanced">متقدم</string>
   <string name="link_volume_option_title">ربط حجم صوت النغمة وصوت الإشعارات</string>
+  <string name="lcd_density_prompt_message">قد لا تعمل بعض التطبيقات على DPI غير قياسي.\n\nسيتم إعادة تشغيل الجهاز الخاص بك.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">رقم الهاتف APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN مكرر</string>
+  <string name="duplicate_apn_error_message">هذا APN موجودة بالفعل. تجاهل ذلك أو قم بتغيير المعلمات.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> is <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">تعطيل</string>
   <string name="sim_missing">مفقود أو به خلل</string>
+  <string name="sim_enabler_need_disable_sim">سيتم إلغاء تنشيط بطاقة SIM. هل تريد الاستمرار؟</string>
+  <string name="sim_enabler_will_disable_sim_title">لحظة</string>
+  <string name="sim_enabler_need_switch_data_service">سيتم تعطيل SIM هذه وسيتم استخدام SIM هذه <xliff:g id="slotid">%1$s</xliff:g> لخدمات البيانات.
+هل أنت متأكد أنك تريد المتابعة؟</string>
   <string name="sim_enabler_airplane_on">تعذر القيام بالعملية في وضع الطيران.</string>
   <string name="sim_enabler_in_call">تعذر القيام بالعملية أثناء إجراء مكالمة.</string>
   <string name="sim_enabler_both_inactive">لا يمكن تعطيل جميع شرائح SIM</string>
+  <string name="sim_enabler_enabling">تنشيط\u2026</string>
+  <string name="sim_enabler_disabling">إلغاء تنشيط\u2026</string>
+  <string name="sub_activate_success">تم تنشيط SIM.</string>
+  <string name="sub_activate_failed">فشل التنشيط.</string>
+  <string name="sub_deactivate_success">تم إلغاء تنشيط SIM.</string>
+  <string name="sub_deactivate_failed">فشل إلغاء التنشيط.</string>
   <string name="primary_sub_select_title">اشتراك 3G/LTE المبدئي</string>
+  <string name="select_sim_card">تحديد بطاقة SIM</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">حالة شريحة SIM</string>
   <string name="sim_card_lock_settings_title">إعدادات قفل شريحة SIM/RUIM</string>
   <string name="sim_card_summary_empty">لم يتم إدخال شريحة SIM</string>
+  <string name="sim_mobile_network_settings_category_title">إعدادات الشبكة الخلوية</string>
   <string name="sim_mobile_network_settings_title">إعدادات شريحة SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">التذكيرات</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">الأحداث</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">المتصلون المحددون</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">الرسائل المحددة</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">الرأس: %1$s w/ كغ</string>
@@ -844,8 +947,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">نغمة %d شريحة SIM</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">التطبيق:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">آخر وقت استخدام:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">وقت الاستخدام:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">سيؤدي هذا إلى مسح كافة البيانات من <b>التخزين الداخلي</b> في جهازك اللوحيّ، بما في ذلك: \n\n <li>حسابات جهازك</li>\n<li>بيانات وإعدادات النظام والتطبيقات</li>\n<li>التطبيقات التي تم تنزيلها</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -862,14 +968,24 @@
   <string name="factory_reset_warning_text_reset_now">إعادة التعيين الآن</string>
   <string name="factory_reset_warning_text_message">سيتم إزالة كافة حساباتك وتطبيقاتك وبيانات تطبيقك وإعدادات النظام من هذا الجهاز. لا يمكن التراجع عن هذا الإجراء.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">أخرى</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi انتهاء مهلة الحث الساخن</string>
   <string name="hotstpot_inactivity_timeout_never">مطلقًا</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 دقيقة</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 دقائق</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 دقائق</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">لن تنتهي مهلة Wi\u2011Fi الحث الساخن المتنقل أبداً</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">سوف تنتهي مهلة الحث الساخن المتنقل Wi\u2011Fi بعد <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">شاشة التأمين المباشر</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">تمكين وتهيئة شاشات التأمين المباشر</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">إعدادات</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">لعرض شاشات التأمين المباشر المتوفرة، قم بتشغيل شاشات التأمين المباشر.</string>
   <string name="interruptions_ignore_while_media_title">منع تراكب الأصوات</string>
   <string name="interruptions_ignore_while_media_summary">لا يخفض صوت تشغيل الوسائط عند وصول إشعار</string>
   <!-- CM Legal -->
@@ -884,4 +1000,9 @@
   <string name="battery_info_status_charging_dock_ac">شحن على الإرساء بالتيار المتناوب</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">شحن على الإرساء عبر USB</string>
+  <string name="restrict_app_wlan_title">تعطيل استخدام Wi\u2011Fi للتطبيق</string>
+  <string name="restrict_app_wlan_summary">منع التطبيق من استخدام اتصال بيانات Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">تعطيل الاستخدام الخلوي للتطبيق</string>
+  <string name="restrict_app_cellular_summary">منع التطبيق من استخدام اتصال البيانات الخلوي</string>
+  <string name="privacy_guard_internet_category">الإنترنت</string>
 </resources>
diff --git a/res/values-as-rIN/arrays.xml b/res/values-as-rIN/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-as-rIN/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 5b36914..24ae35c 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">ৰিছেট</string>
   <string name="menu_hidden_apps_reset_lock">পেটাৰ্ণ লক ৰিছেট কৰক</string>
   <string name="protected_apps">প্ৰতিৰোধী এপ্প্</string>
-  <string name="protected_apps_summary">সুৰক্ষিত লকৰ পাছফালে কোনবোৰ এপ্লিকেচন লুকুওৱা হ\'ব প্ৰবন্ধন কৰক</string>
   <string name="saving_protected_components">কম্পোনেণ্টৰ অৱস্থা সংৰক্ষণ কৰা\u2026</string>
   <string name="pa_login_username_hint">ৱ্যবহাৰকাৰীৰ নাম (ইমেইল)</string>
   <string name="pa_login_password_hint">পাছৱৰ্ড</string>
diff --git a/res/values-as-rIN/strings.xml b/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-as-rIN/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 5e7563f..5396923 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -858,7 +858,6 @@
   <string name="menu_hidden_apps_delete">Скід</string>
   <string name="menu_hidden_apps_reset_lock">Выдаліць графічны ключ</string>
   <string name="protected_apps">Заблакаваць дадаткі</string>
-  <string name="protected_apps_summary">Кіраванне дадаткамі, для запуску якіх патрабуецца ўвод пароля</string>
   <string name="saving_protected_components">Захаванне стану дадаткаў\u2026</string>
   <string name="pa_login_username_hint">Імя карыстальніка (электронная пошта)</string>
   <string name="pa_login_password_hint">Пароль</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index ac6123c..a25e61c 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -55,7 +55,7 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Системни актуализации</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Актуализирай режима за възстановяване на Cyanogen</string>
+  <string name="update_recovery_title">Актуализирай режима за възстановяване</string>
   <string name="update_recovery_summary">Актуализирай recovery със системните актуализации</string>
   <string name="update_recovery_on_warning">Забележка: Когато тази функция е активна, вашето инсталирано recovery ще бъде заменено с включеното в текущата версия на операционната система.\n\nВашето recovery ще се актуализира заедно с ъпгрейдите на вашата система, за да се гарантира съвместимост с бъдещите версии.\n\nИскате ли да активирате тази функция?</string>
   <string name="update_recovery_off_warning">Предупреждение: Когато тази функция е забранена, вашето recovery няма да бъде актуализирана с актуализациите на операционната система.\n\nБъдещи актуализации на операционната система не могат да се инсталират с остарели или потребителски recovery версии.\n\nНаистина ли искате да забраните тази функция?</string>
@@ -165,6 +165,7 @@
   <string name="toggleData">Мобилни данни</string>
   <string name="toggleSync">Авто-синхронизиране на данни</string>
   <string name="toggle2g3g4g">Предпочитан тип мрежа</string>
+  <string name="toggle2g3g4g_msim">Предпочитан тип мрежа (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">WiFi код на регион</string>
@@ -768,7 +769,7 @@
   <string name="notification_ringtone_title_cm">Стандартна мелодия за известията</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Рестартиране за напреднали</string>
-  <string name="advanced_reboot_summary">Активира разширените възможности в меню Захранване за извършване на Бързо рестартиране, рестартиране в режим Възстановяване или Буутлоудър</string>
+  <string name="advanced_reboot_summary">Активира разширените възможности в меню Захранване за извършване на Софтуерно рестартиране, рестартиране в режим Възстановяване или Буутлоудър</string>
   <string name="category_interface">Интерфейс</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Разширен екран</string>
@@ -986,11 +987,16 @@
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Нулиране на статистиката</string>
   <!-- Reset stats confirmation dialog's message -->
-  <string name="reset_stats_msg">История на статистиката на батерията се ще се нулира</string>
+  <string name="reset_stats_msg">Статистиката на батерията ще бъде нулирана</string>
   <!-- Dock battery not present message -->
   <string name="dock_battery_not_present">Док за зареждане батерията не е наличен</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <string name="battery_info_status_charging_dock_ac">Зареждане от док AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зареждане от USB</string>
+  <string name="restrict_app_wlan_title">Забрани на проложението употребата на Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Забрани предаването на данните от приложенията през Wi \ u2011Fi</string>
+  <string name="restrict_app_cellular_title">Забрани на проложението да използва мобилни данни</string>
+  <string name="restrict_app_cellular_summary">Забрани предаването на данните от приложенията през мобилни мрежи</string>
+  <string name="privacy_guard_internet_category">Интернет</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index b58cf82..3d3bd13 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Connexió de dades</string>
   <string name="toggleSync">Sincronització automàtica de dades</string>
   <string name="toggle2g3g4g">Tipus de xarxa preferida</string>
+  <string name="toggle2g3g4g_msim">Tipus de xarxa preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Codi de regió de Wi\u2011Fi</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">S\'està carregant en l\'acoblament CA</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">S\'està carregant sobre l\'acoblament USB</string>
+  <string name="restrict_app_wlan_title">Deshabilita l\'ús del Wi\u2011Fi per part de l\'aplicació</string>
+  <string name="restrict_app_wlan_summary">Impedeix que l\'aplicació utilitzi la connexió de dades Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Deshabilita l\'ús de dades mòbils per part de l\'aplicació</string>
+  <string name="restrict_app_cellular_summary">Impedeix que l\'aplicació utilitzi la connexió de dades mòbils</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index ba3ed50..facad1c 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -166,6 +166,7 @@
   <string name="toggleData">Datové připojení</string>
   <string name="toggleSync">Auto. synch. data</string>
   <string name="toggle2g3g4g">Upřednostňovaný typ sítě</string>
+  <string name="toggle2g3g4g_msim">Upřednostňovaný typ sítě (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Kód regionu Wi\u2011Fi</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Nabíjení pomocí napájení doku</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
+  <string name="restrict_app_wlan_title">Zakázat aplikaci používat Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Zabrání aplikaci využívat datové připojení Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Zakázat aplikaci používat mobilní data</string>
+  <string name="restrict_app_cellular_summary">Zabrání aplikaci využívat datové připojení mobilních dat</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 38e50d1..da615f6 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -336,6 +336,7 @@
   <string name="app_ops_summaries_toggle_wifi">Wi-Fi til/fra</string>
   <string name="app_ops_summaries_toggle_bluetooth">bluetooth til/fra</string>
   <string name="app_ops_summaries_toggle_nfc">NFC til/fra</string>
+  <string name="app_ops_summaries_toggle_mobile_data">slå mobildata til/fra</string>
   <string name="app_ops_summaries_superuser">root-adgang</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Grov placering</string>
@@ -347,11 +348,17 @@
   <string name="app_ops_labels_modify_call_log">Ændre opkaldslog</string>
   <string name="app_ops_labels_read_calendar">Læs kalender</string>
   <string name="app_ops_labels_modify_calendar">Ændre kalender</string>
+  <string name="app_ops_labels_wifi_scan">Wi-Fi skanning</string>
   <string name="app_ops_labels_notification">Skriv notifikation</string>
   <string name="app_ops_labels_call_phone">Opkald til telefon</string>
+  <string name="app_ops_labels_read_sms">Læs SMS</string>
+  <string name="app_ops_labels_write_sms">Skriv SMS</string>
   <string name="app_ops_labels_receive_sms">Modtag SMS/MMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Modtag nød-SMS</string>
   <string name="app_ops_labels_receive_mms">Modtag SMS/MMS</string>
   <string name="app_ops_labels_send_sms">Send SMS/MMS</string>
+  <string name="app_ops_labels_read_icc_sms">Læs ICC SMS</string>
+  <string name="app_ops_labels_write_icc_sms">Skriv ICC SMS</string>
   <string name="app_ops_labels_modify_settings">Ændre indstillinger</string>
   <string name="app_ops_labels_draw_on_top">Træk fra toppen</string>
   <string name="app_ops_labels_access_notifications">Adgang til notifikationer</string>
@@ -374,6 +381,20 @@
   <string name="app_ops_labels_toast_window">Vis toastbeskeder</string>
   <string name="app_ops_labels_project_media">Projekt medie</string>
   <string name="app_ops_labels_activate_vpn">Aktiver VPN</string>
+  <string name="app_ops_labels_add_voicemail">Tilføj voicemail</string>
+  <string name="app_ops_labels_use_sip">Brug SIP</string>
+  <string name="app_ops_labels_make_call">Foretag opkald</string>
+  <string name="app_ops_labels_use_fingerprint">Brug fingeraftryk</string>
+  <string name="app_ops_labels_use_body_sensors">Brug kropssensorer</string>
+  <string name="app_ops_labels_mock_location">Immitér placering</string>
+  <string name="app_ops_labels_read_external_storage">Læs eksternt lager</string>
+  <string name="app_ops_labels_write_external_storage">Skriv til eksternt lager</string>
+  <string name="app_ops_labels_turn_screen_on">Tænd skærmen</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi til/fra</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bluetooth til/fra</string>
+  <string name="app_ops_labels_start_at_boot">Start ved opstart</string>
+  <string name="app_ops_labels_toggle_nfc">NFC til/fra</string>
+  <string name="app_ops_labels_toggle_mobile_data">Slå mobildata til/fra</string>
   <string name="app_ops_labels_superuser">Root-adgang</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Tilladt</string>
@@ -553,8 +574,13 @@
   <string name="live_display_color_profile_dynamic_title">Dynamisk</string>
   <string name="live_display_color_profile_dynamic_summary">Forbedrede farver og lys hvid</string>
   <string name="live_display_color_profile_cinema_title">Biograf</string>
+  <string name="live_display_color_profile_cinema_summary">Perfekt farvegengivelse for video</string>
   <string name="live_display_color_profile_astronomy_title">Astronomi</string>
   <string name="live_display_color_profile_astronomy_summary">Dyb rød for at bevare nattesyn</string>
+  <string name="live_display_color_profile_photography_title">Fotografi</string>
+  <string name="live_display_color_profile_photography_summary">Perfekt farvegengivelse for fotos</string>
+  <string name="live_display_color_profile_basic_title">Grundlæggende</string>
+  <string name="live_display_color_profile_basic_summary">Brug skærmen ukalibreret</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikon for valg</string>
   <string name="ime_switcher_notify_summary">Vis ikon til valg af input-metode</string>
@@ -869,7 +895,9 @@
   <!-- label for application name -->
   <string name="app_name_label_cm">App:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Sidst anvendt:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Brugstid:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Dette vil slette alle data fra din tablet\'s <b>interne lager</b>, inklusiv:\n\n<li>Dine enheds-konti</li>\n<li>System og app-data samt indstillinger</li>\n<li>Hentede apps</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -886,10 +914,15 @@
   <string name="factory_reset_warning_text_reset_now">NULSTIL NU</string>
   <string name="factory_reset_warning_text_message">Alle dine konti, apps, app data og systemindstillinger vil blive fjernet fra denne enhed. Dette kan ikke fortrydes.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Andet</string>
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">Aldrig</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minut</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutter</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutter</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Animeret låseskærm</string>
   <!-- Live lock screen summary -->
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Indstillinger</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 2b2f443..c5991fa 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Datenverbindung</string>
   <string name="toggleSync">Daten automatisch synchronisieren</string>
   <string name="toggle2g3g4g">Bevorzugter Netzwerktyp</string>
+  <string name="toggle2g3g4g_msim">Bevorzugter Netzwerktyp (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">WLAN-Ländercode</string>
@@ -792,7 +793,7 @@
   <string name="voice_wakeup_retrain_title">Stimme neu lernen</string>
   <string name="voice_wakeup_activity_title">Auszuführende Aktion</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">Um eine Direktwahl auszuführen, benötigt \"Voice Wakeup\" die Berechtigung, Anrufe auszuführen.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Um eine Direktwahl auszuführen, benötigt \"Mit Stimme wecken\" die Berechtigung, Anrufe auszuführen.</string>
   <string name="picker_activities">Aktivitäten</string>
   <string name="select_custom_app_title">Benutzerdefinierte Anwendung auswählen</string>
   <string name="select_custom_activity_title">Benutzerdefinierte Aktivität auswählen</string>
@@ -861,7 +862,6 @@
   <string name="menu_hidden_apps_delete">Zurücksetzen</string>
   <string name="menu_hidden_apps_reset_lock">Sperrmuster zurücksetzen</string>
   <string name="protected_apps">Geschützte Apps</string>
-  <string name="protected_apps_summary">Verwalten Sie, welche Anwendungen hinter einer sicheren Sperre verborgen sind</string>
   <string name="saving_protected_components">Geschützte Komponenten werden gespeichert\u2026</string>
   <string name="pa_login_username_hint">Benutzername (E-Mail)</string>
   <string name="pa_login_password_hint">Passwort</string>
@@ -993,4 +993,5 @@
   <string name="battery_info_status_charging_dock_ac">Laden über Ladedock</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laden über USB-Dock</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 7d50dde..fa8987e 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -17,6 +17,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">Απομένει <xliff:g id="step_count">%1$d</xliff:g> βήμα για να ενεργοποιήσετε τις ρυθμίσεις για προγραμματιστές.</item>
+    <item quantity="other">Απομένουν <xliff:g id="step_count">%1$d</xliff:g> βήματα για να ενεργοποιήσετε τις ρυθμίσεις για προγραμματιστές.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Ενεργοποιήσατε τις ρυθμίσεις για προγραμματιστές!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
@@ -994,4 +998,9 @@
   <string name="battery_info_status_charging_dock_ac">Φόρτιση με AC βάσης σύνδεσης</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Φόρτιση μέσω USB βάσης σύνδεσης</string>
+  <string name="restrict_app_wlan_title">Απενεργοποίηση χρήσης Wi\u2011Fi για την εφαρμογή</string>
+  <string name="restrict_app_wlan_summary">Αποτροπή εφαρμογής από τη χρήση σύνδεσης Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Απενεργοποίηση χρήσης δεδομένων για την εφαρμογή</string>
+  <string name="restrict_app_cellular_summary">Αποτροπή εφαρμογής από τη χρήση δεδομένων κινητής τηλεφωνίας</string>
+  <string name="privacy_guard_internet_category">Διαδίκτυο</string>
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index d5d0f10..b9d686a 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -225,7 +225,6 @@
   <!-- Anonymous Statistics - Preview -->
   <!-- Protected apps lockpattern reset button -->
   <!-- Protected Apps -->
-  <string name="protected_apps_summary">Administrar aplicaciones que se ocultan detrás de un bloqueo seguro</string>
   <string name="pa_pattern_or_fingerprint_header">Debe dibujar el patrón o utilizar huellas digitales para desbloquear</string>
   <!-- Contributors cloud activity -->
   <string name="contributor_info_msg">
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 034e837..1b36f48 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">Restablecer</string>
   <string name="menu_hidden_apps_reset_lock">Restablecer patrón de bloqueo</string>
   <string name="protected_apps">Aplicaciones protegidas</string>
-  <string name="protected_apps_summary">Administrar aplicaciones que se ocultan detrás de un bloqueo seguro</string>
   <string name="saving_protected_components">Guardar el estado del componente\u2026</string>
   <string name="pa_login_username_hint">Usuario (correo electrónico)</string>
   <string name="pa_login_password_hint">Contraseña</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 5b1d20f..435b230 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Conexión de datos</string>
   <string name="toggleSync">Sincronización automática</string>
   <string name="toggle2g3g4g">Tipo de red preferido</string>
+  <string name="toggle2g3g4g_msim">Tipo de red preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Código de región Wi\u2011Fi</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Cargando en base de CA</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
+  <string name="restrict_app_wlan_title">Desactivar el uso de la aplicación Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Prevenir que la aplicación utilice conexión de datos de Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Desactivar el uso de la red celular</string>
+  <string name="restrict_app_cellular_summary">Prevenir que la aplicación utilice conexión de datos</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index ef038f9..4fc6130 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Datu konexioa</string>
   <string name="toggleSync">Automatikoki sinkronizatu datuak</string>
   <string name="toggle2g3g4g">Sare mota hobetsia</string>
+  <string name="toggle2g3g4g_msim">Hobetsitako sare mota (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi lurralde kodea</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Oinarriaren kargadorearekin kargatzen</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Oinarriaren USBaren bitartez kargatzen</string>
+  <string name="restrict_app_wlan_title">Desgaitu aplikazioaren Wi\u2011Fi erabilera</string>
+  <string name="restrict_app_wlan_summary">Eragotzi aplikazioari Wi\u2011Fi datu konexioa erabiltzea</string>
+  <string name="restrict_app_cellular_title">Desgaitu aplikazioaren datu mugikorren erabilera</string>
+  <string name="restrict_app_cellular_summary">Eragotzi aplikazioari datu mugikorren konexioa erabiltzea</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index de2708b..28dbd00 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Datayhteys</string>
   <string name="toggleSync">Tietojen automaattinen synkronointi</string>
   <string name="toggle2g3g4g">Ensisijainen verkkotila</string>
+  <string name="toggle2g3g4g_msim">Ensisijainen verkkotila (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi\u2011aluekoodi</string>
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Ladataan telakan laturilla</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Ladataan telakan USB:n kautta</string>
+  <string name="restrict_app_wlan_title">Poista sovelluksen Wi\u2011Fi:n käyttö</string>
+  <string name="restrict_app_wlan_summary">Estä sovellusta käyttämästä Wi\u2011Fi-yhteyttä</string>
+  <string name="restrict_app_cellular_title">Estä sovelluksen mobiilidatan käyttö</string>
+  <string name="restrict_app_cellular_summary">Estä sovellusta käyttämästä mobiilidatayhteyttä</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 8e7259d..5b82dfb 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -862,7 +862,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="menu_hidden_apps_delete">Réinitialiser</string>
   <string name="menu_hidden_apps_reset_lock">Réinitialiser schéma de déverrouillage</string>
   <string name="protected_apps">Applications protégées</string>
-  <string name="protected_apps_summary">Gérer les applications sécurisées</string>
   <string name="saving_protected_components">Enregistrement de l\'état du composant\u2026</string>
   <string name="pa_login_username_hint">Nom d\'utilisateur (e-mail)</string>
   <string name="pa_login_password_hint">Mot de passe</string>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index c7b400a..3dd9deb 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">ફરીથી સેટ કરો</string>
   <string name="menu_hidden_apps_reset_lock">પૅટર્ન લૉક રિસેટ કરો</string>
   <string name="protected_apps">સુરક્ષિત એપ્લિકેશન્સ</string>
-  <string name="protected_apps_summary">સુરક્ષિત લૉક પાછળ કયા ઍપ્લિકેશનો છૂપાયેલ છે તે મેનેજ કરો</string>
   <string name="saving_protected_components">કમ્પોનન્ટ સ્થિતિ સેવ થાય છે\u2026</string>
   <string name="pa_login_username_hint">વપરાશકર્તાનામ (ઇમેઇલ)</string>
   <string name="pa_login_password_hint">પાસવર્ડ</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 0e1320a..74118bc 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -166,6 +166,7 @@
   <string name="toggleData">Podatkovna veza</string>
   <string name="toggleSync">Automatska sinkronizacija podataka</string>
   <string name="toggle2g3g4g">Preferirana mreža</string>
+  <string name="toggle2g3g4g_msim">Željena vrsta mreže (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi‑Fi regija</string>
@@ -862,7 +863,7 @@
   <string name="menu_hidden_apps_delete">Resetiraj</string>
   <string name="menu_hidden_apps_reset_lock">Ponovno postavi uzorak</string>
   <string name="protected_apps">Zaštićene aplikacije</string>
-  <string name="protected_apps_summary">Upravljajte koja je aplikacija sakrivena iza sigurnosnog zaključavanja</string>
+  <string name="protected_apps_summary">Upravljanje aplikacijama koje su skrivene iza sigurnog zaključavanja</string>
   <string name="saving_protected_components">Spremanje stanja komponenata\u2026</string>
   <string name="pa_login_username_hint">Korisničko ime (email)</string>
   <string name="pa_login_password_hint">Lozinka</string>
@@ -994,4 +995,9 @@
   <string name="battery_info_status_charging_dock_ac">Punjenje na AC punjaču</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Punjenje preko USB-a</string>
+  <string name="restrict_app_wlan_title">Onemogući aplikaciji korištenje Wi-Fi-ja</string>
+  <string name="restrict_app_wlan_summary">Spriječi aplikaciju da koristi Wi-Fi podatkovnu vezu</string>
+  <string name="restrict_app_cellular_title">Onemogući aplikaciji mobilno korištenje</string>
+  <string name="restrict_app_cellular_summary">Spriječi aplikaciju da koristi mobilnu podatkovnu vezu</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 370fc6b..56f4245 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">Visszaállítás</string>
   <string name="menu_hidden_apps_reset_lock">Minta visszaállítása</string>
   <string name="protected_apps">Védett alkalmazások</string>
-  <string name="protected_apps_summary">A biztonsági zár mögötti rejtett alkalmazások kezelése</string>
   <string name="saving_protected_components">Összetevő állapotának mentése\u2026</string>
   <string name="pa_login_username_hint">Felhasználónév (e-mail)</string>
   <string name="pa_login_password_hint">Jelszó</string>
diff --git a/res/values-in/cm_plurals.xml b/res/values-in/cm_plurals.xml
deleted file mode 100644
index 692d77d..0000000
--- a/res/values-in/cm_plurals.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-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">
-  <plurals name="backlight_timeout_time">
-    <item quantity="other"><xliff:g id="detik">%d</xliff:g> detik</item>
-  </plurals>
-  <plurals name="app_ops_count">
-    <item quantity="other">%d kali</item>
-  </plurals>
-</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 773f7bc..7e21bf5 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -17,780 +17,141 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
-  <plurals name="show_dev_countdown_cm">
-    <item quantity="other">Anda sekarang <xliff:g id="step_count">%1$d</xliff:g> beberapa langkah dari mengaktifkan opsi pengembang.</item>
-  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">Anda telah mengaktifkan opsi pengembang!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan mengaktifkan opsi pengembang.</string>
   <!-- Launch Dev Tools -->
-  <string name="development_tools_title">Alat pengembangan</string>
   <!-- Development shortcut -->
-  <string name="development_shortcut_title">Pintasan pengembangan</string>
-  <string name="development_shortcut_summary">Aktifkan pintasan manajemen aplikasi dalam daftar aplikasi terakhir</string>
   <!-- Setting checkbox title for root access -->
-  <string name="root_access">Akses root</string>
-  <string name="root_access_warning_title">Izinkan akses root?</string>
-  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses root sangat berbahaya dan dapat membahayakan keamanan sistem anda!</string>
-  <string name="root_access_none">Dinonaktifkan</string>
-  <string name="root_access_apps">Aplikasi saja</string>
-  <string name="root_access_adb">ADB saja</string>
-  <string name="root_access_all">Aplikasi dan ADB</string>
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versi CyanogenMod</string>
-  <string name="mod_version_default">Tidak diketahui</string>
   <!-- About phone screen, Device model -->
-  <string name="device_model">Model perangkat</string>
   <!-- About phone screen, Device name -->
-  <string name="device_name">Nama perangkat</string>
   <!-- About phone screen, CyanogenMod Api Level -->
-  <string name="mod_api_level_default">Tidak diketahui</string>
   <!-- About phone screen, build date -->
-  <string name="build_date">Tanggal pembuatan</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Pembaruan CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Perbarui recovery Cyanogen</string>
-  <string name="update_recovery_summary">Perbarui recovery dengan pembaruan sistem</string>
-  <string name="update_recovery_on_warning">PERHATIAN: Saat fitur ini diaktifkan, recovery yang terpasang akan digantikan oleh salah satu yang disertakan dengan versi terbaru dari OS yang berjalan.\n\nRecovery anda akan diperbarui bersama dengan pembaruan sistem anda, untuk membantu memastikan kompatibilitas dengan versi mendatang.\n\nApakah anda ingin mengaktifkan fitur ini?</string>
-  <string name="update_recovery_off_warning">PERINGATAN: Bila fitur ini dinonaktifkan, recovery yang terpasang tidak akan diperbarui saat pembaruan OS.\n\nPembaruan OS mendatang mungkin tidak dapat dipasang dengan recovery lama atau versi recovery kustom.\n\nApakah Anda benar-benar ingin menonaktifkan fitur ini?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
-  <string name="themes_settings_title">Tema</string>
   <!-- Sound settings screen -->
-  <string name="ring_mode_title">Mode dering</string>
-  <string name="ring_mode_normal">Normal</string>
-  <string name="ring_mode_vibrate">Getar</string>
-  <string name="ring_mode_mute">Diam</string>
-  <string name="settings_reset_button">Kembalikan</string>
   <!-- Profiles settings  -->
-  <string name="profiles_settings_title">Profil sistem</string>
-  <string name="profiles_add">Tambah</string>
-  <string name="profile_menu_delete">Hapus</string>
-  <string name="profile_settings_title">Profil</string>
-  <string name="profile_empty_list_profiles_off">Untuk mengkonfigurasi dan menggunakan sistem profil, Aktifkan profil.</string>
-  <string name="profile_trigger_configure">Mengkonfigurasi trigger</string>
-  <string name="profile_write_nfc_tag">Tulis ke tag NFC</string>
-  <string name="profile_write_touch_tag">Sentuh tag untuk menulis</string>
-  <string name="profile_write_success">Tag berhasil ditulis</string>
-  <string name="profile_write_failed">Tag gagal ditulis!</string>
-  <string name="profile_selected">Profil yang dipilih: %1$s</string>
-  <string name="profile_nfc_text">Menulis sebuah profil untuk NFC tag memungkinkan untuk men-tap tag untuk memilih profil. Tap kedua kalinya akan memilih profil yang dipilih sebelumnya.</string>
-  <string name="profile_unknown_nfc_tag">Profil tidak diketahui</string>
-  <string name="profile_add_nfc_text">Tag NFC ini mengacu pada profil yang tidak diketahui. Melampirkan tag NFC ini ke profil yang ada akan memungkinkan untuk memilih profil di masa depan.</string>
-  <string name="profile_select">Pilih profil</string>
-  <string name="profile_remove_dialog_message">Hapus profil %1$s?</string>
-  <string name="profile_populate_profile_from_state">Konfigurasi profil menggunakan pengaturan perangkat saat ini?</string>
-  <string name="profile_menu_fill_from_state">Impor pengaturan perangkat saat ini</string>
-  <string name="profile_remove_current_profile">Tidak dapat menghapus profil saat ini!</string>
-  <string name="profile_app_group_category_title">Menimpa pemberitahuan</string>
-  <string name="profile_app_group_item_instructions">Tambah atau hapus grup</string>
-  <string name="profile_app_group_item_instructions_summary">Tambah atau hapus penimpa pemberitahuan grup aplikasi ke profil ini</string>
   <!-- Profile mode options. -->
-  <string name="profile_entries_on">Aktif</string>
-  <string name="profile_entries_off">Nonaktif</string>
-  <string name="profile_entries_no_override">Tidak menimpa</string>
   <!-- Add Profile -->
-  <string name="profile_name_title">Nama</string>
-  <string name="new_profile_name">&lt;profil baru&gt;</string>
   <!-- Rename Dialog  -->
-  <string name="rename_dialog_title">Ganti nama</string>
-  <string name="rename_dialog_message">Masukkan nama baru</string>
-  <string name="duplicate_appgroup_name">Nama grup aplikasi ada yang sama!</string>
-  <string name="rename_dialog_hint">Masukkan nama profil</string>
   <!-- Reset Profiles -->
-  <string name="profile_reset_title">Set ulang</string>
   <!-- Delete confimation messages -->
-  <string name="profile_app_delete_confirm">Hapus aplikasi ini?</string>
   <!-- Profile network mode -->
-  <string name="profile_networkmode_2g">2G</string>
-  <string name="profile_networkmode_3g">3G</string>
-  <string name="profile_networkmode_4g">LTE</string>
-  <string name="profile_networkmode_2g3g">2G/3G</string>
-  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
-  <string name="profile_volumeoverrides_title">Menimpa volume</string>
-  <string name="connection_state_enabled">Aktifkan</string>
-  <string name="volume_override_summary">Set ke %1$s/%2$s</string>
-  <string name="profile_volume_override_checkbox_label">Timpa volume</string>
   <!-- Menu item for managing profiles -->
-  <string name="profile_profiles_manage">Profil</string>
-  <string name="profile_profile_manage">Kelola profil</string>
-  <string name="profile_appgroups_manage">Grup aplikasi</string>
-  <string name="profile_appgroup_manage">Kelola grup aplikasi</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <string name="profile_settings">Pengaturan profil</string>
-  <string name="profile_trigger_connect">Saat terhubung</string>
-  <string name="profile_trigger_disconnect">Saat diputuskan</string>
-  <string name="profile_trigger_notrigger">Tidak ada trigger</string>
   <!-- Profile Settings sound modes labels -->
-  <string name="sound_mode">Modus pemberitahuan</string>
-  <string name="ringer_mode">Modus dering</string>
-  <string name="lights_mode">Modus lampu</string>
-  <string name="vibrate_mode">Modus getar</string>
-  <string name="choose_soundtone">Pilih nada pemberitahuan</string>
-  <string name="choose_ringtone">Pilih nada dering</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <string name="soundtone_title">Nada pemberitahuan</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grup aplikasi</string>
-  <string name="profile_applist_title">Aplikasi</string>
-  <string name="profile_new_appgroup">Grup aplikasi baru</string>
-  <string name="profile_delete_appgroup">Hapus grup aplikasi ini?</string>
-  <string name="profile_appgroup_name_prompt">Masukkan nama untuk grup aplikasi baru</string>
-  <string name="profile_appgroup_name_title">Nama</string>
   <!-- Add application dialog box title -->
-  <string name="profile_choose_app">Pilih aplikasi</string>
   <!-- Profiles - system settings -->
-  <string name="profile_system_settings_title">Pengaturan aplikasi</string>
-  <string name="profile_lockmode_title">Mode layar kunci</string>
-  <string name="profile_lockmode_policy_disabled_summary">Opsi profil ini dinonaktifkan oleh kebijakan administrator perangkat</string>
-  <string name="profile_lockmode_insecure_summary">Jangan meminta PIN atau sandi</string>
-  <string name="profile_lockmode_disabled_summary">Nonaktifkan layar kunci</string>
-  <string name="profile_airplanemode_title">Mode pesawat</string>
-  <string name="profile_brightness_title">Kecerahan layar</string>
-  <string name="profile_brightness_override_summary">Setel ke %1$d%%</string>
-  <string name="profile_brightness_override_checkbox_label">Ganti kecerahan</string>
   <!-- Connection override toggles (not all are used at this time ) -->
-  <string name="toggleWifi">Wi\u2011Fi</string>
-  <string name="toggleWifiAp">Hotspot Wi\u2011Fi portabel</string>
-  <string name="toggleBluetooth">Bluetooth</string>
-  <string name="toggleGPS">GPS</string>
-  <string name="toggleData">Sambungan data</string>
-  <string name="toggleSync">Otomatis sinkron data</string>
-  <string name="toggle2g3g4g">Pilihan jenis jaringan</string>
-  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
-  <string name="wifi_setting_countrycode_title">Kode negara Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">Tentukan kode negara untuk Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
-  <string name="wifi_setting_countrycode_error">Ada masalah saat mengatur kode negara.</string>
   <!-- Profiles -->
-  <string name="profile_menu_delete_title">Hapus</string>
-  <string name="profile_action_none">Tinggalkan tanpa perubahan</string>
-  <string name="profile_action_system">Standar sistem</string>
-  <string name="profile_action_disable">Matikan</string>
-  <string name="profile_action_enable">Hidupkan</string>
-  <string name="profile_trigger_a2dp_connect">Pada saat A2DP terhubung</string>
-  <string name="profile_trigger_a2dp_disconnect">Pada saat A2DP diputuskan</string>
-  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
-  <string name="profile_tabs_bluetooth">Bluetooth</string>
-  <string name="profile_tabs_nfc">NFC</string>
-  <string name="profile_triggers_header">Pemicu yang akan mengaktifkan profil ini</string>
-  <string name="profile_setup_setup_triggers_title">Langkah 1: Tambahkan pemicu</string>
-  <string name="profile_setup_setup_triggers_title_config">Modifikasi pemicu: <xliff:g id="profile_name">%1$s</xliff:g></string>
-  <string name="profile_setup_actions_title">Langkah 2: Pengaturan tindakan</string>
-  <string name="profile_setup_actions_title_config">Konfigurasikan ulang tindakan</string>
-  <string name="profile_appgroups_manage">Grup aplikasi</string>
-  <string name="profile_appgroup_manage">Kelola grup aplikasi</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grup aplikasi</string>
-  <string name="profile_new_appgroup">Grup aplikasi baru</string>
-  <string name="profile_delete_appgroup">Hapus grup aplikasi ini?</string>
-  <string name="profile_appgroup_name_prompt">Masukkan nama untuk grup aplikasi baru</string>
-  <string name="profile_appgroup_name_title">Nama</string>
-  <string name="duplicate_appgroup_name">Nama grup aplikasi ada yang sama!</string>
-  <string name="profile_app_delete_confirm">Hapus aplikasi ini?</string>
-  <string name="no_bluetooth_triggers">Tidak ada perangkat Bluetooth yang dipasangkan.\nTap untuk memasang perangkat Bluetooth sebelum mengkonfigurasi pemicu.</string>
-  <string name="no_wifi_triggers">Tidak ada akses poin Wi\u2011Fi yang dikonfigurasi.\nTap untuk menghubungkan Wi\u2011Fi sebelum mengkonfigurasi pemicu.</string>
-  <string name="no_triggers_configured">Tidak ada pemicu yang dikonfigurasi. Tap untuk menambahkan lebih banyak.</string>
-  <string name="no_triggers_configured_nfc">Tap untuk memicu setup NFC baru.</string>
-  <string name="profile_setup_setup_triggers_description">Silakan pilih pemicu yang akan mengaktifkan profil ini</string>
-  <string name="profile_setup_actions_description">Sekarang konfigurasi apa yang terjadi saat profil tersebut diaktifkan</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">Bar navigasi</string>
-  <string name="navigation_bar_left_title">Mode tangan kiri</string>
-  <string name="navigation_bar_left_summary">Tempatkan panel navigasi di sebelah kiri layar dalam mode landscape</string>
-  <string name="navigation_bar_title">Tombol dan tata letak</string>
-  <string name="navigation_bar_help_text">Untuk memulai tekan ikon ubah untuk membuka bar navigasi untuk diubah.\n\nAnda dapat menekan sebuah ikon untuk merubah pintasan, atau tnkan lama sebuah ikon untuk menata kembali tata letaknya.\n\nTekan \'Simpan\' untuk melakukan perubahan, atau \'Kembalikan semula\' untuk mengatur tata letak ke pengaturan standar.</string>
-  <string name="navigation_restore_button_text">Kembalikan\ndefault</string>
-  <string name="navigation_edit_button_text">Ubah</string>
-  <string name="navigation_save_button_text">Simpan</string>
-  <string name="navigation_bar_reset_message">Hapus pengaturan saat ini dan kembalikan tata letak default?</string>
-  <string name="navigation_bar_arrow_keys_title">Tampilkan tombol panah saat mengetik</string>
-  <string name="navigation_bar_arrow_keys_summary">Tampilkan tombol kursor kiri dan kanan saat mengetik. Menggantikan pengubah IME.</string>
-  <string name="navigation_bar_recents_title">Tindakan tekan lama recents</string>
   <!-- Notification light dialogs -->
-  <string name="edit_light_settings">Ubah pengaturan lampu</string>
-  <string name="pulse_speed_title">Lama dan kecepatan kedipan</string>
-  <string name="default_time">Normal</string>
-  <string name="custom_time">Kustom</string>
-  <string name="dialog_delete_title">Hapus</string>
-  <string name="dialog_delete_message">Hapus item yang dipilih?</string>
   <!-- Values for the notification light pulse spinners -->
-  <string name="pulse_length_always_on">Selalu aktif</string>
-  <string name="pulse_length_very_short">Sangat singkat</string>
-  <string name="pulse_length_short">Singkat</string>
-  <string name="pulse_length_normal">Normal</string>
-  <string name="pulse_length_long">Panjang</string>
-  <string name="pulse_length_very_long">Sangat panjang</string>
-  <string name="pulse_speed_very_fast">Sangat cepat</string>
-  <string name="pulse_speed_fast">Cepat</string>
-  <string name="pulse_speed_normal">Normal</string>
-  <string name="pulse_speed_slow">Lambat</string>
-  <string name="pulse_speed_very_slow">Sangat lambat</string>
   <!-- Battery light settings -->
-  <string name="battery_light_title">Lampu baterai</string>
-  <string name="battery_low_pulse_title">Kedip jika baterai rendah</string>
-  <string name="battery_light_list_title">Warna</string>
-  <string name="battery_light_low_color_title">Baterai lemah</string>
-  <string name="battery_light_medium_color_title">Pengisian Daya</string>
-  <string name="battery_light_full_color_title">Terisi penuh</string>
   <!-- Lights settings screen, notification light settings -->
-  <string name="notification_light_title">Lampu notifikasi</string>
-  <string name="notification_light_general_title">Umum</string>
-  <string name="notification_light_applist_title">Apl</string>
-  <string name="notification_light_phonelist_title">Telepon</string>
-  <string name="notification_light_use_custom">Gunakan nilai lain</string>
-  <string name="notification_light_default_value">Standar</string>
-  <string name="notification_light_missed_call_title">Panggilan tak terjawab</string>
-  <string name="notification_light_voicemail_title">Pesan suara</string>
   <!-- Lights settings, LED notification -->
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
-  <string name="enable_adb_cm">Android debugging</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">Aktifkan antarmuka Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
-  <string name="adb_over_network">ADB melalui jaringan</string>
-  <string name="adb_over_network_summary">Aktifkan TCP/IP debug melalui antarmuka jaringan (Wi-Fi, jaringan USB). Pengaturan ini direset pada saat dinyalakan ulang</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">PERINGATAN: Ketika ADB melalui jaringan diaktifkan, ponsel Anda terbuka untuk intrusi pada semua jaringan yang terhubung!\n\nHanya gunakan fitur ini ketika Anda terhubung pada jaringan dipercaya\n\nApakah Anda benar-benar ingin mengaktifkan fungsi ini?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
-  <string name="adb_notify">Pemberitahuan debugging</string>
-  <string name="adb_notify_summary">Tampilkan pemberitahuan bila USB atau jaringan debugging diaktifkan</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
-  <string name="app_ops_categories_location">Lokasi</string>
-  <string name="app_ops_categories_personal">Pribadi</string>
-  <string name="app_ops_categories_messaging">Pesan</string>
-  <string name="app_ops_categories_media">Media</string>
-  <string name="app_ops_categories_device">Perangkat</string>
-  <string name="app_ops_categories_bootup">Bootup</string>
-  <string name="app_ops_categories_su">Akses root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
-  <string name="app_ops_summaries_coarse_location">lokasi yang kasar</string>
-  <string name="app_ops_summaries_fine_location">Lokasi bagus</string>
-  <string name="app_ops_summaries_gps">GPS</string>
-  <string name="app_ops_summaries_vibrate">getar</string>
-  <string name="app_ops_summaries_read_contacts">membaca kontak</string>
-  <string name="app_ops_summaries_modify_contacts">mengubah kontak</string>
-  <string name="app_ops_summaries_read_call_log">Baca log panggilan</string>
-  <string name="app_ops_summaries_modify_call_log">memodifikasi log panggilan</string>
-  <string name="app_ops_summaries_read_calendar">membaca kalender</string>
-  <string name="app_ops_summaries_modify_calendar">mengubah kalender</string>
-  <string name="app_ops_summaries_cell_scan">scan cell</string>
-  <string name="app_ops_summaries_call_phone">panggilan telepon</string>
-  <string name="app_ops_summaries_read_sms">baca SMS</string>
-  <string name="app_ops_summaries_write_sms">tulis SMS</string>
-  <string name="app_ops_summaries_receive_sms">menerima SMS</string>
-  <string name="app_ops_summaries_receive_emergency_sms">menerima SMS darurat</string>
-  <string name="app_ops_summaries_receive_mms">menerima MMS</string>
-  <string name="app_ops_summaries_receive_wap_push">menerima WAP push</string>
-  <string name="app_ops_summaries_send_sms">mengirim SMS</string>
-  <string name="app_ops_summaries_read_icc_sms">membaca ICC SMS</string>
-  <string name="app_ops_summaries_write_icc_sms">menulis ICC SMS</string>
-  <string name="app_ops_summaries_modify_settings">mengubah pengaturan</string>
-  <string name="app_ops_summaries_draw_on_top">draw di atas</string>
-  <string name="app_ops_summaries_access_notifications">akses pemberitahuan</string>
-  <string name="app_ops_summaries_camera">kamera</string>
-  <string name="app_ops_summaries_record_audio">merekam audio</string>
-  <string name="app_ops_summaries_play_audio">putar audio</string>
-  <string name="app_ops_summaries_read_clipboard">baca clipboard</string>
-  <string name="app_ops_summaries_modify_clipboard">memodifikasi clipboard</string>
-  <string name="app_ops_summaries_media_buttons">tombol media</string>
-  <string name="app_ops_summaries_audio_focus">fokus audio</string>
-  <string name="app_ops_summaries_master_volume">volume master</string>
-  <string name="app_ops_summaries_voice_volume">volume suara</string>
-  <string name="app_ops_summaries_ring_volume">volume dering</string>
-  <string name="app_ops_summaries_media_volume">volume media</string>
-  <string name="app_ops_summaries_alarm_volume">volume alarm</string>
-  <string name="app_ops_summaries_notification_volume">volume pemberitahuan</string>
-  <string name="app_ops_summaries_keep_awake">tetap terjaga</string>
-  <string name="app_ops_summaries_monitor_location">memantau lokasi</string>
-  <string name="app_ops_summaries_monitor_high_power_location">memantau lokasi daya tinggi</string>
-  <string name="app_ops_summaries_mute_unmute_microphone">diam/mengaktifkan suara mikrofon</string>
-  <string name="app_ops_summaries_toast_window">tampilkan toast</string>
-  <string name="app_ops_summaries_project_media">proyek media</string>
-  <string name="app_ops_summaries_activate_vpn">aktifkan VPN</string>
-  <string name="app_ops_summaries_superuser">akses root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
-  <string name="app_ops_labels_gps">GPS</string>
-  <string name="app_ops_labels_vibrate">Getar</string>
-  <string name="app_ops_labels_read_contacts">Baca kontak</string>
-  <string name="app_ops_labels_modify_contacts">Mengubah kontak</string>
-  <string name="app_ops_labels_read_call_log">Baca log panggilan</string>
-  <string name="app_ops_labels_modify_call_log">Ubah log panggilan</string>
-  <string name="app_ops_labels_read_calendar">Baca kalender</string>
-  <string name="app_ops_labels_modify_calendar">Ubah kalender</string>
-  <string name="app_ops_labels_notification">Pemberitahuan/Toast</string>
-  <string name="app_ops_labels_call_phone">Panggilan Telepon</string>
-  <string name="app_ops_labels_receive_sms">Menerima SMS</string>
-  <string name="app_ops_labels_receive_mms">Menerima MMS</string>
-  <string name="app_ops_labels_send_sms">Kirim SMS</string>
-  <string name="app_ops_labels_modify_settings">Ubah pengaturan</string>
-  <string name="app_ops_labels_draw_on_top">Gambar di atas</string>
-  <string name="app_ops_labels_access_notifications">Akses pemberitahuan</string>
-  <string name="app_ops_labels_camera">Kamera</string>
-  <string name="app_ops_labels_record_audio">Rekam audio</string>
-  <string name="app_ops_labels_play_audio">Putar audio</string>
-  <string name="app_ops_labels_read_clipboard">Baca clipboard</string>
-  <string name="app_ops_labels_modify_clipboard">Ubah clipboard</string>
-  <string name="app_ops_labels_media_buttons">Tombol media</string>
-  <string name="app_ops_labels_audio_focus">Fokus audio</string>
-  <string name="app_ops_labels_master_volume">Volume utama</string>
-  <string name="app_ops_labels_voice_volume">Volume suara</string>
-  <string name="app_ops_labels_ring_volume">Volume dering</string>
-  <string name="app_ops_labels_media_volume">Volume media</string>
-  <string name="app_ops_labels_alarm_volume">Volume Alarm</string>
-  <string name="app_ops_labels_notification_volume">Volume pemberitahuan</string>
-  <string name="app_ops_labels_bluetooth_volume">Volume bluetooth</string>
-  <string name="app_ops_labels_keep_awake">tetap terjaga</string>
-  <string name="app_ops_labels_mute_unmute_microphone">Diam/mengaktifkan suara mikrofon</string>
-  <string name="app_ops_labels_toast_window">tampilkan toast</string>
-  <string name="app_ops_labels_project_media">proyek media</string>
-  <string name="app_ops_labels_activate_vpn">aktifkan VPN</string>
-  <string name="app_ops_labels_superuser">Akses root</string>
   <!-- App ops permissions -->
-  <string name="app_ops_permissions_allowed">Diperbolehkan</string>
-  <string name="app_ops_permissions_ignored">Diabaikan</string>
-  <string name="app_ops_permissions_always_ask">Selalu tanya</string>
   <!-- App ops detail -->
-  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (digunakan <xliff:g id="count">%2$s</xliff:g>)</string>
-  <string name="app_ops_allowed_count">Perbolehkan <xliff:g id="count" example="2 times">%s</xliff:g></string>
-  <string name="app_ops_ignored_count">Ditolak <xliff:g id="count" example="2 times">%s</xliff:g></string>
-  <string name="app_ops_both_count">Diperbolehkan <xliff:g id="count">%1$s</xliff:g>, ditolak <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
-  <string name="app_ops_show_user_apps">Tampilkan aplikasi pengguna</string>
-  <string name="app_ops_show_system_apps">Tampilkan aplikasi bawaan</string>
-  <string name="app_ops_reset_counters">Reset  izinkan/tolak counter</string>
-  <string name="app_ops_reset_confirm_title">Konfirmasi reset counter</string>
-  <string name="app_ops_reset_confirm_mesg">Apakah Anda yakin ingin mengatur ulang penghitung?</string>
-  <string name="ok">Oke</string>
   <!-- Hostname setting -->
-  <string name="device_hostname">Nama host perangkat</string>
-  <string name="unlock_scramble_pin_layout_title">Tata letak acak</string>
-  <string name="unlock_scramble_pin_layout_summary">Acak tata letak PIN saat membuka perangkat</string>
-  <string name="button_pref_title">Tombol</string>
-  <string name="hardware_keys_power_key_title">Tombol power</string>
-  <string name="hardware_keys_home_key_title">Tombol home</string>
-  <string name="hardware_keys_back_key_title">Tombol kembali</string>
-  <string name="hardware_keys_menu_key_title">Tombol menu</string>
-  <string name="hardware_keys_assist_key_title">Tombol cari</string>
-  <string name="hardware_keys_appswitch_key_title">Tombol recents</string>
-  <string name="hardware_keys_camera_key_title">Tombol kamera</string>
-  <string name="hardware_keys_volume_keys_title">Tombol volume</string>
-  <string name="hardware_keys_short_press_title">Tindakan tekan pendek tombol</string>
-  <string name="hardware_keys_long_press_title">Tindakan tekan lama tombol</string>
-  <string name="hardware_keys_double_tap_title">Tindakan dua kali tap tombol</string>
-  <string name="hardware_keys_action_nothing">Tidak ada tindakan</string>
-  <string name="hardware_keys_action_menu">Buka/Tutup menu</string>
-  <string name="hardware_keys_action_app_switch">Recent apps switcher</string>
-  <string name="hardware_keys_action_search">Search assistant</string>
-  <string name="hardware_keys_action_voice_search">Pencarian suara</string>
-  <string name="hardware_keys_action_in_app_search">Pencarian di dalam app</string>
-  <string name="hardware_keys_action_launch_camera">Buka kamera</string>
-  <string name="hardware_keys_action_sleep">Matikan layar</string>
-  <string name="hardware_keys_action_last_app">Aplikasi terakhir</string>
-  <string name="camera_sleep_on_release_title">Intip layar</string>
-  <string name="camera_sleep_on_release_summary">Tekan setengah akan menyalakan layar hanya saat tombol tertekan</string>
-  <string name="camera_launch_title">Luncurkan Kamera</string>
-  <string name="camera_launch_summary">Tekan lama dan lepas akan meluncurkan kamera</string>
-  <string name="volbtn_music_controls_title">Kontrol pemutaran</string>
-  <string name="volbtn_music_controls_summary">Ketika layar dimatikan, menekan dan menahan tombol volume akan mencari trek musik</string>
-  <string name="volbtn_cursor_control_title">Kendali kursor keyboard</string>
-  <string name="volbtn_cursor_control_off">Dinonaktifkan</string>
-  <string name="volbtn_cursor_control_on">Volume atas/bawah menggerakkan kursor kiri/kanan</string>
-  <string name="volbtn_cursor_control_on_reverse">Volume atas/bawah menggerakkan kursor kanan/kiri</string>
-  <string name="power_end_call_title">Akhir panggilan</string>
-  <string name="power_end_call_summary">Menekan tombol power akan mengakhiri panggilan aktif</string>
-  <string name="swap_volume_buttons_title">Reorientasi</string>
-  <string name="swap_volume_buttons_summary">Swap tombol volume ketika layar diputar</string>
-  <string name="button_wake_title">Bangunkan perangkat</string>
-  <string name="home_answer_call_title">Jawab panggilan</string>
-  <string name="home_answer_call_summary">Menekan tombol home akan menjawab panggilan masuk saat ini</string>
   <!-- Backlight brightness settings screen -->
-  <string name="adaptive_backlight_title">Lampu latar adaptif</string>
-  <string name="adaptive_backlight_summary">Sesuaikan dengan dinamis kecerahan lampu latar layar untuk memaksimalkan baterai sambil mempertahankan kegunaan</string>
   <!-- Sunlight readability enhancement screen -->
-  <string name="sunlight_enhancement_title">Peningkatan sinar matahari</string>
-  <string name="sunlight_enhancement_summary">Tingkatkan kecerahan tampilan dan keterbacaan di bawah sinar matahari cerah</string>
   <!-- Color enhancement settings screen -->
-  <string name="color_enhancement_title">Peningkatan warna</string>
-  <string name="color_enhancement_summary">Tingkatkan warna tampilan secara dinamis</string>
   <!-- Key backlight -->
-  <string name="button_backlight_title">Lampu latar</string>
-  <string name="button_backlight_enabled">Cahaya tombol</string>
-  <string name="keyboard_backlight_enabled">Cahaya keyboard</string>
-  <string name="button_backlight_seekbar_title">Tombol kecerahan</string>
-  <string name="keyboard_backlight_seekbar_title">Kecerahan keyboard</string>
-  <string name="backlight_timeout_title">Timeout iluminasi</string>
-  <string name="backlight_timeout_unlimited">Jangan Matikan</string>
-  <string name="backlight_summary_disabled">Dinonaktifkan</string>
-  <string name="backlight_summary_enabled_with_timeout">Diaktifkan untuk <xliff:g id="timeout">%s</xliff:g></string>
-  <string name="backlight_summary_enabled">Diaktifkan</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
-  <string name="gesture_settings_title">Gerakan</string>
   <!-- Power menu -->
-  <string name="power_menu_title">Menu power</string>
-  <string name="power_menu_reboot_title">Menu reboot</string>
-  <string name="power_menu_screenshot_title">Screenshot</string>
-  <string name="power_menu_airplane_title">Mode pesawat</string>
-  <string name="power_menu_users_title">Switcher pengguna</string>
-  <string name="power_menu_settings_title">Pintasan pengaturan</string>
-  <string name="power_menu_lockdown_title">Penguncian perangkat</string>
-  <string name="power_menu_bug_report_title">Laporan bug</string>
-  <string name="power_menu_sound_title">Panel suara</string>
-  <string name="power_menu_bug_report_disabled">Pelaporan bug dinonaktifkan dalam opsi pengembang</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">Aktifkan layar nav bar</string>
-  <string name="disable_navkeys_summary">Aktifkan layar navigasi bar dan menonaktifkan tombol hardware</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">Dua kali tap untuk sleep</string>
-  <string name="double_tap_to_sleep_summary">Ketuk dua kali pada status bar untuk mematikan tampilan</string>
   <!-- Proximity wake -->
-  <string name="proximity_wake_title">Mencegah bangun yang tidak disengaja</string>
-  <string name="proximity_wake_summary">Periksa sensor proximity sebelum membangunkan layar</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
-  <string name="wake_when_plugged_or_unplugged_title">Bangun saat pengisi daya di pasang</string>
-  <string name="wake_when_plugged_or_unplugged_summary">Aktifkan layar ketika menghubungkan atau melepaskan sumber daya</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
-  <string name="font_size_sample">Contoh</string>
   <!-- Volume settings - Volume adjustment sound -->
-  <string name="volume_adjust_sounds_title">Penyesuaian volume suara</string>
   <!-- Hardware tunables - Vibrator intensity -->
-  <string name="vibrator_intensity_title">Intensitas vibrator</string>
-  <string name="vibrator_warning">Nilai-nilai yang lebih tinggi daripada %1$d tidak direkomendasikan</string>
   <!-- Hardware tunables - Color calibration -->
-  <string name="color_calibration_title">Kalibrasi warna</string>
-  <string name="color_calibration_summary">Mengkalibrasi layar warna</string>
-  <string name="color_red_title">Merah</string>
-  <string name="color_green_title">Hijau</string>
-  <string name="color_blue_title">Biru</string>
   <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Kalibrasi gamma</string>
-  <string name="gamma_tuning_summary_head">Mengubah nilai gamma</string>
-  <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontras</string>
-  <string name="gamma_tuning_brightness">Kecerahan</string>
-  <string name="gamma_tuning_saturation">Saturasi</string>
   <!-- Launch music player when headset is connected -->
-  <string name="headset_connect_player_title">Jalankan aplikasi musik</string>
-  <string name="headset_connect_player_summary">Jalankan aplikasi musik bawaan saat headset tersambung</string>
   <!-- WiFi auto-configure priorities -->
-  <string name="wifi_auto_config_priorities">Prioritas otomatis</string>
-  <string name="auto_brightness_reset_button">Set ulang</string>
   <!-- Display : Rotation  -->
-  <string name="display_rotation_title">Rotasi</string>
-  <string name="display_rotation_disabled">Dinonaktifkan</string>
-  <string name="display_rotation_unit">derajat</string>
-  <string name="display_lockscreen_rotation_title">Putar layar kunci</string>
-  <string name="display_rotation_category_title">Mode rotasi</string>
-  <string name="display_rotation_0_title">0 derajat</string>
-  <string name="display_rotation_90_title">0 derajat</string>
-  <string name="display_rotation_180_title">180 derajat</string>
-  <string name="display_rotation_270_title">270 derajat</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Warna layar</string>
-  <string name="screencolor_summary">Menyetel warna layar, saturasi, kontras atau intensitas</string>
-  <string name="custom_screencolor">Warna layar kustom</string>
-  <string name="screencolor_save">Simpan</string>
-  <string name="screencolor_cancel">Batal</string>
-  <string name="restore_preview">Lihat gambar standar</string>
-  <string name="selectnewfile_menu">Lihat gambar baru dari Galeri</string>
-  <string name="selectfile_menu">Lihat gambar dari Galeri</string>
-  <string name="restore_default_str">Set ulang</string>
-  <string name="hue_str">Rona: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ambien untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
-  <string name="live_display_mode">Modus tampilan</string>
-  <string name="live_display_color_temperature_title">Suhu warna</string>
-  <string name="live_display_color_temperature_summary">Pagi: <xliff:g id="day_temperature">%1$d</xliff:g>K  Malam: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
-  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
-  <string name="live_display_day">Pagi</string>
-  <string name="live_display_night">Malam</string>
-  <string name="live_display_outdoor_mode_title">Modus luar ruangan otomatis</string>
-  <string name="live_display_outdoor_mode_summary">Meningkatkan kecerahan dan saturasi otomatis saat dibawah sinar matahari</string>
-  <string name="live_display_low_power_title">Mengurangi konsumsi daya</string>
-  <string name="live_display_low_power_summary">Menyesuaikain tampilan untuk konsumsi daya terendah tanpa degradasi</string>
-  <string name="live_display_enhance_color_title">Tingkatkan warna</string>
-  <string name="live_display_enhance_color_summary">Meningkatkan warna vibran dari corak terang, pemandangan dan gambar lain</string>
   <!-- Whether to display IME switcher notifcation -->
-  <string name="ime_switcher_notify">Ikon pemilih</string>
-  <string name="ime_switcher_notify_summary">Tampilkan ikon metode pemilih masukan</string>
   <!-- Heads up -->
-  <string name="heads_up_notifications">Heads up</string>
-  <string name="summary_heads_up_enabled">Pemberitahuan pop-up diaktifkan</string>
-  <string name="summary_heads_up_disabled">Pemberitahuan pop-up dinonaktifkan</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
-  <string name="bluetooth_accept_all_files">Terima semua jenis file</string>
   <!-- High touch sensitivity -->
-  <string name="high_touch_sensitivity_title">Kepekaan sentuh tinggi</string>
-  <string name="high_touch_sensitivity_summary">Tingkatkan kepekaan layar sentuh sehingga dapat digunakan saat mengenakan sarung tangan</string>
   <!-- Display & Lights screen, setting options for LCD density -->
-  <string name="lcd_density">Kerapatan LCD</string>
-  <string name="dialog_title_lcd_density">Kerapatan LCD</string>
-  <string name="lcd_density_value_format">%d DPI</string>
-  <string name="lcd_density_default_value_format">%d DPI (standar)</string>
-  <string name="restarting_ui">Me-restart UI\u2026</string>
   <!-- Stylus Icon -->
-  <string name="stylus_icon_enabled_title">Tampilkan ikon saat menggunakan stylus</string>
-  <string name="stylus_icon_enabled_summary">Tampilkan ikon pointer saat melayang atau menggambar dengan stylus</string>
   <!-- Stylus Gestures -->
-  <string name="gestures_settings_title">Gerakan stylus</string>
-  <string name="category_spen_title">Gerakan stylus</string>
-  <string name="enable_subcat_title">Stylus</string>
-  <string name="enable_spen_title_head">Aktifkan gerakan</string>
-  <string name="enable_spen_summary_head">Gunakan gerakan swipe dengan menekan tombol stylus</string>
-  <string name="gestures_subcat_title">Gerakan</string>
-  <string name="gestures_left_spen_title_head">Swipe kiri</string>
-  <string name="gestures_right_spen_title_head">Swipe kanan</string>
-  <string name="gestures_up_spen_title_head">Swipe atas</string>
-  <string name="gestures_down_spen_title_head">Swipe bawah</string>
-  <string name="gestures_long_spen_title_head">Tekan agak lama</string>
-  <string name="gestures_double_spen_title_head">Dua kali tap</string>
   <!-- Gestures Options -->
-  <string name="gestures_action_empty">Tidak ada tindakan</string>
-  <string name="gestures_action_home">Beranda</string>
-  <string name="gestures_action_back">Kembali</string>
-  <string name="gestures_action_menu">Menu</string>
-  <string name="gestures_action_search">Menjalankan Pencarian</string>
-  <string name="gestures_action_recent">Daftar aplikasi terakhir</string>
   <!-- Stylus gestures -->
-  <string name="stylus_app_not_installed">%s tidak terpasang</string>
   <!-- Touchscreen hovering -->
-  <string name="touchscreen_hovering_title">Layar sentuh melayang</string>
-  <string name="touchscreen_hovering_summary">Memberbolehkan anda untuk melayangkan layar seperti sebuah mouse dalam web browser, remote desktop, dll</string>
   <!-- Increasing ring tone volume -->
-  <string name="increasing_ring_volume_option_title">Meningkatkan volume dering</string>
-  <string name="increasing_ring_min_volume_title">Volume awal</string>
-  <string name="increasing_ring_ramp_up_time_title">Waktu ramp-up</string>
   <!-- LTO download data over wi-fi only -->
-  <string name="lto_download_data_wifi_only">Pengunduhan data berbantu GPS</string>
-  <string name="lto_download_data_wifi_only_on">Melalui jaringan apa pun</string>
-  <string name="lto_download_data_wifi_only_off">Hanya melalui jaringan Wi\u2011Fi</string>
-  <string name="category_calibration">Kalibrasi</string>
-  <string name="display_and_lights">Tampilan &amp; lampu</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
-  <string name="power_notifications_category_title">Suara pengisian</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
-  <string name="power_notifications_enable_title">Aktifkan</string>
-  <string name="power_notifications_enable_summary">Putar suara ketika menghubungkan atau melepaskan sumber daya</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
-  <string name="power_notifications_vibrate_title">Getar</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
-  <string name="power_notifications_ringtone_title">Suara pemberitahuan</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
-  <string name="power_notifications_ringtone_silent">Diam</string>
   <!-- Status bar -->
-  <string name="status_bar_title">Status bar</string>
-  <string name="status_bar_toggle_brightness">Kontrol kecerahan</string>
-  <string name="status_bar_toggle_brightness_summary">Sesuaikan kecerahan dengan menggeser di status bar</string>
-  <string name="status_bar_notif_count_title">Tampilkan hitungan pemberitahuan</string>
-  <string name="status_bar_notif_count_summary">Tampilkan jumlah pemberitahuan tertunda</string>
-  <string name="status_bar_quick_qs_pulldown_title">Pulldown cepat</string>
-  <string name="status_bar_quick_qs_pulldown_summary">%1$s tepi dari status bar dapat ditarik kebawah untuk Pengaturan Cepat</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Kiri</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Kanan</string>
-  <string name="status_bar_quick_qs_pulldown_off">Nonaktif</string>
-  <string name="status_bar_quick_qs_pulldown_left">Kiri</string>
-  <string name="status_bar_quick_qs_pulldown_right">Kanan</string>
   <!-- Status bar - Clock -->
-  <string name="status_bar_clock_style_title">Gaya jam</string>
-  <string name="status_bar_clock_style_right">Kanan</string>
-  <string name="status_bar_clock_style_left">Kiri</string>
-  <string name="status_bar_clock_style_center">Tengah</string>
-  <string name="status_bar_clock_style_hidden">Tersembunyi</string>
-  <string name="status_bar_am_pm_title">Gaya AM/PM</string>
-  <string name="status_bar_am_pm_info">24-jam diaktifkan</string>
-  <string name="status_bar_am_pm_normal">Normal</string>
-  <string name="status_bar_am_pm_small">Kecil</string>
-  <string name="status_bar_am_pm_hidden">Tersembunyi</string>
   <!-- Status bar - Battery -->
-  <string name="status_bar_battery_style_title">Gaya status baterai</string>
-  <string name="status_bar_battery_style_icon_portrait">Ikon potret</string>
-  <string name="status_bar_battery_style_icon_landscape">Ikon lanskap</string>
-  <string name="status_bar_battery_style_circle">Lingkaran</string>
-  <string name="status_bar_battery_style_text">Teks</string>
-  <string name="status_bar_battery_style_hidden">Tersembunyi</string>
   <!-- Status bar - Battery percentage -->
-  <string name="status_bar_battery_percentage_title">Persentase baterai</string>
-  <string name="status_bar_battery_percentage_default">Tersembunyi</string>
-  <string name="status_bar_battery_percentage_text_inside">Di dalam ikon</string>
-  <string name="status_bar_battery_percentage_text_next">Di samping ikon</string>
   <!-- Status bar - icon blacklist -->
   <!-- EdgeGesture service -->
-  <string name="edge_gesture_service_title">Block gesture touch events</string>
-  <string name="edge_gesture_service_summary">Jangan kirim events sentuhan untuk navigasi dan gerakan statusbar untuk aplikasi</string>
   <!-- Keep screen on strings -->
   <!-- Privacy Settings Header item -->
-  <string name="privacy_settings_cyanogenmod_title">Privasi</string>
   <!-- Privacy Guard -->
-  <string name="privacy_guard_default_title">Diaktifkan secara default</string>
-  <string name="privacy_guard_default_summary">Mengaktifkan secara default untuk aplikasi yang baru diinstal</string>
-  <string name="privacy_guard_manager_title">Penjaga Privasi</string>
-  <string name="privacy_guard_manager_summary">Kelola aplikasi yang memiliki akses ke data pribadi Anda</string>
-  <string name="privacy_guard_no_user_apps">Tidak ada aplikasi yang terinstal</string>
-  <string name="privacy_guard_help_title">Bantuan</string>
-  <string name="privacy_guard_reset_title">Set ulang</string>
-  <string name="privacy_guard_reset_text">Set ulang izin?</string>
-  <string name="privacy_guard_help_text">Di layar ini anda dapat memilih aplikasi Privacy Guard yang harus active dengan tap aplikasinya. Aplikasi yang terpilih tidak akan mendapar acces ke data personal anda seperti kontak, pesan, atau log telepon. Tekan dan tahan entri app dapat membuka detail app tersebut.\n\nAplikasi bawaan tidak ditampilkan secara default tapi dapat di tampilkan dengan memilih opsi respective.</string>
-  <string name="privacy_guard_manager_show_system_apps">Tampilkan aplikasi bawaan</string>
-  <string name="privacy_guard_advanced_settings_title">Tingkat lanjut</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
-  <string name="lockpattern_settings_enable_error_path_title">Tunjukkan galat pola</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
-  <string name="lockpattern_settings_enable_dots_title">Tunjukkan titik-titik pola</string>
   <!-- Whether the keyguard will directly pass to password entry -->
   <!-- Whether the keyguard will directly pass to pattern view -->
   <!-- Whether the keyguard will directly pass to PIN entry -->
   <!-- lock screen visualizer -->
-  <string name="lockscreen_visualizer_title">Tampilkan visualisasi musik</string>
   <!-- lock screen disabled by QS tile warning -->
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">Ambang batas penghemat baterai</string>
-  <string name="battery_saver_summary">Menurunkan performa dan membatasi data latar belakang</string>
-  <string name="battery_saver_summary_unavailable">Tidak tersedia saat pengisian</string>
   <!-- Battery : Automatic performance profiles -->
-  <string name="autoperf_title">Aktifkan profil per-aplikasi</string>
-  <string name="autoperf_summary">Otomatis pilih modus baterai yang cocok untuk berbagai aplikasi</string>
-  <string name="perf_profile_title">Modus baterai</string>
   <!-- Memory -->
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
-  <string name="notification_ringtone_title_cm">Nada pemberitahuan</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Reboot lanjutan</string>
-  <string name="advanced_reboot_summary">Ketika dibuka, termasuk pilihan dalam menu daya untuk reboot ke recovery, bootloader atau melakukan soft reboot</string>
-  <string name="category_interface">Antarmuka</string>
   <!-- Expanded desktop -->
-  <string name="power_menu_expanded_desktop">Expanded desktop</string>
-  <string name="expanded_hide_nothing">Tidak menyembunyikan apapun</string>
-  <string name="expanded_hide_status">Sembunyikan status bar</string>
-  <string name="expanded_hide_navigation">Sembunyikan bar navigasi</string>
-  <string name="expanded_hide_both">Sembunyikan keduanya</string>
-  <string name="expanded_nothing_to_show">Untuk menambahkan konfigurasi kustom per-aplikasi untuk kondisi diperluas, atur \"Diaktifkan untuk semua\" ke posisi mati</string>
-  <string name="expanded_enabled_for_all">Diaktifkan untuk semua</string>
-  <string name="expanded_desktop_style">Gaya desktop yang diperluas</string>
-  <string name="expanded_desktop_style_description">Pilih gaya standar perluasan desktop</string>
-  <string name="expanded_desktop_title">Pilihan perluasan desktop</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">Matikan app dengan tombol kembali</string>
-  <string name="kill_app_longpress_back_summary">Matikan aplikasi latar dengan menahan tombol kembali</string>
   <!-- Show/Hide Search Bar -->
-  <string name="recents_show_searchbar">Tampilkan bar pencarian di menu recents</string>
-  <string name="keywords_recents_show_searchbar">recent recents nonaktifkan aktifkan tampilkan sembunyikan pencari bar bar pencarian</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Voice Wakeup</string>
-  <string name="voice_wakeup_retrain_title">Melatih suara Anda</string>
-  <string name="voice_wakeup_activity_title">Kegiatan untuk memulai</string>
-  <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="picker_activities">Aktivitas</string>
-  <string name="select_custom_app_title">Pilih aplikasi kustom</string>
-  <string name="select_custom_activity_title">Pilih aktivitas kustom</string>
   <!-- Blacklist preferences -->
-  <string name="blacklist_title">Daftar penelepon yang diblokir</string>
-  <string name="blacklist_edit_dialog_title">Ubah nomor telepon yang diblokir</string>
-  <string name="blacklist_prefs">Pengaturan</string>
-  <string name="blacklist_button_delete">Hapus</string>
-  <string name="blacklist_empty_text">Anda tidak memiliki nomor yang diblokir. Tambahkan entri dengan menyentuh tombol Tambah (+).</string>
-  <string name="blacklist_disabled_empty_text">Untuk mencegah nomor telepon membuat panggilan atau pesan ke anda, aktifkan daftar penelepon yang diblokir.</string>
-  <string name="blacklist_summary_disabled">Dinonaktifkan</string>
-  <string name="blacklist_summary">Anda tidak akan menerima panggilan atau pesan dari nomor telepon yang ada di daftar penelepon yang diblokir</string>
-  <string name="blacklist_notify">Tampilkan pemberitahuan</string>
-  <string name="blacklist_private_numbers_title">Nomor pribadi</string>
-  <string name="blacklist_private_numbers_summary_disabled">Tidak memblokir panggilan dari nomor pribadi</string>
-  <string name="blacklist_private_numbers_summary">Blok panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor pribadi</string>
-  <string name="blacklist_unknown_numbers_title">Nomor tidak diketahui</string>
-  <string name="blacklist_unknown_numbers_summary_disabled">Tidak memblokir panggilan atau pesan dari angka-angka yang tidak ada dalam daftar kontak</string>
-  <string name="blacklist_unknown_numbers_summary">Blok panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor-nomor yang tidak ada dalam daftar kontak</string>
-  <string name="blacklist_summary_type_calls_only">panggilan</string>
-  <string name="blacklist_summary_type_messages_only">pesan</string>
-  <string name="blacklist_summary_type_calls_and_messages">panggilan dan pesan</string>
-  <string name="blacklist_regex_title">Gunakan wildcard</string>
-  <string name="blacklist_regex_summary">Gunakan . sebagai wildcard dan * untuk pengulangan. Misalnya 123.* blok nomor dimulai dengan 123 dan .* 123.* blok angka yang mengandung 123</string>
-  <string name="blacklist_policy_block_calls">Blok panggilan masuk</string>
-  <string name="blacklist_policy_block_messages">Blok pesan masuk</string>
-  <string name="blacklist_bad_number_add">Tidak dapat menambahkan nomor telepon yang tidak sesuai untuk daftar penelepon yang diblokir</string>
   <!-- Blacklist management -->
-  <string name="remove_blacklist_number_title">Hapus Nomor</string>
-  <string name="remove_blacklist_entry">Apakah anda ingin menghapus nomor telepon yang diblokir ini?</string>
-  <string name="select_contact">Pilih kontak</string>
   <!-- Sms security limit -->
-  <string name="app_security_title">Keamanan aplikasi</string>
-  <string name="sms_security_check_limit_title">Batas pesan SMS</string>
-  <string name="sms_security_check_limit_summary">Aplikasi dapat mengirim %d pesan dalam 1 menit sebelum konfirmasi</string>
-  <string name="sms_security_check_limit_summary_none">Aplikasi tidak diizinkan untuk mengirin pesan tanpa konfirmasi</string>
-  <string name="sms_security_check_limit_none">Tidak ada</string>
   <!-- Notification spamfilter -->
-  <string name="spam_added_title">Ditambahkan %1$s</string>
-  <string name="spam_last_blocked_title">Terakhir diblokir %1$s</string>
-  <string name="block_notifications_title">Notifikasi penyaringan</string>
-  <string name="block_notifications_summary">Kelola pemberitahuan yang diabaikan dan filter</string>
-  <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Statistik CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Bantu CyanogenMod untuk menjadi lebih baik dengan berperan serta melaporkan statistik anonim</string>
-  <string name="anonymous_statistics_warning_title">Tentang</string>
-  <string name="anonymous_statistics_warning">Berperan serta dalam Statistik CyanogenMod akan memungkinkan data non-pribadi dikirimkan kepada para pengembang CyanogenMod untuk melacak instalasi unik di perangkat. Informasi yang dikirimkan berisi pengenal unik, yang tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat dimulai.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
-  <string name="enable_reporting_title">Aktifkan pelaporan</string>
-  <string name="preview_data_title">Pratinjau data</string>
-  <string name="view_stats_title">Lihat statistik</string>
-  <string name="anonymous_learn_more">Pelajadi lebih lanjut</string>
   <!-- Anonymous Statistics - Preview -->
-  <string name="preview_id_title">ID unik</string>
-  <string name="preview_device_title">Perangkat</string>
-  <string name="preview_version_title">Versi</string>
-  <string name="preview_country_title">Negara</string>
-  <string name="preview_carrier_title">Operator</string>
-  <string name="stats_collection_title">Pengumpulan statistik</string>
-  <string name="stats_collection_summary">Ketika diaktifkan, mengizinkan pengumpulan metrik</string>
   <!-- Protected apps lockpattern reset button -->
-  <string name="lockpattern_reset_button">Reset pola</string>
-  <string name="lockpattern_settings_reset_summary">Masukkan email akun utama dan password yang terkait untuk me-reset kunci pola</string>
   <!-- Protected Apps -->
-  <string name="menu_hidden_apps_delete">Reset</string>
-  <string name="menu_hidden_apps_reset_lock">Reset pola kunci</string>
-  <string name="protected_apps">Aplikasi yang di lindungi</string>
-  <string name="saving_protected_components">Menyimpan kondisi komponen\u2026</string>
-  <string name="pa_login_username_hint">Nama pengguna (email)</string>
-  <string name="pa_login_password_hint">Sandi</string>
-  <string name="pa_login_submit_button">Masuk</string>
-  <string name="pa_login_checking_password">Memeriksa account\u2026</string>
-  <string name="pa_login_incorrect_login">Login tidak benar</string>
   <!-- Contributors cloud activity -->
-  <string name="category_sounds">Suara</string>
-  <string name="notification_manager">Pemberitahuan</string>
-  <string name="lockscreen_settings">Kunci layar</string>
-  <string name="category_lights">Lampu</string>
-  <string name="category_volume">Volume</string>
-  <string name="category_vibrate">Getar</string>
-  <string name="category_misc">Macam-macam</string>
-  <string name="title_general">Umum</string>
-  <string name="advanced">Tingkat lanjut</string>
-  <string name="link_volume_option_title">Hubungkan volume nada dering &amp; notifikasi</string>
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
-  <string name="sim_disabled">dinonaktifkan</string>
-  <string name="sim_missing">hilang atau rusak</string>
-  <string name="sim_enabler_airplane_on">Tidak dapat melakukan operasi saat mode pesawat aktif.</string>
-  <string name="sim_enabler_in_call">Tidak dapat melakukan operasi saat di dalam panggilan.</string>
-  <string name="sim_enabler_both_inactive">Tidak dapat menonaktifkan semua kartu SIM</string>
-  <string name="primary_sub_select_title">Langganan 3G/LTE default</string>
   <!-- MSIM SIM status -->
-  <string name="sim_card_status_title">Status %d SIM</string>
-  <string name="sim_card_lock_settings_title">Pengaturan kunci SIM %d</string>
-  <string name="sim_card_summary_empty">SIM tidak dipasang</string>
-  <string name="sim_mobile_network_settings_title">Pengaturan SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
@@ -798,50 +159,24 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
-  <string name="maximum_head_level">Kepala: %1$s W/kg</string>
-  <string name="maximum_body_level">Tubuh: %1$s W/kg</string>
   <!-- IC Codes -->
-  <string name="ic_code_model">Model: %1$s</string>
-  <string name="ic_code_full">IC: %1$s</string>
-  <string name="sim_ringtone_title">Nada SIM %d</string>
   <!-- label for application name -->
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="tablet">Ini akan menghapus semua data dari <b>penyimpanan internal</b> tablet anda, termasuk: \n\n<li>Akun perangkat</li>\n<li>Sistem, data aplikasi dan pengaturan</li>\n<li>Aplikasi unduhan</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">Ini akan menghapus semua data dari <b>penyimpanan internal</b> ponsel anda, termasuk: \n\n<li>Akun perangkat</li>\n<li>Sistem, data aplikasi dan pengaturan</li>\n<li>Aplikasi unduhan</li></string>
   <!-- Factory reset strings -->
-  <string name="factory_reset_instructions_title">Data pribadi &amp; aplikasi</string>
-  <string name="factory_reset_instructions_summary">Ini akan menghapus semua akun, aplikasi, data apl, dan pengaturan sistem dalam perangkat ini</string>
-  <string name="factory_reset_personal_content">Konten pribadi</string>
-  <string name="factory_reset_erase_stored_content">Hapus konten tersimpan</string>
-  <string name="factory_reset_erase_stored_content_summary">Hapus musik, foto, vidio, dan data pengguna lainnya yang tersimpan dalam perangkat</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">Hapus musik, foto, vidio, dan data pengguna lainnya yang tersimpan dalam perangkat. \n\n<b>Konten tidak dapat disimpan karena enkripsi perangkat.</b></string>
-  <string name="factory_reset_erase_sd_card">Format Kartu SD</string>
-  <string name="factory_reset_erase_sd_card_summary">Hapus semua data dalam Kartu SD, termasuk musik dan foto</string>
-  <string name="factory_reset_warning_text_reset_now">RESET SEKARANG</string>
-  <string name="factory_reset_warning_text_message">Semua akun, aplikasi, data aplikasi, dan pengaturan sistem akan dihapus dari perangkat. Init tidak bisa kembalikan.</string>
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <!-- Live lock screen summary -->
   <!-- Live lock screen settings content description -->
-  <string name="live_lock_screen_settings_button">Pengaturan</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="interruptions_ignore_while_media_title">Cegah penurunan suara</string>
-  <string name="interruptions_ignore_while_media_summary">Tidak mengurangi volume media pemutar ketika datang pemberitahuan</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Hukum CyanogenMod</string>
   <!-- Menu label for reset the battery stats -->
-  <string name="menu_stats_reset">Set ulang statistik</string>
   <!-- Reset stats confirmation dialog's message -->
-  <string name="reset_stats_msg">Statistik sejarah baterai akan diset ulang</string>
   <!-- Dock battery not present message -->
-  <string name="dock_battery_not_present">Baterai dudukan tidak ada</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
-  <string name="battery_info_status_charging_dock_ac">Mengisi dengan AC dudukan</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
-  <string name="battery_info_status_charging_dock_usb">Mengisi melalui USB dudukan</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index ef07951..e73c8a6 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -55,7 +55,7 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Aggiornamento CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Aggiorna recovery Cyanogenmod</string>
+  <string name="update_recovery_title">Aggiorna recovery CyanogenMod</string>
   <string name="update_recovery_summary">Aggiorna la recovery con gli aggiornamenti del sistema</string>
   <string name="update_recovery_on_warning">AVVISO: Quando questa funzionalità è attiva, la recovery installata sarà sostituita da una inclusa con la versione corrente del sistema.\n\nLa vostra recovery attuale verrà aggiornata con gli aggiornamenti di sistema, contribuendo a garantire la compatibilità con le future versioni.\n\nAttivare questa funzione?</string>
   <string name="update_recovery_off_warning">Attenzione: Quando questa funzionalità è disattivata, la recovery installata non verrà aggiornata con il sistema.\n\nFuturi aggiornamenti potrebbero non installarsi con recovery personalizzate o vecchie.\n\nDisattivare questa funzione?</string>
@@ -152,7 +152,7 @@
   <string name="profile_lockmode_title">Modalità blocco schermo</string>
   <string name="profile_lockmode_policy_disabled_summary">I profili sono stati disattivati dall\'amministratore</string>
   <string name="profile_lockmode_insecure_summary">Non chiedere password o PIN</string>
-  <string name="profile_lockmode_disabled_summary">Disattiva schermata di sblocco</string>
+  <string name="profile_lockmode_disabled_summary">Disattiva schermata di blocco</string>
   <string name="profile_airplanemode_title">Modalità aereo</string>
   <string name="profile_brightness_title">Luminosità schermo</string>
   <string name="profile_brightness_override_summary">Imposta su %1$d%%</string>
@@ -165,6 +165,7 @@
   <string name="toggleData">Connessione dati</string>
   <string name="toggleSync">Sincronia dati</string>
   <string name="toggle2g3g4g">Tipo di rete preferito</string>
+  <string name="toggle2g3g4g_msim">Tipo di rete preferito (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Codice regione Wi\u2011Fi</string>
@@ -441,12 +442,12 @@
   <string name="unlock_scramble_pin_layout_title">Mescola disposizione</string>
   <string name="unlock_scramble_pin_layout_summary">Mescola la disposizione del tastierino PIN per lo sblocco del dispositivo</string>
   <string name="button_pref_title">Pulsanti</string>
-  <string name="hardware_keys_power_key_title">Pulsante alimentazione</string>
+  <string name="hardware_keys_power_key_title">Pulsante di accensione</string>
   <string name="hardware_keys_home_key_title">Tasto Home</string>
   <string name="hardware_keys_back_key_title">Pulsante Indietro</string>
   <string name="hardware_keys_menu_key_title">Tasto Menu</string>
   <string name="hardware_keys_assist_key_title">Tasto Cerca</string>
-  <string name="hardware_keys_appswitch_key_title">Tasto Recenti</string>
+  <string name="hardware_keys_appswitch_key_title">Tasto Panoramica</string>
   <string name="hardware_keys_camera_key_title">Tasto fotocamera</string>
   <string name="hardware_keys_volume_keys_title">Tasti Volume</string>
   <string name="hardware_keys_short_press_title">Azione pressione breve</string>
@@ -472,7 +473,7 @@
   <string name="volbtn_cursor_control_on">Volume su/giù muove il cursore a sinistra/destra</string>
   <string name="volbtn_cursor_control_on_reverse">Volume su/giù muove il cursore a destra/sinistra</string>
   <string name="power_end_call_title">Termina chiamata</string>
-  <string name="power_end_call_summary">Premendo il pulsante alimentazione si concluderà la chiamata corrente</string>
+  <string name="power_end_call_summary">Premendo il pulsante di accensione si terminerà la chiamata</string>
   <string name="swap_volume_buttons_title">Riorienta</string>
   <string name="swap_volume_buttons_summary">Scambia i tasti del volume quando lo schermo è ruotato</string>
   <string name="button_wake_title">Risveglio dispositivo</string>
@@ -502,7 +503,7 @@
   <!-- Settings main menu entry -->
   <string name="gesture_settings_title">Gesture</string>
   <!-- Power menu -->
-  <string name="power_menu_title">Menu tasto alimentazione</string>
+  <string name="power_menu_title">Menu tasto di accensione</string>
   <string name="power_menu_reboot_title">Menu riavvio</string>
   <string name="power_menu_screenshot_title">Cattura schermata</string>
   <string name="power_menu_airplane_title">Modalità aereo</string>
@@ -534,7 +535,7 @@
   <string name="vibrator_warning">Valori superiori a %1$d non sono raccomandati</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrazione colore</string>
-  <string name="color_calibration_summary">Calibra i colori su schermo</string>
+  <string name="color_calibration_summary">Calibra i colori dello schermo</string>
   <string name="color_red_title">Rosso</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Blu</string>
@@ -556,7 +557,7 @@
   <string name="display_rotation_title">Rotazione schermo</string>
   <string name="display_rotation_disabled">Disattivata</string>
   <string name="display_rotation_unit">gradi</string>
-  <string name="display_lockscreen_rotation_title">Rotazione schermata sblocco</string>
+  <string name="display_lockscreen_rotation_title">Rotazione schermata blocco</string>
   <string name="display_rotation_category_title">Modalità rotazione schermo</string>
   <string name="display_rotation_0_title">0 gradi</string>
   <string name="display_rotation_90_title">90 gradi</string>
@@ -683,7 +684,7 @@
   <string name="status_bar_notif_count_title">Mostra contatore notifiche</string>
   <string name="status_bar_notif_count_summary">Visualizza il numero di notifiche in sospeso</string>
   <string name="status_bar_quick_qs_pulldown_title">Impostazioni rapide</string>
-  <string name="status_bar_quick_qs_pulldown_summary">Tira giù la barra di stato dal bordo %1$s per le Impostazioni rapide</string>
+  <string name="status_bar_quick_qs_pulldown_summary">Scorri la barra di stato verso il basso da %1$s per aprire le impostazioni rapide</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Sinistra</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Destra</string>
   <string name="status_bar_quick_qs_pulldown_off">Disattivato</string>
@@ -708,7 +709,7 @@
   <string name="status_bar_battery_style_text">Testo</string>
   <string name="status_bar_battery_style_hidden">Nascosto</string>
   <!-- Status bar - Battery percentage -->
-  <string name="status_bar_battery_percentage_title">Percentuale della batteria</string>
+  <string name="status_bar_battery_percentage_title">Percentuale batteria</string>
   <string name="status_bar_battery_percentage_default">Nascosta</string>
   <string name="status_bar_battery_percentage_text_inside">All\'interno dell\'icona</string>
   <string name="status_bar_battery_percentage_text_next">Accanto all\'icona</string>
@@ -752,18 +753,18 @@
   <string name="lockscreen_visualizer_title">Mostra visualizzatore musicale</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Disattivata dai tile</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary">Tocca per attivare la schermata di sblocco</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Schermata di sblocco attiva!</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Tocca per attivare la schermata di blocco</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Schermata di blocco attiva!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Soglia risparmio energetico</string>
   <string name="battery_saver_summary">Riduce le prestazioni e limita i dati in background</string>
   <string name="battery_saver_summary_unavailable">Non disponibile durante la ricarica</string>
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">Attiva profili per app</string>
-  <string name="autoperf_summary">Seleziona automaticamente una modalità batteria adatta per le varie applicazioni</string>
-  <string name="perf_profile_title">Modalità batteria</string>
+  <string name="autoperf_summary">Seleziona automaticamente un profilo batteria adatto alle varie app</string>
+  <string name="perf_profile_title">Profilo batteria</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">Applicazioni eseguite all\'avvio</string>
+  <string name="memory_startup_apps_title">App avviate all\'accensione</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Suoneria notifiche</string>
   <!-- Advanced reboot options -->
@@ -782,7 +783,7 @@
   <string name="expanded_desktop_style_description">Seleziona lo stile predefinito del desktop esteso</string>
   <string name="expanded_desktop_title">Opzioni desktop esteso</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">Termina app con tasto</string>
+  <string name="kill_app_longpress_back">Termina app con tasto indietro</string>
   <string name="kill_app_longpress_back_summary">Termina l\'applicazione in primo piano tenendo premuto il tasto indietro</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">Barra di ricerca in app recenti</string>
@@ -797,7 +798,7 @@
   <string name="select_custom_app_title">Scegli app</string>
   <string name="select_custom_activity_title">Scegli activity</string>
   <!-- Blacklist preferences -->
-  <string name="blacklist_title">Elenco bloccati</string>
+  <string name="blacklist_title">Contatti bloccati</string>
   <string name="blacklist_edit_dialog_title">Modifica il numero telefonico bloccato</string>
   <string name="blacklist_prefs">Impostazioni</string>
   <string name="blacklist_button_delete">Elimina</string>
@@ -863,7 +864,7 @@
   <string name="menu_hidden_apps_delete">Ripristina</string>
   <string name="menu_hidden_apps_reset_lock">Reimposta sequenza blocco</string>
   <string name="protected_apps">App protette</string>
-  <string name="protected_apps_summary">Gestisci le app che sono protette da un blocco sicuro</string>
+  <string name="protected_apps_summary">Gestisci le app protette da un blocco sicuro</string>
   <string name="saving_protected_components">Salvataggio stato componente\u2026</string>
   <string name="pa_login_username_hint">Utente (e-mail)</string>
   <string name="pa_login_password_hint">Password</string>
@@ -995,4 +996,9 @@
   <string name="battery_info_status_charging_dock_ac">Ricarica su Dock AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Ricarica su Dock USB</string>
+  <string name="restrict_app_wlan_title">Disattiva utilizzo Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Impedisci all\'app di utilizzare il Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Disattiva utilizzo reti mobili</string>
+  <string name="restrict_app_cellular_summary">Impedisci all\'app di utilizzare le connessioni a reti mobili</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index a508df1..fd9c359 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -29,7 +29,7 @@
   <string name="development_tools_title">כלי פיתוח</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">קיצור דרך לכלי פיתוח</string>
-  <string name="development_shortcut_summary">הפעל קיצורי דרך לניהול יישומים מרשימת היישמים האחרונים</string>
+  <string name="development_shortcut_summary">הפעל קיצורי דרך לניהול יישומים מרשימת היישומים האחרונים</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">גישת שורש (Root)</string>
   <string name="root_access_warning_title">לאפשר גישת שורש?</string>
@@ -57,7 +57,7 @@
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">עדכן את השחזור של Cyanogen</string>
   <string name="update_recovery_summary">עדכן את השחזור יחד עם עדכוני מערכת</string>
-  <string name="update_recovery_on_warning">שים לב: כשתכונה זו מופעלת, השחזור הנוכחי שלך יוחלף ב-Recovery הכלול בגרסה הנוכחית של מערכת ההפעלה שלך.\n\nהשחזור הנוכחי שלך יתעדכן יחד עם עדכונים למערכת שלך, כדי להבטיח תאימות עם גרסאות עתידיות.\n\nהאם להפעיל את תכונה זו?</string>
+  <string name="update_recovery_on_warning">שים לב: כשתכונה זו מופעלת, השחזור הנוכחי שלך יוחלף בשחזור הכלול בגרסה הנוכחית של מערכת ההפעלה שלך.\n\nהשחזור הנוכחי שלך יתעדכן יחד עם עדכונים למערכת שלך, כדי להבטיח תאימות עם גרסאות עתידיות.\n\nהאם להפעיל את תכונה זו?</string>
   <string name="update_recovery_off_warning">אזהרה: כשתכונה זו מושבתת, השחזור הנוכחי לא יתעדכן עם עדכוני מערכת.\n\nעדכוני מערכת עתידיים לא יותקנו עם גרסה לא עדכנית של השחזור.\n\nהאם להשבית תכונה זו?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
@@ -101,11 +101,11 @@
   <!-- Rename Dialog  -->
   <string name="rename_dialog_title">שינוי שם</string>
   <string name="rename_dialog_message">הזן שם חדש</string>
-  <string name="duplicate_appgroup_name">שם קבוצת יישומים כפול!</string>
+  <string name="duplicate_appgroup_name">שם כפול לקבוצת יישומים!</string>
   <string name="rename_dialog_hint">הזן שם פרופיל</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">איפוס</string>
-  <string name="profile_reset_message">האם לאפס את כל הפרופילים וקבוצות היישומים שנוצרו לברירת המחדל?</string>
+  <string name="profile_reset_message">למחוק את כל הפרופילים וקבוצות היישומים שנוצרו לברירת המחדל?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">להסיר יישום זה?</string>
   <!-- Profile network mode -->
@@ -132,17 +132,17 @@
   <!-- Profile Settings sound modes labels -->
   <string name="sound_mode">מצב התראות</string>
   <string name="ringer_mode">מצב צלצול</string>
-  <string name="lights_mode">נוריות מצב</string>
+  <string name="lights_mode">מצב נוריות</string>
   <string name="vibrate_mode">מצב רטט</string>
   <string name="choose_soundtone">בחר צליל התראה</string>
-  <string name="choose_ringtone">בחר צלצול</string>
+  <string name="choose_ringtone">בחר רינגטון</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">צליל התראה</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">קבוצות יישומים</string>
   <string name="profile_applist_title">יישומים</string>
   <string name="profile_new_appgroup">קבוצת יישומים חדשה</string>
-  <string name="profile_delete_appgroup">האם למחוק קבוצת יישומים זו?</string>
+  <string name="profile_delete_appgroup">למחוק קבוצת יישומים זו?</string>
   <string name="profile_appgroup_name_prompt">הזן שם עבור קבוצת היישומים החדשה</string>
   <string name="profile_appgroup_name_title">שם</string>
   <!-- Add application dialog box title -->
@@ -165,11 +165,12 @@
   <string name="toggleData">חיבור נתונים</string>
   <string name="toggleSync">סנכרון נתונים אוטומטי</string>
   <string name="toggle2g3g4g">סוג רשת מועדף</string>
+  <string name="toggle2g3g4g_msim">סוג רשת מועדף (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
-  <string name="wifi_setting_countrycode_title">קוד אזור Wi-Fi</string>
+  <string name="wifi_setting_countrycode_title">קוד אזור Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">ציין קוד אזור עבור Wi-Fi</string>
+  <string name="wifi_setting_countrycode_summary">ציין קוד אזור עבור Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">אירעה שגיאה בהגדרת הקוד האזורי.</string>
   <!-- Profiles -->
@@ -183,49 +184,49 @@
   <string name="profile_tabs_wifi">Wi\u2011Fi</string>
   <string name="profile_tabs_bluetooth">Bluetooth</string>
   <string name="profile_tabs_nfc">NFC</string>
-  <string name="profile_triggers_header">גורמים שיפעילו את הפרופיל הזה</string>
-  <string name="profile_setup_setup_triggers_title">שלב 1: הוספת גורמים מפעילים</string>
-  <string name="profile_setup_setup_triggers_title_config">שנה גורמי מפעילים: <xliff:g id="profile_name">%1$s </xliff:g></string>
-  <string name="profile_setup_actions_title">שלב 2: הגדרת פעולות</string>
+  <string name="profile_triggers_header">גורמים שיפעילו פרופיל זה</string>
+  <string name="profile_setup_setup_triggers_title">שלב 1: הוסף גורמים מפעילים</string>
+  <string name="profile_setup_setup_triggers_title_config">שנה גורמים מפעילים: <xliff:g id="profile_name">%1$s </xliff:g></string>
+  <string name="profile_setup_actions_title">שלב 2: הגדר פעולות</string>
   <string name="profile_setup_actions_title_config">הגדר פעולות מחדש</string>
   <string name="profile_appgroups_manage">קבוצות יישומים</string>
   <string name="profile_appgroup_manage">נהל קבוצות יישומים</string>
   <!-- Title for application group setting screen -->
   <string name="profile_appgroups_title">קבוצות יישומים</string>
   <string name="profile_new_appgroup">קבוצת יישומים חדשה</string>
-  <string name="profile_delete_appgroup">האם למחוק קבוצת יישומים זו?</string>
+  <string name="profile_delete_appgroup">למחוק קבוצת יישומים זו?</string>
   <string name="profile_appgroup_name_prompt">הזן שם עבור קבוצת היישומים החדשה</string>
   <string name="profile_appgroup_name_title">שם</string>
-  <string name="duplicate_appgroup_name">שם קבוצת יישומים כפול!</string>
+  <string name="duplicate_appgroup_name">שם כפול לקבוצת יישומים!</string>
   <string name="profile_app_delete_confirm">להסיר יישום זה?</string>
-  <string name="no_bluetooth_triggers">אין התקני Bluetooth מחוברים.\nלחץ כדי לחבר התקן Bluetooth לפני הגדרת גורמים מפעילים.</string>
+  <string name="no_bluetooth_triggers">אין מכשירי Bluetooth מחוברים.\nלחץ כדי לחבר מכשיר Bluetooth לפני הגדרת גורמים מפעילים.</string>
   <string name="no_wifi_triggers">לא הוגדרו נקודות Wi-Fi.\nלחץ כדי להתחבר ל-Wi-Fi לפני הגדרת גורמים מפעילים.</string>
   <string name="no_triggers_configured">לא הוגדרו גורמים מפעילים. לחץ כדי להגדיר עוד.</string>
   <string name="no_triggers_configured_nfc">לחץ כדי להגדיר גורם מפעיל חדש ל-NFC.</string>
-  <string name="profile_setup_setup_triggers_description">הגדר בבקשה גורמים מפעילים להפעלת הפרופיל הנ\"ל</string>
+  <string name="profile_setup_setup_triggers_description">הגדר גורמים מפעילים להפעלת פרופיל זה</string>
   <string name="profile_setup_actions_description">עכשיו קבע מה קורה כאשר הפרופיל מופעל</string>
   <!-- Navigation Bar -->
   <string name="navigation_bar_category">סרגל ניווט</string>
   <string name="navigation_bar_left_title">מצב לשמאליים</string>
   <string name="navigation_bar_left_summary">מקם את שורת ההפעלה בצד השמאלי של המסך במצב רוחב</string>
   <string name="navigation_bar_title">לחצנים ופריסה</string>
-  <string name="navigation_bar_help_text">כדי להתחיל לחץ על כפתור העריכה כדי לפתוח את סרגל הניווט לעריכה.\n\nאתה יכול ללחוץ על סמל כדי לשנות את קיצור הדרך שלו, או ללחוץ לחיצה ארוכה על סמל כדי לשנות את הסידור.\n\nלחץ \"שמור\" כדי להחיל את השינויים שלך, או \"שחזר\" כדי לאפס את הסידור להגדרות ברירת המחדל.</string>
+  <string name="navigation_bar_help_text">כדי להתחיל לחץ על כפתור העריכה, כדי לפתוח את סרגל הניווט לעריכה.\n\nאתה יכול ללחוץ על סמל כדי לשנות את קיצור הדרך שלו, או ללחוץ לחיצה ארוכה על סמל כדי לשנות את סידור הפריסה.\n\nלחץ \"שמור\" כדי להחיל את השינויים שלך, או \"שחזר ברירות מחדל\" כדי לאפס את הסידור להגדרות ברירת המחדל.</string>
   <string name="navigation_restore_button_text">שחזור\nברירת מחדל</string>
   <string name="navigation_edit_button_text">ערוך</string>
   <string name="navigation_save_button_text">שמור</string>
-  <string name="navigation_bar_reset_message">האם למחוק את ההגדרות הנוכחיות ולשחזר את פריסת ברירת המחדל?</string>
-  <string name="navigation_bar_arrow_keys_title">הצג מקשי חיצים בזמן הקלדה</string>
-  <string name="navigation_bar_arrow_keys_summary">הצג חצי כתיבה ימניים ושמאליים בזמן הכתיבה. עוקף את מחליף IME.</string>
+  <string name="navigation_bar_reset_message">למחוק את ההגדרות הנוכחיות ולשחזר את פריסת ברירת המחדל?</string>
+  <string name="navigation_bar_arrow_keys_title">הצג מקשי חיצים בעת הקלדה</string>
+  <string name="navigation_bar_arrow_keys_summary">הצג חיצי כתיבה ימניים ושמאליים בעת הכתיבה. עוקף את מחליף IME.</string>
   <string name="navigation_bar_recents_title">פעולת לחיצה ארוכה על כפתור ה\"אחרונים\"</string>
   <!-- Notification light dialogs -->
-  <string name="edit_light_settings">עריכת הגדרות אור</string>
+  <string name="edit_light_settings">ערוך הגדרות אור</string>
   <string name="pulse_speed_title">אורך הבהוב ומהירות</string>
   <string name="default_time">רגיל</string>
   <string name="custom_time">מותאם אישית</string>
   <string name="dialog_delete_title">מחק</string>
   <string name="dialog_delete_message">להסיר את הפריט הנבחר?</string>
   <!-- Values for the notification light pulse spinners -->
-  <string name="pulse_length_always_on">תמיד דלוק</string>
+  <string name="pulse_length_always_on">תמיד מופעל</string>
   <string name="pulse_length_very_short">קצר מאוד</string>
   <string name="pulse_length_short">קצר</string>
   <string name="pulse_length_normal">רגיל</string>
@@ -252,26 +253,26 @@
   <string name="notification_light_default_value">ברירת מחדל</string>
   <string name="notification_light_missed_call_title">שיחה שלא נענתה</string>
   <string name="notification_light_voicemail_title">תא קולי</string>
-  <string name="notification_light_screen_on">תאורת התראה כאשר המסך דולק</string>
-  <string name="notification_light_zen_mode">אורות התראה במצב נא לא להפריע</string>
+  <string name="notification_light_screen_on">תאורת התראה כאשר המסך מופעל</string>
+  <string name="notification_light_zen_mode">אורות התראה במצב \"נא לא להפריע\"</string>
   <string name="notification_light_use_multiple_leds">נוריות LED מרובות</string>
   <string name="keywords_lights_brightness_level">עמעם בהירות נוריות</string>
-  <string name="notification_light_automagic">בחירת צבעים אוטומטית</string>
+  <string name="notification_light_automagic">בחר צבעים אוטומטית</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">הגדרות נורית</string>
   <string name="led_notification_text">נורית LED מופעלת בהגדרות</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">איתור באגים של אנדרואיד</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">הפעל ממשק adb</string>
+  <string name="enable_adb_summary_cm">הפעל ממשק ניקוי באגים (adb)</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB דרך הרשת</string>
-  <string name="adb_over_network_summary">אפשר איתור באגים (Debugging) של TCP/IP דרך ממשקי רשת (Wi\u2011Fi, רשתות USB). אפשרות זו תתאפס בעת הפעלה מחדש של המכשיר</string>
+  <string name="adb_over_network_summary">אפשר איתור באגים של TCP/IP דרך ממשקי רשת (Wi\u2011Fi, רשתות USB). אפשרות זו תתאפס בעת אתחול מחדש של המכשיר</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">אזהרה: כאשר ADB דרך הרשת פעיל, הטלפון שלך חדיר מכל הרשתות המחוברות!\n\nיש להשתמש באפשרות זו רק כשאתה מחובר לרשת שניתן לסמוך עליה.\n\nהאם ברצונך להפעיל את אפשרות זו?</string>
+  <string name="adb_over_network_warning">אזהרה: כאשר ADB דרך הרשת מופעל, הטלפון שלך חדיר מכל הרשתות המחוברות!\n\nיש להשתמש באפשרות זו רק כשאתה מחובר לרשת שניתן לסמוך עליה.\n\nהאם ברצונך להפעיל את אפשרות זו?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
-  <string name="adb_notify">התראה על איתור באגים (Debugging)</string>
-  <string name="adb_notify_summary">הצג התראה כשאיתור באגים דרך הרשת\USB פעיל</string>
+  <string name="adb_notify">התראת איתור באגים</string>
+  <string name="adb_notify_summary">הצג התראה כשאיתור באגים דרך הרשת\ USB פעיל</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <string name="app_ops_categories_location">מיקום</string>
   <string name="app_ops_categories_personal">אישי</string>
@@ -287,10 +288,10 @@
   <string name="app_ops_summaries_vibrate">רטט</string>
   <string name="app_ops_summaries_read_contacts">קרא אנשי קשר</string>
   <string name="app_ops_summaries_modify_contacts">שנה אנשי קשר</string>
-  <string name="app_ops_summaries_read_call_log">קריאת יומן שיחות</string>
-  <string name="app_ops_summaries_modify_call_log">שנה יומן שיחות</string>
+  <string name="app_ops_summaries_read_call_log">קרא יומן שיחות</string>
+  <string name="app_ops_summaries_modify_call_log">שינוי יומן שיחות</string>
   <string name="app_ops_summaries_read_calendar">קרא לוח שנה</string>
-  <string name="app_ops_summaries_modify_calendar">שנה לוח שנה</string>
+  <string name="app_ops_summaries_modify_calendar">שינוי לוח שנה</string>
   <string name="app_ops_summaries_wifi_scan">סרוק רשתות אלחוטיות</string>
   <string name="app_ops_summaries_notification">התראה/הודעה קופצת</string>
   <string name="app_ops_summaries_cell_scan">סריקה סלולרית</string>
@@ -320,10 +321,10 @@
   <string name="app_ops_summaries_media_volume">עוצמת קול של מדיה</string>
   <string name="app_ops_summaries_alarm_volume">עוצמת קול של שעון מעורר</string>
   <string name="app_ops_summaries_notification_volume">עוצמת קול של התראה</string>
-  <string name="app_ops_summaries_bluetooth_volume">עוצמת השמע של ה-Bluetooth</string>
+  <string name="app_ops_summaries_bluetooth_volume">עוצמת קול של Bluetooth</string>
   <string name="app_ops_summaries_keep_awake">השאר במצב פעיל</string>
   <string name="app_ops_summaries_monitor_location">עקוב אחר מיקום</string>
-  <string name="app_ops_summaries_monitor_high_power_location">מעקב אחר מיקום עם צריכת סוללה גבוהה</string>
+  <string name="app_ops_summaries_monitor_high_power_location">עקוב אחר מיקום עם צריכת סוללה גבוהה</string>
   <string name="app_ops_summaries_get_usage_stats">קבל נתוני שימוש</string>
   <string name="app_ops_summaries_mute_unmute_microphone">השתק/הפעל מיקרופון</string>
   <string name="app_ops_summaries_toast_window">הצג התראות קופצות</string>
@@ -346,8 +347,8 @@
   <string name="app_ops_summaries_get_accounts">קבל חשבונות</string>
   <string name="app_ops_summaries_toggle_wifi">שנה את מצב הרשת האלחוטית</string>
   <string name="app_ops_summaries_toggle_bluetooth">שנה מצב Bluetooth</string>
-  <string name="app_ops_summaries_start_at_boot">הפעל בעת איתחול המכשיר</string>
-  <string name="app_ops_summaries_toggle_nfc">שינוי מצב NFC</string>
+  <string name="app_ops_summaries_start_at_boot">הפעל בעת אתחול המכשיר</string>
+  <string name="app_ops_summaries_toggle_nfc">הפעל/כבה NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">הפעל/כבה תקשורת נתונים סלולרית</string>
   <string name="app_ops_summaries_superuser">גישת שורש (Root)</string>
   <!-- User display names for app ops codes - extension of AOSP -->
@@ -355,32 +356,32 @@
   <string name="app_ops_labels_fine_location">מיקום מדויק</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">רטט</string>
-  <string name="app_ops_labels_read_contacts">קריאת אנשי קשר</string>
-  <string name="app_ops_labels_modify_contacts">שינוי אנשי קשר</string>
-  <string name="app_ops_labels_read_call_log">קריאת יומן שיחות</string>
-  <string name="app_ops_labels_modify_call_log">שינוי יומן שיחות</string>
-  <string name="app_ops_labels_read_calendar">קריאת לוח שנה</string>
-  <string name="app_ops_labels_modify_calendar">שינוי לוח שנה</string>
+  <string name="app_ops_labels_read_contacts">קרא אנשי קשר</string>
+  <string name="app_ops_labels_modify_contacts">שנה אנשי קשר</string>
+  <string name="app_ops_labels_read_call_log">קרא יומן שיחות</string>
+  <string name="app_ops_labels_modify_call_log">שנה יומן שיחות</string>
+  <string name="app_ops_labels_read_calendar">קרא לוח שנה</string>
+  <string name="app_ops_labels_modify_calendar">שנה לוח שנה</string>
   <string name="app_ops_labels_wifi_scan">סריקת Wi-Fi</string>
-  <string name="app_ops_labels_notification">התראות/התראות קופצות</string>
+  <string name="app_ops_labels_notification">התראות/ התראות קופצות</string>
   <string name="app_ops_labels_cell_scan">סריקת סלולר</string>
-  <string name="app_ops_labels_call_phone">חיוג למכשיר הטלפון</string>
-  <string name="app_ops_labels_read_sms">קריאת SMS</string>
-  <string name="app_ops_labels_write_sms">כתיבת SMS</string>
-  <string name="app_ops_labels_receive_sms">‏קבלת SMS</string>
-  <string name="app_ops_labels_receive_emergency_sms">‏קבלת SMS חירום</string>
-  <string name="app_ops_labels_receive_mms">‏קבלת MMS</string>
-  <string name="app_ops_labels_receive_wap_push">קבלת דחיפת WAP</string>
-  <string name="app_ops_labels_send_sms">‏שליחת SMS</string>
-  <string name="app_ops_labels_read_icc_sms">קריאת הודעת SMS ICC</string>
-  <string name="app_ops_labels_write_icc_sms">כתיבת הודעת SMS ICC</string>
-  <string name="app_ops_labels_modify_settings">שינוי הגדרות</string>
+  <string name="app_ops_labels_call_phone">חייג למכשיר הטלפון</string>
+  <string name="app_ops_labels_read_sms">קרא SMS</string>
+  <string name="app_ops_labels_write_sms">כתוב SMS</string>
+  <string name="app_ops_labels_receive_sms">‏קבל SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">‏קבל SMS חירום</string>
+  <string name="app_ops_labels_receive_mms">‏קבל MMS</string>
+  <string name="app_ops_labels_receive_wap_push">קבל דחיפת WAP</string>
+  <string name="app_ops_labels_send_sms">‏שלח SMS</string>
+  <string name="app_ops_labels_read_icc_sms">קרא הודעת SMS ICC</string>
+  <string name="app_ops_labels_write_icc_sms">כתוב הודעת SMS ICC</string>
+  <string name="app_ops_labels_modify_settings">שנה הגדרות</string>
   <string name="app_ops_labels_draw_on_top">צייר מעל</string>
   <string name="app_ops_labels_access_notifications">גישה להתראות</string>
   <string name="app_ops_labels_camera">מצלמה</string>
   <string name="app_ops_labels_record_audio">הקלטת שמע</string>
   <string name="app_ops_labels_play_audio">ניגון שמע</string>
-  <string name="app_ops_labels_read_clipboard">קריאת לוח העתקה</string>
+  <string name="app_ops_labels_read_clipboard">קרא את לוח ההעתקה</string>
   <string name="app_ops_labels_modify_clipboard">שינוי לוח העתקה</string>
   <string name="app_ops_labels_media_buttons">לחצני מדיה</string>
   <string name="app_ops_labels_audio_focus">מיקוד שמע</string>
@@ -391,34 +392,34 @@
   <string name="app_ops_labels_alarm_volume">עוצמת השעון המעורר</string>
   <string name="app_ops_labels_notification_volume">עוצמת ההתראה</string>
   <string name="app_ops_labels_bluetooth_volume">עוצמת הקול של ה-Bluetooth</string>
-  <string name="app_ops_labels_keep_awake">שמירה במצב פעיל</string>
-  <string name="app_ops_labels_monitor_location">מעקב אחר מיקום</string>
-  <string name="app_ops_labels_monitor_high_power_location">מעקב אחר מיקום עם צריכת סוללה גבוהה</string>
-  <string name="app_ops_labels_get_usage_stats">קבלת סטטיסטיקות שימוש</string>
-  <string name="app_ops_labels_mute_unmute_microphone">השתקת/הפעלת מיקרופון</string>
-  <string name="app_ops_labels_toast_window">הצגת התראות קופצות</string>
-  <string name="app_ops_labels_project_media">הקרנת מדיה</string>
-  <string name="app_ops_labels_activate_vpn">הפעלת VPN</string>
-  <string name="app_ops_labels_write_wallpaper">קביעת טפט</string>
+  <string name="app_ops_labels_keep_awake">שמור במצב פעיל</string>
+  <string name="app_ops_labels_monitor_location">עקוב אחר מיקום</string>
+  <string name="app_ops_labels_monitor_high_power_location">עקוב אחר מיקום עם צריכת סוללה גבוהה</string>
+  <string name="app_ops_labels_get_usage_stats">קבל סטטיסטיקות שימוש</string>
+  <string name="app_ops_labels_mute_unmute_microphone">השתק/הפעל מיקרופון</string>
+  <string name="app_ops_labels_toast_window">הצג התראות קופצות</string>
+  <string name="app_ops_labels_project_media">הקרן מדיה</string>
+  <string name="app_ops_labels_activate_vpn">הפעל VPN</string>
+  <string name="app_ops_labels_write_wallpaper">קבע טפט</string>
   <string name="app_ops_labels_assist_structure">מבנה מסייע</string>
   <string name="app_ops_labels_assist_screenshot">צילום מסך מסייע</string>
-  <string name="app_ops_labels_read_phone_state">קריאת מצב הטלפון</string>
-  <string name="app_ops_labels_add_voicemail">הוספת תא קולי</string>
-  <string name="app_ops_labels_use_sip">שימוש ב-SIP</string>
-  <string name="app_ops_labels_make_call">יצירת שיחה</string>
-  <string name="app_ops_labels_use_fingerprint">שימוש בטביעת אצבע</string>
-  <string name="app_ops_labels_use_body_sensors">שימוש בחיישני גוף</string>
-  <string name="app_ops_labels_read_cell_broadcasts">קריאת שידורים סלולריים</string>
+  <string name="app_ops_labels_read_phone_state">קרא מצב טלפון</string>
+  <string name="app_ops_labels_add_voicemail">הוסף תא קולי</string>
+  <string name="app_ops_labels_use_sip">השתמש ב-SIP</string>
+  <string name="app_ops_labels_make_call">התקשר</string>
+  <string name="app_ops_labels_use_fingerprint">השתמש בטביעת אצבע</string>
+  <string name="app_ops_labels_use_body_sensors">השתמש בחיישני גוף</string>
+  <string name="app_ops_labels_read_cell_broadcasts">קרא שידורים סלולרים</string>
   <string name="app_ops_labels_mock_location">מיקום מדומה</string>
-  <string name="app_ops_labels_read_external_storage">קריאת אחסון חיצוני</string>
-  <string name="app_ops_labels_write_external_storage">כתיבה לאחסון חיצוני</string>
-  <string name="app_ops_labels_turn_screen_on">הדלקת המסך</string>
-  <string name="app_ops_labels_get_accounts">קבלת חשבונות</string>
-  <string name="app_ops_labels_toggle_wifi">שינוי מצב Wi-Fi</string>
-  <string name="app_ops_labels_toggle_bluetooth">שינוי מצב Bluetooth</string>
-  <string name="app_ops_labels_start_at_boot">הפעלה בעת איתחול המכשיר</string>
-  <string name="app_ops_labels_toggle_nfc">שינוי מצב NFC</string>
-  <string name="app_ops_labels_toggle_mobile_data">הפעלת/כיבוי נתונים סלולריים</string>
+  <string name="app_ops_labels_read_external_storage">קרא אחסון חיצוני</string>
+  <string name="app_ops_labels_write_external_storage">כתוב לאחסון חיצוני</string>
+  <string name="app_ops_labels_turn_screen_on">הפעל מסך</string>
+  <string name="app_ops_labels_get_accounts">קבל חשבונות</string>
+  <string name="app_ops_labels_toggle_wifi">הפעל/כבה Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">הפעל/כבה Bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">הפעל בעת איתחול המכשיר</string>
+  <string name="app_ops_labels_toggle_nfc">הפעל/כבה NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">הפעל/כבה נתונים סלולריים</string>
   <string name="app_ops_labels_superuser">גישת שורש (Root)</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">מורשה</string>
@@ -428,13 +429,13 @@
   <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (בשימוש <xliff:g id="count">%2$s</xliff:g>)</string>
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> אושרו</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> נחסמו</string>
-  <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> אופשרו, <xliff:g id="count">%2$s</xliff:g> נחסמו</string>
+  <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> אושרו, <xliff:g id="count">%2$s</xliff:g> נחסמו</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">הצג יישומי משתמש</string>
   <string name="app_ops_show_system_apps">הצג יישומים מובנים</string>
   <string name="app_ops_reset_counters">אפס מוני אישור/חסימה</string>
   <string name="app_ops_reset_confirm_title">אשר איפוס מונים</string>
-  <string name="app_ops_reset_confirm_mesg">האם אתה בטוח שברצונך לאפס את המונים?</string>
+  <string name="app_ops_reset_confirm_mesg">בטוח שברצונך לאפס מונים?</string>
   <string name="ok">אישור</string>
   <!-- Hostname setting -->
   <string name="device_hostname">שם הרשת עבור ההתקן</string>
@@ -516,14 +517,14 @@
   <string name="disable_navkeys_title">אפשר לחצני ניווט על המסך</string>
   <string name="disable_navkeys_summary">אפשר לחצני ניווט על המסך ובטל לחצנים פיזיים</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">הקשה כפולה לכיבוי מסך</string>
-  <string name="double_tap_to_sleep_summary">הקש פעמיים על שורת המצב כדי לכבות את המסך</string>
+  <string name="double_tap_to_sleep_title">נגיעה כפולה לכיבוי מסך</string>
+  <string name="double_tap_to_sleep_summary">גע פעמיים בשורת המצב כדי לכבות את המסך</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">מנע התעוררות מקרית</string>
-  <string name="proximity_wake_summary">בדוק את חיישן הקירבה לפני הפעלת המסך</string>
+  <string name="proximity_wake_summary">בדוק את חיישן הקרבה לפני הפעלת המסך</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">הער מסך בעת חיבור</string>
-  <string name="wake_when_plugged_or_unplugged_summary">הדלק את המסך כאשר מקור חשמל מתחבר או מתנתק מהמכשיר</string>
+  <string name="wake_when_plugged_or_unplugged_summary">הפעל את המסך כאשר מקור חשמל מתחבר או מתנתק מהמכשיר</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
   <string name="font_size_sample">דוגמה</string>
@@ -531,7 +532,7 @@
   <string name="volume_adjust_sounds_title">צליל שינוי עוצמת קול</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">עוצמת רטט</string>
-  <string name="vibrator_warning">ערכים גבוהים מ-%1$d לא מומלצים</string>
+  <string name="vibrator_warning">ערכים גבוהים מ-%1$d אינם מומלצים</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">כיול צבע</string>
   <string name="color_calibration_summary">כיול צבעי מסך</string>
@@ -556,7 +557,7 @@
   <string name="display_rotation_title">סיבוב</string>
   <string name="display_rotation_disabled">מושבת</string>
   <string name="display_rotation_unit">מעלות</string>
-  <string name="display_lockscreen_rotation_title">סובב את המסך נעילה</string>
+  <string name="display_lockscreen_rotation_title">סובב מסך נעילה</string>
   <string name="display_rotation_category_title">מצבי סיבוב</string>
   <string name="display_rotation_0_title">0 מעלות</string>
   <string name="display_rotation_90_title">90 מעלות</string>
@@ -598,11 +599,11 @@
   <string name="live_display_color_profile_dynamic_title">דינמי</string>
   <string name="live_display_color_profile_dynamic_summary">צבעים וגווני לבן בהירים משופרים</string>
   <string name="live_display_color_profile_cinema_title">קולנוע</string>
-  <string name="live_display_color_profile_cinema_summary">מטב הפקת צבעים עבור סרטונים</string>
+  <string name="live_display_color_profile_cinema_summary">שפר הפקת צבעים עבור סרטונים</string>
   <string name="live_display_color_profile_astronomy_title">אסטרונומיה</string>
   <string name="live_display_color_profile_astronomy_summary">אדום עמוק לשמירה על ראיית לילה</string>
   <string name="live_display_color_profile_photography_title">צילום</string>
-  <string name="live_display_color_profile_photography_summary">מטב הפקת צבעים עבור תמונות</string>
+  <string name="live_display_color_profile_photography_summary">שפר הפקת צבעים עבור תמונות</string>
   <string name="live_display_color_profile_basic_title">בסיסי</string>
   <string name="live_display_color_profile_basic_summary">השתמש בתצוגה ללא כיול</string>
   <!-- Whether to display IME switcher notifcation -->
@@ -613,7 +614,7 @@
   <string name="summary_heads_up_enabled">התראות קופצות פעילות</string>
   <string name="summary_heads_up_disabled">התראות קופצות מושבתות</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
-  <string name="bluetooth_accept_all_files">התר את כל סוגי הקבצים</string>
+  <string name="bluetooth_accept_all_files">קבל את כל סוגי הקבצים</string>
   <!-- High touch sensitivity -->
   <string name="high_touch_sensitivity_title">רגישות גבוהה למגע</string>
   <string name="high_touch_sensitivity_summary">הגבר את רגישות מסך המגע, כך שניתן יהיה להשתמש בו בעת לבישת כפפות</string>
@@ -625,32 +626,32 @@
   <string name="restarting_ui">מאתחל מערכת\u2026</string>
   <!-- Stylus Icon -->
   <string name="stylus_icon_enabled_title">הצג סמל בעת שימוש בעט אלקטרוני</string>
-  <string name="stylus_icon_enabled_summary">הצג את סמל העט בעת ריחוף או ציור עם העט</string>
+  <string name="stylus_icon_enabled_summary">הצג את סמל העט בעת ריחוף או ציור עם העט האלקטרוני</string>
   <!-- Stylus Gestures -->
-  <string name="gestures_settings_title">מחוות עט</string>
-  <string name="category_spen_title">מחוות עט</string>
+  <string name="gestures_settings_title">מחוות עט אלקטרוני</string>
+  <string name="category_spen_title">מחוות עט אלקטרוני</string>
   <string name="enable_subcat_title">עט אלקטרוני</string>
-  <string name="enable_spen_title_head">אפשר מחוות</string>
-  <string name="enable_spen_summary_head">השתמש במחוות החלקה בעת החזקת לחצן העט</string>
+  <string name="enable_spen_title_head">הפעל מחוות</string>
+  <string name="enable_spen_summary_head">השתמש במחוות החלקה בעת החזקת לחצן העט האלקטרוני</string>
   <string name="gestures_subcat_title">מחוות</string>
   <string name="gestures_left_spen_title_head">החלקה שמאלה</string>
   <string name="gestures_right_spen_title_head">החלקה ימינה</string>
   <string name="gestures_up_spen_title_head">החלקה למעלה</string>
   <string name="gestures_down_spen_title_head">החלקה למטה</string>
   <string name="gestures_long_spen_title_head">לחיצה ארוכה</string>
-  <string name="gestures_double_spen_title_head">לחיצה כפולה</string>
+  <string name="gestures_double_spen_title_head">הקשה כפולה</string>
   <!-- Gestures Options -->
   <string name="gestures_action_empty">ללא פעולה</string>
   <string name="gestures_action_home">בית</string>
   <string name="gestures_action_back">חזור</string>
   <string name="gestures_action_menu">תפריט</string>
-  <string name="gestures_action_search">הפעלת חיפוש</string>
+  <string name="gestures_action_search">הפעל חיפוש</string>
   <string name="gestures_action_recent">יישומים אחרונים</string>
   <!-- Stylus gestures -->
   <string name="stylus_app_not_installed">%s לא מותקן</string>
   <!-- Touchscreen hovering -->
   <string name="touchscreen_hovering_title">מגע בריחוף</string>
-  <string name="touchscreen_hovering_summary">מרשה להעביר עת האצבע מעל המסך כמו עכבר מחשב בדפדפנים, עמדות שליטה מרחוק וכד\'</string>
+  <string name="touchscreen_hovering_summary">מאפשר להעביר את האצבע מעל המסך כמו עכבר של מחשב בדפדפנים, בעמדות שליטה מרחוק וכד\'</string>
   <!-- Increasing ring tone volume -->
   <string name="increasing_ring_volume_option_title">עוצמת צלצול מתגברת</string>
   <string name="increasing_ring_min_volume_title">עוצמה התחלתית</string>
@@ -681,7 +682,7 @@
   <string name="status_bar_toggle_brightness">בקרת הבהירות</string>
   <string name="status_bar_toggle_brightness_summary">התאם בהירות על-ידי החלקה על שורת המצב</string>
   <string name="status_bar_notif_count_title">הצג מספור הודעות</string>
-  <string name="status_bar_notif_count_summary">הצג מספר הודעות ממתינות</string>
+  <string name="status_bar_notif_count_summary">הצג מספר התראות ממתינות</string>
   <string name="status_bar_quick_qs_pulldown_title">משיכה מהירה</string>
   <string name="status_bar_quick_qs_pulldown_summary">משיכה מצד %1$s של סרגל המצב פותחת את ההגדרות המהירות</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">שמאל</string>
@@ -693,7 +694,7 @@
   <string name="status_bar_clock_style_title">סגנון השעון</string>
   <string name="status_bar_clock_style_right">ימין</string>
   <string name="status_bar_clock_style_left">שמאל</string>
-  <string name="status_bar_clock_style_center">במרכז</string>
+  <string name="status_bar_clock_style_center">מרכז</string>
   <string name="status_bar_clock_style_hidden">מוסתר</string>
   <string name="status_bar_am_pm_title">סגנון AM/PM</string>
   <string name="status_bar_am_pm_info">שעון 24 שעות מופעל</string>
@@ -714,26 +715,26 @@
   <string name="status_bar_battery_percentage_text_next">ליד הסמל</string>
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">סמלי שורת מצב</string>
-  <string name="status_bar_icons_summary">שלוט על אילו סמלים של שורת המצב יוצגו</string>
+  <string name="status_bar_icons_summary">שלוט הסמלים שיוצגו בשורת המצב</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">חסום אירועי מחוות מגע</string>
   <string name="edge_gesture_service_summary">אל תשלח אירועי נגיעות בסרגל הניווט ובשורת המצב ליישומים</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">אף פעם</string>
   <string name="keep_screen_on_debugging">בעת איתור באגים דרך USB</string>
-  <string name="keep_screen_on_charging">בזמן טעינה</string>
+  <string name="keep_screen_on_charging">בעת טעינה</string>
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">פרטיות</string>
   <!-- Privacy Guard -->
   <string name="privacy_guard_default_title">מופעל כברירת מחדל</string>
-  <string name="privacy_guard_default_summary">אפשר כברירת מחדל עבור יישומים מותקנים חדשים</string>
+  <string name="privacy_guard_default_summary">אפשר כברירת מחדל עבור יישומים שהותקנו לאחרונה</string>
   <string name="privacy_guard_manager_title">שומר הפרטיות</string>
   <string name="privacy_guard_manager_summary">נהל לאילו יישומים יש גישה למידע הפרטי שלך</string>
   <string name="privacy_guard_no_user_apps">אין יישומים מותקנים</string>
   <string name="privacy_guard_help_title">עזרה</string>
   <string name="privacy_guard_reset_title">איפוס</string>
   <string name="privacy_guard_reset_text">לאפס הרשאות?</string>
-  <string name="privacy_guard_help_text">בחלון זה אתה יכול לבחור עבור אילו יישומים שומר הפרטיות יפעל. הייישומים הנבחרים לא יקבלו גישה למידע הפרטי שלך כמו אנשי קשר, הודעות ויומן שיחות. לחיצה ארוכה על יישום תפתח את פרטי ההרשאות שלו.\n\nיישומים מובנים לא מוצגים כברירת מחדל, אבל יכולים להיחשף על ידי בחירת ההגדרה המתאימה.</string>
+  <string name="privacy_guard_help_text">בחלון זה באפשרותך לבחור עבור אילו יישומים שומר הפרטיות יפעל. היישומים הנבחרים לא יקבלו גישה למידע הפרטי שלך כמו אנשי קשר, הודעות ויומן שיחות. לחיצה ארוכה על יישום תפתח את פרטי ההרשאות שלו.\n\nיישומים מובנים לא מוצגים כברירת מחדל, אבל יכולים להיחשף על ידי בחירת ההגדרה המתאימה.</string>
   <string name="privacy_guard_manager_show_system_apps">הצג יישומים מובנים</string>
   <string name="privacy_guard_advanced_settings_title">מתקדם</string>
   <string name="privacy_guard_notification_title">הצג התראה</string>
@@ -741,7 +742,7 @@
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
   <string name="lockpattern_settings_enable_error_path_title">הצג שגיאות דפוס</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
-  <string name="lockpattern_settings_enable_dots_title">הצג דפוס נקודות</string>
+  <string name="lockpattern_settings_enable_dots_title">הצג נקודות דפוס</string>
   <!-- Whether the keyguard will directly pass to password entry -->
   <string name="lock_directly_show_password">הצג ישירות את הזנת הסיסמה</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
@@ -751,11 +752,11 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">הצג אפקטים בעת השמעת מוזיקה</string>
   <!-- lock screen disabled by QS tile warning -->
-  <string name="lockscreen_disabled_by_qs_tile_title">מושבת על ידי אריח הגדרות מהירות</string>
+  <string name="lockscreen_disabled_by_qs_tile_title">כובה על ידי אריח הגדרות מהירות</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">הקש כדי להפעיל את מסך הנעילה</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">מסך הנעילה מופעל!</string>
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">מצב הפעלת שומר סוללה</string>
+  <string name="battery_saver_threshold">סף להפעלת שומר סוללה</string>
   <string name="battery_saver_summary">הנמך ביצועים והגבל תעבורת נתונים ברקע</string>
   <string name="battery_saver_summary_unavailable">לא זמין בזמן טעינה</string>
   <!-- Battery : Automatic performance profiles -->
@@ -768,7 +769,7 @@
   <string name="notification_ringtone_title_cm">צליל התראה</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">אתחול מתקדם</string>
-  <string name="advanced_reboot_summary">כאשר פתוח, מוסיף לתפריט ההפעלה אפשרויות לאתחול לשחזור, תוכנת טעינה ראשונית או לביצוע אתחול מהיר</string>
+  <string name="advanced_reboot_summary">כאשר פתוח, מוסיף לתפריט ההפעלה אפשרויות לאתחול עבור שחזור, תוכנת טעינה ראשונית או ביצוע אתחול מהיר</string>
   <string name="category_interface">ממשק</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">שולחן עבודה מורחב</string>
@@ -776,26 +777,26 @@
   <string name="expanded_hide_status">הסתר שורת מצב</string>
   <string name="expanded_hide_navigation">הסתר סרגל ניווט</string>
   <string name="expanded_hide_both">הסתר את שניהם</string>
-  <string name="expanded_nothing_to_show">כדי להוסיף תצורה מותאמת אישית לכל יישום למצב מורחב, העבר את \"זמין עבור הכל\" למצב כבוי</string>
-  <string name="expanded_enabled_for_all">זמין עבור כולם</string>
-  <string name="expanded_desktop_style">סגנון שולחן העבודה המורחב</string>
+  <string name="expanded_nothing_to_show">כדי להוסיף תצורה מותאמת אישית למצב מורחב עבור כל יישום, העבר את \"זמין עבור הכול\" למצב כבוי</string>
+  <string name="expanded_enabled_for_all">זמין עבור הכול</string>
+  <string name="expanded_desktop_style">סגנון שולחן עבודה מורחב</string>
   <string name="expanded_desktop_style_description">בחר סגנון ברירת מחדל לשולחן העבודה המורחב</string>
   <string name="expanded_desktop_title">אפשרויות שולחן עבודה מורחב</string>
   <!-- Kill app long-press back -->
   <string name="kill_app_longpress_back">הרוג יישום עם לחצן חזור</string>
-  <string name="kill_app_longpress_back_summary">הרוג יישום נראה על ידי לחיצה ארוכה על כפתור החזרה</string>
+  <string name="kill_app_longpress_back_summary">הרוג יישום נראה על ידי לחיצה ארוכה על לחצן החזרה</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">הצג את סרגל החיפוש במסך יישומים אחרונים</string>
-  <string name="keywords_recents_show_searchbar">אחרון אחרונות כבה הדלק הראה הסתר סרגל חיפוש סרגל-חיפוש</string>
+  <string name="keywords_recents_show_searchbar">אחרון אחרונים כבה הפעל הצג הסתר סרגל חיפוש סרגל-חיפוש</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">התעוררות על ידי קול</string>
-  <string name="voice_wakeup_retrain_title">הכשר את קולך</string>
+  <string name="voice_wakeup_settings_title">השכמה קולית</string>
+  <string name="voice_wakeup_retrain_title">אמן שוב את קולך</string>
   <string name="voice_wakeup_activity_title">פעילות להפעלה</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">התעוררות קולית צריכה לקבל הרשאות שיחת טלפון כדי לבחור איש קשר בחיוג ישיר.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">השכמה קולית צריכה לקבל הרשאות שיחת טלפון כדי לבחור איש קשר בחיוג ישיר.</string>
   <string name="picker_activities">פעילויות</string>
   <string name="select_custom_app_title">בחר יישום אחר</string>
-  <string name="select_custom_activity_title">בחר הפעילות המותאמת אישית</string>
+  <string name="select_custom_activity_title">בחר פעילות מותאמת אישית</string>
   <!-- Blacklist preferences -->
   <string name="blacklist_title">רשימת מתקשרים חסומים</string>
   <string name="blacklist_edit_dialog_title">ערוך מספר טלפון חסום</string>
@@ -834,15 +835,15 @@
   <string name="spam_added_title">%1$s נוסף</string>
   <string name="spam_last_blocked_title">נחסם לאחרונה %1$s</string>
   <string name="block_notifications_title">סנן התראות</string>
-  <string name="block_notifications_summary">נהל התראות מהן התעלמת ומסננים</string>
+  <string name="block_notifications_summary">נהל התראות ומסננים שמהם התעלמת</string>
   <string name="no_filters_title">לא הוגדרו מסננים</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">סטטיסטיקות CyanogenMod</string>
   <string name="anonymous_statistics_summary">עזור לשפר את CyanogenMod על ידי דיווח סטטיסטיקות אנונימי</string>
   <string name="anonymous_statistics_warning_title">אודות</string>
-  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת CyanogenMod יאפשר שליחת מידע לא פרטי למפתחי CyanogenMod על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיות שלך או במידע שלך. המידע נשלח כל אתחול.\n\nכדי לצפות בדוגמה של המידע, לחץ על תצוגה מקדימה של נתונים.</string>
-  <string name="enable_reporting_title">אפשר דיווח</string>
+  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת CyanogenMod יאפשר שליחת מידע לא אישי למפתחי CyanogenMod על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, לחץ על תצוגה מקדימה של נתונים.</string>
+  <string name="enable_reporting_title">הפעל דיווח</string>
   <string name="preview_data_title">תצוגה מקדימה של נתונים</string>
   <string name="view_stats_title">הצג סטטיסטיקות</string>
   <string name="anonymous_learn_more">למידע נוסף</string>
@@ -851,7 +852,7 @@
   <string name="preview_device_title">מכשיר</string>
   <string name="preview_version_title">גרסה</string>
   <string name="preview_country_title">מדינה</string>
-  <string name="preview_carrier_title">חברת סלולר</string>
+  <string name="preview_carrier_title">ספק תקשורת</string>
   <string name="stats_collection_title">אוסף סטטיסטיקות</string>
   <string name="stats_collection_summary">כאשר מופעל, מאפשר איסוף מדדים</string>
   <!-- Protected apps lockpattern reset button -->
@@ -872,7 +873,7 @@
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">תורמים</string>
   <string name="contributors_cloud_loading_message">טוען נתוני תורמים\u2026</string>
-  <string name="contributors_cloud_failed_message">אין אפשרות לטעון נתוני תורמים</string>
+  <string name="contributors_cloud_failed_message">לא ניתן לטעון נתוני תורמים</string>
   <string name="contributor_info_menu">פרטי תורם</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>שם:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
@@ -895,7 +896,7 @@
   <string name="link_volume_option_title">קשר את עוצמות הרינגטון וההתראות</string>
   <string name="lcd_density_prompt_message">ייתכן שמספר יישומים לא יתפקדו כראוי בשימוש ב-DPI לא סטנדרטי.\n\nמכשירך יבצע הפעלה מחדש.</string>
   <!-- Edit access point labels: PPP number -->
-  <string name="apn_ppp_number">APN PPP מספר טלפון</string>
+  <string name="apn_ppp_number">מספר טלפון APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <string name="duplicate_apn_error_title">APN כפול</string>
   <string name="duplicate_apn_error_message">APN זה כבר קיים. מחק או שנה פרמטרים.</string>
@@ -904,8 +905,8 @@
   <string name="sim_missing">חסר או פגום</string>
   <string name="sim_enabler_need_disable_sim">כרטיס ה-SIM יפסיק לפעול. האם ברצונך להמשיך?</string>
   <string name="sim_enabler_will_disable_sim_title">שים לב</string>
-  <string name="sim_enabler_need_switch_data_service">SIM זה יהפוך ללא זמין ו-SIM <xliff:g id="slotid">%1$s</xliff:g> יופעל בשביל שירותי נתונים. האם אתה בטוח שברצונך להמשיך?</string>
-  <string name="sim_enabler_airplane_on">אין אפשרות לבצע את הפעולה כאשר שמצב טיסה פעיל.</string>
+  <string name="sim_enabler_need_switch_data_service">SIM זה יהפוך ללא זמין ו-SIM <xliff:g id="slotid">%1$s</xliff:g> ישמש לשירותי נתונים. בטוח שברצונך להמשיך?</string>
+  <string name="sim_enabler_airplane_on">אין אפשרות לבצע את הפעולה במצב טיסה פעיל.</string>
   <string name="sim_enabler_in_call">אין אפשרות לבצע את הפעולה בזמן השיחה.</string>
   <string name="sim_enabler_both_inactive">אין אפשרות להשבית את כל כרטיסי ה-SIM</string>
   <string name="sim_enabler_enabling">מפעיל\u2026</string>
@@ -924,7 +925,7 @@
   <string name="sim_mobile_network_settings_title">הגדרות SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
-  <string name="zen_mode_summary_reminders">תזכירים</string>
+  <string name="zen_mode_summary_reminders">תזכורות</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">אירועים</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
@@ -938,11 +939,11 @@
   <!-- IC Codes -->
   <string name="ic_code_model">דגם: %1$s</string>
   <string name="ic_code_full">IC: %1$s</string>
-  <string name="sim_ringtone_title">הצלצול של SIM %d</string>
+  <string name="sim_ringtone_title">הרינגטון של SIM %d</string>
   <!-- label for application name -->
   <string name="app_name_label_cm">יישום:</string>
   <!-- label for last time used -->
-  <string name="last_time_used_label_cm">נעשה שימוש בפעם האחרונה:</string>
+  <string name="last_time_used_label_cm">שימש בפעם האחרונה:</string>
   <!-- label for usage time -->
   <string name="usage_time_label_cm">זמן שימוש:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -954,8 +955,8 @@
   <string name="factory_reset_instructions_summary">פעולה זאת תמחק את כל החשבונות, היישומים (כולל נתוניהם) והגדרות המערכת ממכשיר זה</string>
   <string name="factory_reset_personal_content">תוכן אישי</string>
   <string name="factory_reset_erase_stored_content">מחק תוכן מאוחסן</string>
-  <string name="factory_reset_erase_stored_content_summary">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן על מכשיר זה</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן על מכשיר זה.\n\n<b>לא ניתן לשמור את התוכן עקב הצפנת המכשיר.</b></string>
+  <string name="factory_reset_erase_stored_content_summary">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן במכשיר זה</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן במכשיר זה.\n\n<b>לא ניתן לשמור את התוכן עקב הצפנת המכשיר.</b></string>
   <string name="factory_reset_erase_sd_card">פרמט כרטיס זיכרון</string>
   <string name="factory_reset_erase_sd_card_summary">מחק את כל הנתונים על כרטיס הזיכרון, כולל מוזיקה ותמונות</string>
   <string name="factory_reset_warning_text_reset_now">אפס עכשיו</string>
@@ -963,7 +964,7 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">אחר</string>
   <!-- Wi-Fi tethering inactivity timeout -->
-  <string name="hotstpot_inactivity_timeout_text">זמן מקסימלי להפעלת נקודת Wi-Fi חמה</string>
+  <string name="hotstpot_inactivity_timeout_text">זמן קצוב לנקודת Wi-Fi חמה</string>
   <string name="hotstpot_inactivity_timeout_never">אף פעם</string>
   <string name="hotstpot_inactivity_timeout_1_minute">דקה אחת</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 דקות</string>
@@ -979,18 +980,23 @@
   <string name="live_lock_screen_settings_button">הגדרות</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
   <string name="live_lock_screen_settings_disabled_prompt">להצגת מסכי נעילה חיים זמינים, יש להפעיל את התכונה תחילה.</string>
-  <string name="interruptions_ignore_while_media_title">מנע שינוי עוצמת שמע</string>
+  <string name="interruptions_ignore_while_media_title">מנע שינוי עוצמת קול</string>
   <string name="interruptions_ignore_while_media_summary">אל תנמיך את עוצמת המוזיקה כאשר התראה מגיעה</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">CyanogenMod משפטי</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">איפוס סטטיסטיקות</string>
   <!-- Reset stats confirmation dialog's message -->
-  <string name="reset_stats_msg">היסטוריית הסוללה שלך הולכת להתאפס</string>
+  <string name="reset_stats_msg">היסטוריית הסוללה שלך עומדת להתאפס</string>
   <!-- Dock battery not present message -->
   <string name="dock_battery_not_present">סוללה חיצונית לא נוכחת</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <string name="battery_info_status_charging_dock_ac">מטעין דרך חיבור AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">מטעין דרך חיבור USB</string>
+  <string name="restrict_app_wlan_title">בטל את שימוש היישום ב- Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">מונע מיישום מלהשתמש בחיבור נתוני Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">בטל את שימוש היישום באינטרנט סלולרי</string>
+  <string name="restrict_app_cellular_summary">מונע מיישום מלהשתמש בחיבור נתונים סלולריים</string>
+  <string name="privacy_guard_internet_category">אינטרנט</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index e9d8bba..9c1fa60 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -164,6 +164,7 @@
   <string name="toggleData">データ通信</string>
   <string name="toggleSync">データの自動同期</string>
   <string name="toggle2g3g4g">優先ネットワークの種類</string>
+  <string name="toggle2g3g4g_msim">優先ネットワークの種類（%1$s）</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi地域コード</string>
@@ -860,7 +861,6 @@
   <string name="menu_hidden_apps_delete">リセット</string>
   <string name="menu_hidden_apps_reset_lock">パターンロックをリセット</string>
   <string name="protected_apps">アプリの保護</string>
-  <string name="protected_apps_summary">パスワードでロックしている時に非表示にするアプリケーションを管理する</string>
   <string name="saving_protected_components">コンポーネントの状態を保存中\u2026</string>
   <string name="pa_login_username_hint">ユーザー名（メール）</string>
   <string name="pa_login_password_hint">パスワード</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index efae01d..96b454c 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -863,7 +863,6 @@
   <string name="menu_hidden_apps_delete">ಮರುಹೊಂದಿಸು</string>
   <string name="menu_hidden_apps_reset_lock">ನಮೂನೆ ಲಾಕ್ ಮರುಹೊಂದಿಸಿ</string>
   <string name="protected_apps">ಸಂರಕ್ಷಿತ ಆಪ್ಸ್</string>
-  <string name="protected_apps_summary">ಸುರಕ್ಷಿತ ಲಾಕ್ ಹಿಂದೆ ಅಡಗಿರುವ ಅಪ್ಲಿಕೇಶನ್ ನಿರ್ವಹಿಸು</string>
   <string name="saving_protected_components">ಘಟಕ ಸ್ಥಿತಿಯನ್ನು ಉಳಿಸಲಾಗುತ್ತಿದೆ\u2026</string>
   <string name="pa_login_username_hint">ಬಳಕೆದಾರಹೆಸರು (ಇಮೇಲ್)</string>
   <string name="pa_login_password_hint">ಪ್ರವೇಶಪದ</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 90637a1..bde61e9 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -860,7 +860,6 @@
   <string name="menu_hidden_apps_delete">초기화</string>
   <string name="menu_hidden_apps_reset_lock">패턴 잠금 초기화</string>
   <string name="protected_apps">보호된 애플리케이션</string>
-  <string name="protected_apps_summary">보안 잠금을 사용할 때 어떤 애플리케이션의 알림을 표시하지 않을지 관리합니다</string>
   <string name="saving_protected_components">구성요소 상태 저장\u2026</string>
   <string name="pa_login_username_hint">사용자 이름 (이메일)</string>
   <string name="pa_login_password_hint">비밀번호</string>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 37427cd..3b0c23e 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">പുനഃസജ്ജമാക്കുക</string>
   <string name="menu_hidden_apps_reset_lock">ലോക്ക് പാറ്റേൺ പുനഃക്രമീകരിക്കുക</string>
   <string name="protected_apps">സംരക്ഷിത ആപ്ലിക്കേഷനുകൾ</string>
-  <string name="protected_apps_summary">ഒരു സുരക്ഷിത ലോക്കിന് പിന്നിൽ ഏതൊക്കെ ആപ്ലിക്കേഷനുകളാണ് മറയ്ക്കേണ്ടതെന്ന് നിയന്ത്രിക്കുക</string>
   <string name="saving_protected_components">ഘടകഭാഗത്തിന്റെ സ്ഥിതി സേവ് ചെയ്യുന്നു\u2026</string>
   <string name="pa_login_username_hint">ഉപയോക്തൃനാമം (ഇമെയിൽ)</string>
   <string name="pa_login_password_hint">പാസ്‌വേഡ്</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index a3be628..57268dd 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">रीसेट करा</string>
   <string name="menu_hidden_apps_reset_lock">पॅटर्न लॉक रीसेट करा</string>
   <string name="protected_apps">संरक्षित अनुप्रयोग</string>
-  <string name="protected_apps_summary">सुरक्षित लॉकमागे कोणती अनुप्रयोग लपवली जातात ते व्यवस्थापित करा</string>
   <string name="saving_protected_components">घटक स्थिती जतन करत आहे\u2026</string>
   <string name="pa_login_username_hint">वापरकर्तानाव (ईमेल)</string>
   <string name="pa_login_password_hint">संकेतशब्द</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 9b0eafa..0e6c0bd 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -254,6 +254,7 @@
   <string name="notification_light_screen_on">Lys med skjermen på</string>
   <string name="notification_light_use_multiple_leds">Flere lysdioder</string>
   <string name="keywords_lights_brightness_level">dim lysdioder lysstyrke</string>
+  <string name="notification_light_automagic">Velg farger automatisk</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Lys innstillinger</string>
   <string name="led_notification_text">LED lyset aktiveres av innstillingene</string>
@@ -316,6 +317,7 @@
   <string name="app_ops_summaries_media_volume">Mediavolum</string>
   <string name="app_ops_summaries_alarm_volume">alarmvolum</string>
   <string name="app_ops_summaries_notification_volume">varslingsvolum</string>
+  <string name="app_ops_summaries_bluetooth_volume">bluetooth volum</string>
   <string name="app_ops_summaries_keep_awake">hold våken</string>
   <string name="app_ops_summaries_monitor_location">skjerm plassering</string>
   <string name="app_ops_summaries_monitor_high_power_location">overvåk kraftkrevende plassering</string>
@@ -332,8 +334,10 @@
   <string name="app_ops_summaries_turn_screen_on">slå skjermen på</string>
   <string name="app_ops_summaries_get_accounts">få kontoer</string>
   <string name="app_ops_summaries_toggle_wifi">aktivere/deaktivere Wifi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">veksle bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">start ved oppstart</string>
   <string name="app_ops_summaries_toggle_nfc">veksle NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">veksle mobildata</string>
   <string name="app_ops_summaries_superuser">Root-tilgang</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Grov plassering</string>
@@ -375,6 +379,7 @@
   <string name="app_ops_labels_notification_volume">varslingsvolum</string>
   <string name="app_ops_labels_bluetooth_volume">Bluetoothvolum</string>
   <string name="app_ops_labels_keep_awake">hold våken</string>
+  <string name="app_ops_labels_monitor_location">Overvåk plassering</string>
   <string name="app_ops_labels_mute_unmute_microphone">Demp/fjern demping mikrofon</string>
   <string name="app_ops_labels_toast_window">vise toastmeldinger</string>
   <string name="app_ops_labels_project_media">Prosjekt media</string>
@@ -382,13 +387,16 @@
   <string name="app_ops_labels_add_voicemail">Legg til mobilsvar</string>
   <string name="app_ops_labels_use_sip">Bruk SIP</string>
   <string name="app_ops_labels_make_call">Foreta anrop</string>
+  <string name="app_ops_labels_use_fingerprint">Bruk fingeravtrykk</string>
   <string name="app_ops_labels_read_external_storage">Les fra ekstern lagring</string>
   <string name="app_ops_labels_write_external_storage">Skriv til ekstern lagring</string>
   <string name="app_ops_labels_turn_screen_on">Slå skjermen på</string>
   <string name="app_ops_labels_get_accounts">Få kontoer</string>
   <string name="app_ops_labels_toggle_wifi">Aktivere/deaktivere Wifi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Veksle bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Start ved oppstart</string>
   <string name="app_ops_labels_toggle_nfc">NFC av/på</string>
+  <string name="app_ops_labels_toggle_mobile_data">Veksle mobildata</string>
   <string name="app_ops_labels_superuser">Root-tilgang</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Tillatt</string>
@@ -682,6 +690,7 @@
   <string name="status_bar_battery_percentage_text_inside">Inne i ikonet</string>
   <string name="status_bar_battery_percentage_text_next">Ved siden av ikonet</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Statusbarikoner</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokker touchbevegelseshendelser</string>
   <string name="edge_gesture_service_summary">Ikke send touch hendelser for navigering og status bar bevegelser til apps</string>
@@ -718,6 +727,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Vis musikk visualizer</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Deaktivert fra hurtiginnstillinger</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Trykk for å aktivere låseskjermen</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Låseskjerm aktivert!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Batterisparingsterskel</string>
   <string name="battery_saver_summary">Reduser ytelsen og begrens bakgrunnsdata</string>
@@ -727,6 +739,7 @@
   <string name="autoperf_summary">Velg automatisk en passende batterimodus for forskjellige apper</string>
   <string name="perf_profile_title">Batterimodus</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Apper startet ved oppstart</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Varslingstone</string>
   <!-- Advanced reboot options -->
@@ -855,21 +868,27 @@
   <string name="link_volume_option_title">Link ringetone &amp; varslings volumer</string>
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Dupliserte APN</string>
   <string name="sim_disabled">deaktivert</string>
   <string name="sim_missing">manglende eller feil</string>
+  <string name="sim_enabler_need_disable_sim">SIM-kortet vil bli deaktivert. Vil du fortsette?</string>
   <string name="sim_enabler_will_disable_sim_title">Oppmerksomhet</string>
   <string name="sim_enabler_airplane_on">Kan ikke utføre operasjonen mens Flymodus er på.</string>
   <string name="sim_enabler_in_call">Kan ikke utføre operasjonen i samtalen.</string>
   <string name="sim_enabler_both_inactive">Kan ikke deaktivere alle SIM-kort</string>
+  <string name="sim_enabler_enabling">Aktiverer\u2026</string>
   <string name="sim_enabler_disabling">Deaktiverer\u2026</string>
   <string name="sub_activate_success">SIM aktivert.</string>
   <string name="sub_activate_failed">Aktivering mislyktes.</string>
+  <string name="sub_deactivate_success">SIM deaktivert.</string>
   <string name="sub_deactivate_failed">Deaktivering mislyktes.</string>
   <string name="primary_sub_select_title">Standard 3G/LTE abonnement</string>
+  <string name="select_sim_card">Velg SIM-kort</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">SIM %d-status</string>
   <string name="sim_card_lock_settings_title">SIM %d-låseinnstillinger</string>
   <string name="sim_card_summary_empty">SIM-kortet er ikke satt inn</string>
+  <string name="sim_mobile_network_settings_category_title">Mobilnettverk innstillinger</string>
   <string name="sim_mobile_network_settings_title">SIM %d-innstillinger</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
@@ -877,6 +896,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">hendelser</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">valgte oppringere</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valgte meldinger</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -890,6 +910,7 @@
   <!-- label for application name -->
   <string name="app_name_label_cm">App:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Sist brukt:</string>
   <!-- label for usage time -->
   <string name="usage_time_label_cm">Brukstid:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 27431a1..cfcd640 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">Opnieuw instellen</string>
   <string name="menu_hidden_apps_reset_lock">Patroon opnieuw instellen</string>
   <string name="protected_apps">Beschermde apps</string>
-  <string name="protected_apps_summary">Beheren welke apps beschermd zijn</string>
   <string name="saving_protected_components">Opslaan\u2026</string>
   <string name="pa_login_username_hint">Gebruikersnaam (e-mail)</string>
   <string name="pa_login_password_hint">Wachtwoord</string>
diff --git a/res/values-or-rIN/arrays.xml b/res/values-or-rIN/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-or-rIN/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 494894e..4390cab 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">ପୁନଃସେଟ୍</string>
   <string name="menu_hidden_apps_reset_lock">ପାଟର୍ଣ୍ଣ ଲକ୍‍ ପୁନଃସେଟ୍ କରନ୍ତୁ</string>
   <string name="protected_apps">ସୁରଷିତ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ</string>
-  <string name="protected_apps_summary">ଏକ ସୁର‍କ୍ଷିତ ଲକ୍‍ ପଛରେ ଯେଉଁ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ଲୁ୍ଚିଛି ତାହା ପରିଚାଳନା କରନ୍ତୁ</string>
   <string name="saving_protected_components">ଉପାଦାନ ‍ସ୍ଥିତି ସଂରକ୍ଷଣ କରାଯାଉ୍ଛି\u2026</string>
   <string name="pa_login_username_hint">ଉପଭୋକ୍ତାଙ୍କ ନାମ (ଇମେଲ୍)</string>
   <string name="pa_login_password_hint">ପାସୱାର୍ଡ୍</string>
diff --git a/res/values-or-rIN/strings.xml b/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-or-rIN/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 00d3097..96c954b 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -161,6 +161,7 @@
   <string name="toggleData">Transmisja danych</string>
   <string name="toggleSync">Automatyczna synchronizacja danych</string>
   <string name="toggle2g3g4g">Preferowany typ sieci</string>
+  <string name="toggle2g3g4g_msim">Preferowany typ sieci (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Kod regionu Wi\u2011Fi</string>
@@ -859,7 +860,6 @@
   <string name="menu_hidden_apps_delete">Przywróć domyślne</string>
   <string name="menu_hidden_apps_reset_lock">Zresetuj wzór blokady</string>
   <string name="protected_apps">Chronione aplikacje</string>
-  <string name="protected_apps_summary">Zarządzaj, które aplikacje mają być ukryte za bezpieczną blokadą</string>
   <string name="saving_protected_components">Zapisywanie obecnego stanu\u2026</string>
   <string name="pa_login_username_hint">Użytkownik (e-mail)</string>
   <string name="pa_login_password_hint">Hasło</string>
@@ -991,4 +991,6 @@
   <string name="battery_info_status_charging_dock_ac">Ładowanie dokiem AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Ładowanie dokiem USB</string>
+  <string name="restrict_app_cellular_summary">Uniemożliwia aplikacji na korzystanie z danych mobilnych</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index d5d5172..ba6ec3b 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -161,6 +161,7 @@
   <string name="toggleData">Conexão de dados</string>
   <string name="toggleSync">Sincronização automática de dados</string>
   <string name="toggle2g3g4g">Tipo de rede preferida</string>
+  <string name="toggle2g3g4g_msim">Tipo de rede preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Código de região Wi\u2011Fi</string>
@@ -857,7 +858,7 @@
   <string name="menu_hidden_apps_delete">Redefinir</string>
   <string name="menu_hidden_apps_reset_lock">Redefinir o bloqueio padrão</string>
   <string name="protected_apps">Aplicativos protegidos</string>
-  <string name="protected_apps_summary">Gerenciar quais aplicativos estão escondidos atrás da trava de segurança</string>
+  <string name="protected_apps_summary">Gerenciar quais apps estão escondidos atrás da trava de segurança</string>
   <string name="saving_protected_components">Salvando o estado dos componentes\u2026</string>
   <string name="pa_login_username_hint">Nome de usuário (e-mail)</string>
   <string name="pa_login_password_hint">Senha</string>
@@ -989,4 +990,9 @@
   <string name="battery_info_status_charging_dock_ac">Carregamento via dock AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Carregamento via dock USB</string>
+  <string name="restrict_app_wlan_title">Impedir o uso de Wi\u2011Fi no app</string>
+  <string name="restrict_app_wlan_summary">Impedir que o app use a conexão de dados de Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Impedir que o app o use a rede de celular</string>
+  <string name="restrict_app_cellular_summary">Impedir que este app usar a conexão de dados celular</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index c71e217..a9bfb15 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Ligação de dados</string>
   <string name="toggleSync">Sincronização automática de dados</string>
   <string name="toggle2g3g4g">Tipo de rede preferida</string>
+  <string name="toggle2g3g4g_msim">Tipo de rede preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Código de região do Wi\u2011Fi</string>
@@ -928,7 +929,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
-  <string name="zen_mode_summary_selected_callers">chamadores selecionados</string>
+  <string name="zen_mode_summary_selected_callers">números selecionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensagens selecionadas</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -993,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Carregar na doca AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Carregar através da doca USB</string>
+  <string name="restrict_app_wlan_title">Desativar utilização do Wi-Fi</string>
+  <string name="restrict_app_wlan_summary">Impedir que a aplicação utilize ligações Wi-Fi</string>
+  <string name="restrict_app_cellular_title">Desativar utilização dos dados móveis</string>
+  <string name="restrict_app_cellular_summary">Impedir que a aplicação utilize ligações de dados móveis</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 8eea86e..df78f0c 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -158,6 +158,7 @@
   <string name="toggleData">Conexiune de date</string>
   <string name="toggleSync">Auto-sincronizare date</string>
   <string name="toggle2g3g4g">Tipul preferat de rețea</string>
+  <string name="toggle2g3g4g_msim">Tipul preferat de rețea (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Codul de regiune Wi\u2011Fi</string>
@@ -913,4 +914,5 @@
   <string name="battery_info_status_charging_dock_ac">Încărcare în stativ AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Încărcare prin stativ USB</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index a3b3349..731ebf3 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -995,4 +995,9 @@
   <string name="battery_info_status_charging_dock_ac">Зарядка от адаптера док-станции</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зарядка через USB док-станции</string>
+  <string name="restrict_app_wlan_title">Запретить исп. Wi-Fi</string>
+  <string name="restrict_app_wlan_summary">Не разрешать приложению передачу данных по сетям Wi-Fi</string>
+  <string name="restrict_app_cellular_title">Запретить исп. моб. данные</string>
+  <string name="restrict_app_cellular_summary">Не разрешать приложению передачу данных по мобильным сетям</string>
+  <string name="privacy_guard_internet_category">Интернет</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index e33abb8..7654055 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -167,6 +167,7 @@
   <string name="toggleData">Podatkovna povezava</string>
   <string name="toggleSync">Samodejno sinhroniziraj podatke</string>
   <string name="toggle2g3g4g">Priljubljena vrsta omrežja</string>
+  <string name="toggle2g3g4g_msim">Priljubljena vrsta omrežja (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Območna koda Wi\u2011Fi</string>
@@ -997,4 +998,9 @@
   <string name="battery_info_status_charging_dock_ac">Poln. z nap. postaje</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Poln. preko USB-ja pos.</string>
+  <string name="restrict_app_wlan_title">Onemogoči aplikaciji uporabo omrežja Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Prepreči aplikaciji uporabo podatkovne povezave Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Onemogoči aplikaciji uporabo mob. omrežja</string>
+  <string name="restrict_app_cellular_summary">Prepreči aplikaciji uporabo mobilnih podatkov</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index d07700e..d7217a2 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -166,6 +166,7 @@
   <string name="toggleData">Веза података</string>
   <string name="toggleSync">Ауто-синхрон. података</string>
   <string name="toggle2g3g4g">Приоритетан тип мреже</string>
+  <string name="toggle2g3g4g_msim">Приоритетан тип мреже (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi регионални код</string>
@@ -994,4 +995,9 @@
   <string name="battery_info_status_charging_dock_ac">Пуњење на доку AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Пуњење преко USB дока</string>
+  <string name="restrict_app_wlan_title">Онемогући коришћење Wi\u2011Fi у апликацији</string>
+  <string name="restrict_app_wlan_summary">Спречи апликацију да користи Wi\u2011Fi конекцију</string>
+  <string name="restrict_app_cellular_title">Онемогући апликацију да користи мобилну мрежу</string>
+  <string name="restrict_app_cellular_summary">Спречи апликацију да користи мобини пренос података</string>
+  <string name="privacy_guard_internet_category">Интернет</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 1b11604..798a573 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Dataanslutning</string>
   <string name="toggleSync">Synkronisera data automatiskt</string>
   <string name="toggle2g3g4g">Föredragen nätverkstyp</string>
+  <string name="toggle2g3g4g_msim">Typ av förvalt nätverk (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi-regionskod</string>
@@ -864,7 +865,7 @@ inkluderar en unik identifikation,
   <string name="menu_hidden_apps_delete">Återställ</string>
   <string name="menu_hidden_apps_reset_lock">Återställ mönsterlås</string>
   <string name="protected_apps">Skyddade appar</string>
-  <string name="protected_apps_summary">Hantera vilka program som är dolda bakom ett säkert lås</string>
+  <string name="protected_apps_summary">Hantera vilka appar som döljs bakom ett säkert lås</string>
   <string name="saving_protected_components">Sparar komponenttillstånd\u2026</string>
   <string name="pa_login_username_hint">Användarnamn (email)</string>
   <string name="pa_login_password_hint">Lösenord</string>
@@ -996,4 +997,9 @@ inkluderar en unik identifikation,
   <string name="battery_info_status_charging_dock_ac">Laddar i dockningsstationens AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laddar över dockningsstationens USB</string>
+  <string name="restrict_app_wlan_title">Inaktivera appens tillgång till Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Förhindra att appen använder Wi\u2011Fi dataanslutning</string>
+  <string name="restrict_app_cellular_title">Inaktivera appens tillgång till mobildata</string>
+  <string name="restrict_app_cellular_summary">Förhindra att appen använder en mobildataanslutning</string>
+  <string name="privacy_guard_internet_category">Internet</string>
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index d595c92..211ca3a 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">மீட்டமை</string>
   <string name="menu_hidden_apps_reset_lock">பேட்டர்ன் லாக்கை மறுவமை</string>
   <string name="protected_apps">பாதுகாக்கப்பட்ட ஆப்ஸ்</string>
-  <string name="protected_apps_summary">எந்த பயன்பாடுகள் பாதுகாப்பான பூட்டிற்கு பின் மறைந்திருக்கின்றன என்பதை நிர்வகி</string>
   <string name="saving_protected_components">காம்போனென்ட் நிலையை சேமிக்கிறது\u2026</string>
   <string name="pa_login_username_hint">பயனர்பெயர் (மின்னஞ்சல்)</string>
   <string name="pa_login_password_hint">கடவுச்சொல்</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 556d925..394b5e2 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -861,7 +861,6 @@
   <string name="menu_hidden_apps_delete">రీసెట్ చేయి</string>
   <string name="menu_hidden_apps_reset_lock">ఆకృతి లాకును రీసెట్ చేయుము</string>
   <string name="protected_apps">రక్షించబడిన అనువర్తనాలు</string>
-  <string name="protected_apps_summary">సురక్షిత లాక్ వెనుక దాచి ఉంచబడ్డ అనువర్తనాలను నిర్వహించుము</string>
   <string name="saving_protected_components">సేవ్ చేసే అంశం యొక్క స్థితి\u2026</string>
   <string name="pa_login_username_hint">వినియోగదారు పేరు (ఇమెయిల్)</string>
   <string name="pa_login_password_hint">పాస్‌వర్డ్</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 2a7ffed..c12b5da 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -164,6 +164,7 @@
   <string name="toggleData">การเชื่อมต่อข้อมูล</string>
   <string name="toggleSync">ซิงค์ข้อมูลอัตโนมัติ</string>
   <string name="toggle2g3g4g">ประเภทเครือข่ายที่ต้องการ</string>
+  <string name="toggle2g3g4g_msim">ประเภทเครือข่ายที่ต้องการ (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">รหัสภูมิภาค Wi\u2011Fi</string>
@@ -319,15 +320,39 @@
   <string name="app_ops_summaries_media_volume">ระดับเสียงสื่อ</string>
   <string name="app_ops_summaries_alarm_volume">ระดับเสียงปลุก</string>
   <string name="app_ops_summaries_notification_volume">ระดับเสียงแจ้งเตือน</string>
+  <string name="app_ops_summaries_bluetooth_volume">ระดับเสียงบลูทูธ</string>
   <string name="app_ops_summaries_keep_awake">เปิดจอค้าง</string>
   <string name="app_ops_summaries_monitor_location">ตรวจสอบตำแหน่งที่ตั้ง</string>
   <string name="app_ops_summaries_monitor_high_power_location">ตรวจสอบพิกัดที่ตั้งพลังงานสูง</string>
+  <string name="app_ops_summaries_get_usage_stats">ดูสถิติการใช้งาน</string>
   <string name="app_ops_summaries_mute_unmute_microphone">เปิด/ปิด ไมโครโฟน</string>
   <string name="app_ops_summaries_toast_window">แสดงกล่องข้อความ</string>
   <string name="app_ops_summaries_project_media">สื่อโครงการ</string>
   <string name="app_ops_summaries_activate_vpn">เปิดใช้งาน VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">เปลี่ยนภาพพื้นหลัง</string>
+  <string name="app_ops_summaries_assist_structure">แอปผู้ช่วย</string>
+  <string name="app_ops_summaries_assist_screenshot">ช่วยจับหน้าจอ</string>
+  <string name="app_ops_summaries_read_phone_state">อ่านสถานะโทรศัพท์</string>
+  <string name="app_ops_summaries_add_voicemail">เพิ่มข้อความเสียง</string>
+  <string name="app_ops_summaries_use_sip">ใช้ SIP</string>
+  <string name="app_ops_summaries_make_call">ทำการโทร</string>
+  <string name="app_ops_summaries_use_fingerprint">ใช้ลายนิ้วมือ</string>
+  <string name="app_ops_summaries_use_body_sensors">ใช้เซนเซอร์ตรวจร่างกาย</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">อ่านการติดต่อเครือข่าย</string>
+  <string name="app_ops_summaries_mock_location">จำลองสถานที่</string>
+  <string name="app_ops_summaries_read_external_storage">อ่านที่เก็บข้อมูลภายนอก</string>
+  <string name="app_ops_summaries_write_external_storage">เขียนที่เก็บข้อมูลภายนอก</string>
+  <string name="app_ops_summaries_turn_screen_on">เปิดหน้าจอ</string>
+  <string name="app_ops_summaries_get_accounts">เข้าถึงบัญชี</string>
+  <string name="app_ops_summaries_toggle_wifi">สลับ Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">สลับบลูทูธ</string>
+  <string name="app_ops_summaries_start_at_boot">เริ่มต้นเมื่อบูต</string>
+  <string name="app_ops_summaries_toggle_nfc">สลับ NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">สลับข้อมูลโทรศัพท์มือถือ</string>
   <string name="app_ops_summaries_superuser">สิทธิผู้ดูแลระบบ</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">พิกัดที่ตั้งหยาบ</string>
+  <string name="app_ops_labels_fine_location">พิกัดที่ตั้งละเอียด</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">สั่น</string>
   <string name="app_ops_labels_read_contacts">อ่านรายชื่อ</string>
@@ -336,11 +361,19 @@
   <string name="app_ops_labels_modify_call_log">แก้ไขประวัติการโทร</string>
   <string name="app_ops_labels_read_calendar">อ่านปฏิทิน</string>
   <string name="app_ops_labels_modify_calendar">แก้ไขปฏิทิน</string>
+  <string name="app_ops_labels_wifi_scan">ค้นหา Wi-Fi</string>
   <string name="app_ops_labels_notification">แจ้งเตือน/แสดงข้อความ</string>
+  <string name="app_ops_labels_cell_scan">ค้นหาเครือข่ายมือถือ</string>
   <string name="app_ops_labels_call_phone">โทรออก</string>
+  <string name="app_ops_labels_read_sms">อ่านข้อความ</string>
+  <string name="app_ops_labels_write_sms">เขียนข้อความ</string>
   <string name="app_ops_labels_receive_sms">รับข้อความ SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">รับข้อความฉุกเฉิน</string>
   <string name="app_ops_labels_receive_mms">รับข้อความ MMS</string>
+  <string name="app_ops_labels_receive_wap_push">รับ WPA push</string>
   <string name="app_ops_labels_send_sms">ส่งข้อความ SMS</string>
+  <string name="app_ops_labels_read_icc_sms">อ่าน ICC SMS</string>
+  <string name="app_ops_labels_write_icc_sms">เขียน ICC SMS</string>
   <string name="app_ops_labels_modify_settings">ปรับเปลี่ยนการตั้งค่า</string>
   <string name="app_ops_labels_draw_on_top">แสดงทับแอปอื่น</string>
   <string name="app_ops_labels_access_notifications">การแจ้งเตือนการเข้าถึง</string>
@@ -359,6 +392,8 @@
   <string name="app_ops_labels_notification_volume">ระดับเสียงแจ้งเตือน</string>
   <string name="app_ops_labels_bluetooth_volume">ระดับเสียงบลูทูธ</string>
   <string name="app_ops_labels_keep_awake">เปิดจอค้าง</string>
+  <string name="app_ops_labels_monitor_location">ตรวจสอบตำแหน่งที่ตั้ง</string>
+  <string name="app_ops_labels_monitor_high_power_location">ตรวจสอบพิกัดที่ตั้งพลังงานสูง</string>
   <string name="app_ops_labels_get_usage_stats">ดูสถิติการใช้งาน</string>
   <string name="app_ops_labels_mute_unmute_microphone">เปิด/ปิด ไมโครโฟน</string>
   <string name="app_ops_labels_toast_window">แสดงกล่องข้อความ</string>
@@ -826,7 +861,7 @@
   <string name="menu_hidden_apps_delete">รีเซ็ต</string>
   <string name="menu_hidden_apps_reset_lock">รีเซ็ตการล็อครูปแบบ</string>
   <string name="protected_apps">แอปที่ได้รับการปกป้อง</string>
-  <string name="protected_apps_summary">จัดการว่าแอปพลิเคชั่นใดที่จะซ่อนไว้ด้านหลังล็อคที่ปลอดภัย</string>
+  <string name="protected_apps_summary">จัดการว่าแอปใดที่จะซ่อนไว้ด้านหลังล็อคที่ปลอดภัย</string>
   <string name="saving_protected_components">กำลังบันทึกองค์ประกอบ\u2026</string>
   <string name="pa_login_username_hint">ชื่อผู้ใช้ (อีเมล)</string>
   <string name="pa_login_password_hint">รหัสผ่าน</string>
@@ -889,9 +924,13 @@
   <string name="sim_mobile_network_settings_title">การตั้งค่าซิม %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">การแจ้งเตือน</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">กิจกรรม</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">ผู้โทรที่เลือก</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">ข้อความที่เลือก</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">หัว: %1$s W/kg</string>
@@ -901,8 +940,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">เสียงเรียกเข้าซิม %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">แอป:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">เวลาที่ใช้ล่าสุด:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">เวลาการใช้งาน:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">สิ่งนี้จะลบข้อมูลทั้งหมดจาก<b>ที่เก็บข้อมูลภายใน</b>ของแท็บเล็ต รวมถึง\n\n<li>บัญชีอุปกรณ์ของคุณ</li>\n<li>ข้อมูลระบบและข้อมูลแอปและการตั้งค่า</li>\n<li>แอปที่ดาวน์โหลด</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -919,17 +961,24 @@
   <string name="factory_reset_warning_text_reset_now">รีเซ็ตเดี๋ยวนี้</string>
   <string name="factory_reset_warning_text_message">บัญชี แอป ข้อมูลแอปและการตั้งค่าระบบทั้งหมดจะถูกลบจากอุปกรณ์นี้ การกระทำนี้ไม่สามารถย้อนกลับได้</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">อื่น ๆ</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">หมดเวลาสัญญาณ Wi\u2011Fi</string>
   <string name="hotstpot_inactivity_timeout_never">ไม่ต้องเลย</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 นาที</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 นาที</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 นาที</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">สัญญาณ Wi\u2011Fi แบบพกพาจะไม่หมดเวลา</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">สัญญาณ Wi\u2011Fi แบบพกพาจะหมดเวลาหลังจาก <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">ใช้งานขณะหน้าจอล็อค</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">เปิดใช้งานและกำหนดค่าการใช้งานขณะหน้าจอล็อค</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">การตั้งค่า</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">ในการดูหน้าจอที่ใช้งานได้ขณะล็อคอยู่ ให้เปิดใช้งานการใช้งานขณะหน้าจอล็อค</string>
   <string name="interruptions_ignore_while_media_title">ป้องกันการลดเสียง</string>
   <string name="interruptions_ignore_while_media_summary">ไม่ลดเสียงเพลงเมื่อมีการแจ้งเตือนเข้า</string>
   <!-- CM Legal -->
@@ -944,4 +993,9 @@
   <string name="battery_info_status_charging_dock_ac">การชาร์จบนแท่น AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">การชาร์จผ่านแท่น USB</string>
+  <string name="restrict_app_wlan_title">ปิดการใช้ Wi\u2011Fi ของแอป</string>
+  <string name="restrict_app_wlan_summary">ป้องกันแอปจากการเชื่อมต่อข้อมูล Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">ปิดการใช้งานทางโทรศัพท์ของแอป</string>
+  <string name="restrict_app_cellular_summary">ป้องกันแอปจากการใช้การเชื่อมต่อข้อมูลทางโทรศัพท์</string>
+  <string name="privacy_guard_internet_category">อินเทอร์เน็ต</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 93e46f4..6541fa4 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Veri bağlantısı</string>
   <string name="toggleSync">Otomatik veri eşitleme</string>
   <string name="toggle2g3g4g">Tercih edilen şebeke türü</string>
+  <string name="toggle2g3g4g_msim">Tercih edilen şebeke türü (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi bölge kodu</string>
@@ -253,8 +254,10 @@
   <string name="notification_light_missed_call_title">Cevapsız arama</string>
   <string name="notification_light_voicemail_title">Sesli mesaj</string>
   <string name="notification_light_screen_on">Ekran açıkken yanar</string>
+  <string name="notification_light_zen_mode">Işıklar Rahatsız Etmeyin modunda</string>
   <string name="notification_light_use_multiple_leds">Çoklu LEDler</string>
   <string name="keywords_lights_brightness_level">sönük led parlaklığı</string>
+  <string name="notification_light_automagic">Renkleri otomatik olarak seç</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Işık ayarları</string>
   <string name="led_notification_text">LED ışık ayarlar tarafından etkinleştirilmiş</string>
@@ -289,6 +292,8 @@
   <string name="app_ops_summaries_modify_call_log">arama kaydını düzenle</string>
   <string name="app_ops_summaries_read_calendar">takvimi oku</string>
   <string name="app_ops_summaries_modify_calendar">takvimi düzenle</string>
+  <string name="app_ops_summaries_wifi_scan">Kablosuz Ağ tarama</string>
+  <string name="app_ops_summaries_notification">bildirim/bildirim balonu</string>
   <string name="app_ops_summaries_cell_scan">hücre arama</string>
   <string name="app_ops_summaries_call_phone">arama yapma</string>
   <string name="app_ops_summaries_read_sms">SMS okuma</string>
@@ -316,15 +321,39 @@
   <string name="app_ops_summaries_media_volume">ortam sesi</string>
   <string name="app_ops_summaries_alarm_volume">alarm sesi</string>
   <string name="app_ops_summaries_notification_volume">bildirim sesi</string>
+  <string name="app_ops_summaries_bluetooth_volume">bluetooth sesi</string>
   <string name="app_ops_summaries_keep_awake">uyanık tut</string>
   <string name="app_ops_summaries_monitor_location">konumu izle</string>
   <string name="app_ops_summaries_monitor_high_power_location">yüksek güç konumu izle</string>
+  <string name="app_ops_summaries_get_usage_stats">kullanım istatistiklerini al</string>
   <string name="app_ops_summaries_mute_unmute_microphone">mikrofonu aç/kapa</string>
   <string name="app_ops_summaries_toast_window">bildirim göster</string>
   <string name="app_ops_summaries_project_media">ortamı yansıt</string>
   <string name="app_ops_summaries_activate_vpn">VPN\'yi etkinleştir</string>
+  <string name="app_ops_summaries_write_wallpaper">duvarkağıdı yaz</string>
+  <string name="app_ops_summaries_assist_structure">yardım yapısı</string>
+  <string name="app_ops_summaries_assist_screenshot">ekran görüntüsü yardımcısı</string>
+  <string name="app_ops_summaries_read_phone_state">telefon durumunu oku</string>
+  <string name="app_ops_summaries_add_voicemail">sesli mesaj ekle</string>
+  <string name="app_ops_summaries_use_sip">SIP kullan</string>
+  <string name="app_ops_summaries_make_call">arama yap</string>
+  <string name="app_ops_summaries_use_fingerprint">parmak izi kullan</string>
+  <string name="app_ops_summaries_use_body_sensors">vücut sensörleri kullan</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">hücre yayınlarını oku</string>
+  <string name="app_ops_summaries_mock_location">sahte konum</string>
+  <string name="app_ops_summaries_read_external_storage">harici depolamayı oku</string>
+  <string name="app_ops_summaries_write_external_storage">harici depolamaya yaz</string>
+  <string name="app_ops_summaries_turn_screen_on">ekranı aç</string>
+  <string name="app_ops_summaries_get_accounts">hesapları al</string>
+  <string name="app_ops_summaries_toggle_wifi">Wi-Fi aç/kapa</string>
+  <string name="app_ops_summaries_toggle_bluetooth">Bluetooth\'u açıp kapat</string>
+  <string name="app_ops_summaries_start_at_boot">açılışta başlat</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC\'yi aç/kapa</string>
+  <string name="app_ops_summaries_toggle_mobile_data">hücresel veriye geçiş</string>
   <string name="app_ops_summaries_superuser">root erişimi</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Yaklaşık konum</string>
+  <string name="app_ops_labels_fine_location">Kesin konum</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Titreşim</string>
   <string name="app_ops_labels_read_contacts">Kişileri oku</string>
@@ -333,11 +362,19 @@
   <string name="app_ops_labels_modify_call_log">Arama kaydını düzenle</string>
   <string name="app_ops_labels_read_calendar">Takvimi oku</string>
   <string name="app_ops_labels_modify_calendar">Takvimi düzenle</string>
+  <string name="app_ops_labels_wifi_scan">Kablosuz tarama</string>
   <string name="app_ops_labels_notification">Bildirim gönder</string>
+  <string name="app_ops_labels_cell_scan">Hücre tarama</string>
   <string name="app_ops_labels_call_phone">Arama yap</string>
+  <string name="app_ops_labels_read_sms">SMS Okuma</string>
+  <string name="app_ops_labels_write_sms">SMS Yaz</string>
   <string name="app_ops_labels_receive_sms">SMS al</string>
+  <string name="app_ops_labels_receive_emergency_sms">Acil durum SMS alımı</string>
   <string name="app_ops_labels_receive_mms">MMS al</string>
+  <string name="app_ops_labels_receive_wap_push">WAP push alma</string>
   <string name="app_ops_labels_send_sms">SMS gönder</string>
+  <string name="app_ops_labels_read_icc_sms">ICC SMS okuma</string>
+  <string name="app_ops_labels_write_icc_sms">ICC SMS yazma</string>
   <string name="app_ops_labels_modify_settings">Ayarları düzenle</string>
   <string name="app_ops_labels_draw_on_top">Üstüne çiz</string>
   <string name="app_ops_labels_access_notifications">Bildirimlere eriş</string>
@@ -356,10 +393,33 @@
   <string name="app_ops_labels_notification_volume">Bildirim sesi</string>
   <string name="app_ops_labels_bluetooth_volume">Bluetooth sesi</string>
   <string name="app_ops_labels_keep_awake">Uyanık tut</string>
+  <string name="app_ops_labels_monitor_location">Konumu izle</string>
+  <string name="app_ops_labels_monitor_high_power_location">Yüksek güç konumu izle</string>
+  <string name="app_ops_labels_get_usage_stats">Kullanım istatistiklerini al</string>
   <string name="app_ops_labels_mute_unmute_microphone">Mikrofonu aç/kapa</string>
   <string name="app_ops_labels_toast_window">Bildirim göster</string>
   <string name="app_ops_labels_project_media">Ortamı yansıt</string>
   <string name="app_ops_labels_activate_vpn">VPN\'yi etkinleştir</string>
+  <string name="app_ops_labels_write_wallpaper">Duvar kağıdı yaz</string>
+  <string name="app_ops_labels_assist_structure">Yardımcı yapısı</string>
+  <string name="app_ops_labels_assist_screenshot">Ekran görüntüsü yardımcısı</string>
+  <string name="app_ops_labels_read_phone_state">Telefon durumunu oku</string>
+  <string name="app_ops_labels_add_voicemail">Sesli mesaj ekle</string>
+  <string name="app_ops_labels_use_sip">SIP kullan</string>
+  <string name="app_ops_labels_make_call">Arama yap</string>
+  <string name="app_ops_labels_use_fingerprint">Parmak izi kullan</string>
+  <string name="app_ops_labels_use_body_sensors">Vücut sensörleri kullan</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Hücre yayınları oku</string>
+  <string name="app_ops_labels_mock_location">Sahte konum</string>
+  <string name="app_ops_labels_read_external_storage">Harici depolamayı oku</string>
+  <string name="app_ops_labels_write_external_storage">Harici depolamaya yaz</string>
+  <string name="app_ops_labels_turn_screen_on">Ekranı aç</string>
+  <string name="app_ops_labels_get_accounts">Hesapları al</string>
+  <string name="app_ops_labels_toggle_wifi">Wi-Fi aç kapa</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bluetooth\'u aç/kapa</string>
+  <string name="app_ops_labels_start_at_boot">Açılışta başlat</string>
+  <string name="app_ops_labels_toggle_nfc">NFC\'yi aç/kapa</string>
+  <string name="app_ops_labels_toggle_mobile_data">Hücresel veriye geçiş</string>
   <string name="app_ops_labels_superuser">Root erişimi</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">İzin verildi</string>
@@ -654,6 +714,8 @@
   <string name="status_bar_battery_percentage_text_inside">Simge içinde</string>
   <string name="status_bar_battery_percentage_text_next">Simge yanında</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Durum çubuğu simgeleri</string>
+  <string name="status_bar_icons_summary">Gösterilen durum çubuğu simgelerini kontrol et</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Dokunmatik hareketlerini engelle</string>
   <string name="edge_gesture_service_summary">Telefonda gezinme ve durum çubuğu için uygulamalara dokunmatik iletiler gönderme</string>
@@ -690,6 +752,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Müzik görselleştiriciyi görüntüle</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Hızlı ayarlar karesi tarafından devre dışı bırakıldı</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Ekran kilidini etkinleştirmek için dokunun</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Kilit ekranı etkin!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Pil tasarruf eşiği</string>
   <string name="battery_saver_summary">Performansı düşürür ve arka plan verilerini sınırlar</string>
@@ -699,6 +764,7 @@
   <string name="autoperf_summary">Uygulamalar için uygun pil modunu otomatik seç</string>
   <string name="perf_profile_title">Pil modu</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Açılışta başlatılan uygulamalar</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Bildirim sesi</string>
   <!-- Advanced reboot options -->
@@ -727,6 +793,7 @@
   <string name="voice_wakeup_retrain_title">Sesinizi ayarlayın</string>
   <string name="voice_wakeup_activity_title">Başlatılacak aktivite</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Sesle Uyandırma, Doğrudan Kişi Araması\'nı seçmek için arama izinlerine ihtiyaç duyar.</string>
   <string name="picker_activities">Aktiviteler</string>
   <string name="select_custom_app_title">Özel uygulama seç</string>
   <string name="select_custom_activity_title">Özel aktivite seç</string>
@@ -795,12 +862,14 @@
   <string name="menu_hidden_apps_delete">Sıfırla</string>
   <string name="menu_hidden_apps_reset_lock">Desen kilidini sıfırla</string>
   <string name="protected_apps">Korunan uygulamalar</string>
+  <string name="protected_apps_summary">Güvenli kilidin arkasında hangi uygulamaların gizleneceğini yönetin</string>
   <string name="saving_protected_components">Bileşen durumu kaydediliyor\u2026</string>
   <string name="pa_login_username_hint">Kullanıcı adı (e-posta)</string>
   <string name="pa_login_password_hint">Şifre</string>
   <string name="pa_login_submit_button">Giriş Yap</string>
   <string name="pa_login_checking_password">Hesap kontrol ediliyor\u2026</string>
   <string name="pa_login_incorrect_login">Hatalı giriş</string>
+  <string name="pa_pattern_or_fingerprint_header">Kilidi açmak için desen çizmeniz veya parmak izi kullanmanız gerekir</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Katkıda bulunanlar</string>
   <string name="contributors_cloud_loading_message">Katkıda bulunanlar verisi yükleniyor\u2026</string>
@@ -825,24 +894,44 @@
   <string name="title_general">Genel</string>
   <string name="advanced">Gelişmiş</string>
   <string name="link_volume_option_title">Zil sesi ile bildirim sesi düzeyini bağla</string>
+  <string name="lcd_density_prompt_message">Bazı uygulamalar standart dışı DPI\'lerde çalışmayabilir.\n\nBu telefonunuzu yeniden başlatacaktır.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP telefon numarası</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Yinelenen APN</string>
+  <string name="duplicate_apn_error_message">Bu APN zaten var. Silin veya parametreleri değiştirin.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">devre dışı bırakıldı</string>
   <string name="sim_missing">yok ya da sorunlu</string>
+  <string name="sim_enabler_need_disable_sim">SIM kart devre dışı bırakılacak. Devam etmek istiyor musunuz?</string>
+  <string name="sim_enabler_will_disable_sim_title">Dikkat</string>
+  <string name="sim_enabler_need_switch_data_service">Bu SIM devre dışı bırakılacak ve SIM <xliff:g id="slotid">%1$s</xliff:g> veri hizmetleri için kullanılacak. Devam etmek istediğinizden emin misiniz?</string>
   <string name="sim_enabler_airplane_on">Uçak modu açıkken işlem yapılamıyor.</string>
   <string name="sim_enabler_in_call">Görüşmedeyken işlem yapılamıyor.</string>
   <string name="sim_enabler_both_inactive">Tüm SIM kartlar devre dışı bırakılamıyor</string>
+  <string name="sim_enabler_enabling">Etkinleştiriliyor\u2026</string>
+  <string name="sim_enabler_disabling">Devre dışı bırakılıyor\u2026</string>
+  <string name="sub_activate_success">SIM aktif.</string>
+  <string name="sub_activate_failed">Etkinleştirme başarısız.</string>
+  <string name="sub_deactivate_success">SIM devre dışı bırakıldı.</string>
+  <string name="sub_deactivate_failed">Devre dışı bırakma başarısız.</string>
   <string name="primary_sub_select_title">Varsayılan 3G/LTE aboneliği</string>
+  <string name="select_sim_card">SIM kart seçin</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">SIM %d durumu</string>
   <string name="sim_card_lock_settings_title">SIM %d kilit ayarları</string>
   <string name="sim_card_summary_empty">SIM takılı değil</string>
+  <string name="sim_mobile_network_settings_category_title">Hücresel ağ ayarları</string>
   <string name="sim_mobile_network_settings_title">SIM %d ayarları</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">hatırlatıcılar</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">etkinlikler</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">seçili arayanlar</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">seçili mesajlar</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Baş: %1$s W/kg</string>
@@ -852,8 +941,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">SIM %d zil sesi</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Uygulama:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Son kullanılan:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Kullanım süresi:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <string name="master_clear_desc_cm" product="tablet">Bu işlem tabletinizin <b>dahili belleğinde</b> bulunan tüm verileri silecek, \n\n<li>Cihazdaki hesaplar</li>\n<li>Sistem ve uygulama veri ve ayarları</li>\n<li>İndirilen uygulamalar</li> dahil.</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -870,14 +962,24 @@
   <string name="factory_reset_warning_text_reset_now">ŞİMDİ SIFIRLA</string>
   <string name="factory_reset_warning_text_message">Cihazdaki tüm hesaplarınız, uygulamalarınız, veriler ve sistem ayarları kaldırılacak. Bu işlem geri alınamaz.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Diğer</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Kablosuz hotspot zaman aşımı</string>
   <string name="hotstpot_inactivity_timeout_never">Asla</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 dakika</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 dakika</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 dakika</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Taşınabilir Wi\u2011Fi bağlantı noktası zaman aşımı yok</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Taşınabilir kablosuz hotspot bağlantı noktası zaman aşımı <xliff:g id="timeout">%1$s </xliff:g> sn sonra</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Canlı kilit ekranı</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Canlı kilit ekranlarını etkinleştir ve yapılandır</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Ayarlar</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Kullanılabilir canlı kilit ekranlarını görüntülemek için Canlı kilit ekranlarını açın.</string>
   <string name="interruptions_ignore_while_media_title">Ses yankılanmasını önle</string>
   <string name="interruptions_ignore_while_media_summary">Bir bildirim geldiğinde, medya oynatma ses seviyesini azaltma</string>
   <!-- CM Legal -->
@@ -892,4 +994,9 @@
   <string name="battery_info_status_charging_dock_ac">Ünite AC ile şarj oluyor</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Ünite USB\'si ile şarj oluyor</string>
+  <string name="restrict_app_wlan_title">Uygulama Wi\u2011Fi kullanımını devre dışı bırak</string>
+  <string name="restrict_app_wlan_summary">Uygulamanın Wi\u2011Fi veri bağlantısını kullanmasını engelle</string>
+  <string name="restrict_app_cellular_title">Uygulama hücresel veri kullanımını devre dışı bırak</string>
+  <string name="restrict_app_cellular_summary">Uygulamanın hücresel veri bağlantısını kullanmasını engelle</string>
+  <string name="privacy_guard_internet_category">İnternet</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index a4b1c35..a14a538 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -164,6 +164,7 @@
   <string name="toggleData">سانلىق مەلۇمات ئۇلىنىشى</string>
   <string name="toggleSync">سانلىق مەلۇماتىنى ئۆزلۈكىدىن قەدەمداشلا</string>
   <string name="toggle2g3g4g">ئالدىن بەلگىلەنگەن تور تىپى</string>
+  <string name="toggle2g3g4g_msim">ئالدىن بەلگىلەنگەن تور تىپى (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi رايون كودى</string>
@@ -992,4 +993,9 @@
   <string name="battery_info_status_charging_dock_ac">تەگلىك ئۆزگىرىشچان توك ئارقىلىق توكلاۋاتىدۇ</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">تەگلىك USB ئارقىلىق توكلاۋاتىدۇ</string>
+  <string name="restrict_app_wlan_title">ئەپنىڭ Wi\u2011Fi نى ئىشلىتىشىنى چەكلەش</string>
+  <string name="restrict_app_wlan_summary">ئەپنىڭ Wi\u2011Fi نى ئىشلىتىپ تورغا ئۇلىنىشىدىن ساقلىنىش</string>
+  <string name="restrict_app_cellular_title">ئەپنىڭ كۆچمە تورنى ئىشلىتىشىنى چەكلەش</string>
+  <string name="restrict_app_cellular_summary">ئەپنىڭ كۆچمە تورنى ئىشلىتىپ تورغا ئۇلىنىشىدىن ساقلىنىش</string>
+  <string name="privacy_guard_internet_category">ئىنتېرنېت</string>
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 545c62b..f44cecd 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -860,7 +860,6 @@
   <string name="menu_hidden_apps_delete">Đặt lại</string>
   <string name="menu_hidden_apps_reset_lock">Đặt lại mẫu hình mở khóa</string>
   <string name="protected_apps">Các ứng dụng được bảo vệ</string>
-  <string name="protected_apps_summary">Quản lý các ứng dụng được ẩn sau khoá an toàn</string>
   <string name="saving_protected_components">Đang lưu trạng thái thành phần\u2026</string>
   <string name="pa_login_username_hint">Tên người dùng (email)</string>
   <string name="pa_login_password_hint">Mật khẩu</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 5048f82..67c6840 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -161,6 +161,7 @@
   <string name="toggleData">数据连接</string>
   <string name="toggleSync">自动同步数据</string>
   <string name="toggle2g3g4g">首选网络类型</string>
+  <string name="toggle2g3g4g_msim">首选网络类型 (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi 区域码</string>
@@ -990,4 +991,9 @@
   <string name="battery_info_status_charging_dock_ac">正在通过基座交流电充电</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">正在通过基座 USB 充电</string>
+  <string name="restrict_app_wlan_title">禁止应用使用 Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">防止应用使用 Wi\u2011Fi 数据连接</string>
+  <string name="restrict_app_cellular_title">禁止应用使用移动数据</string>
+  <string name="restrict_app_cellular_summary">防止应用使用移动网络数据连接</string>
+  <string name="privacy_guard_internet_category">互联网</string>
 </resources>
-- 
cgit v1.1


From cfe796030b722da7995eddc75048ed4088aebf73 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Thu, 17 Mar 2016 13:49:50 -0700
Subject: Settings: reflect/inform user of disabled wakelock appop

If an app is marked as "allow-in-power-save" (loaded in as part of
SystemConfig), then this app is not susceptible to battery saving
optimizations and is required to be active for the system to function
properly.

This behavior is enforced on the PowerManagerService side when
requesting wake locks - inform the user visually as well.

Ticket: CYNGNOS-1258

Change-Id: I1c99de703012a09ddbde19838171b7e5659f2523
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 res/values/cm_strings.xml                          |  1 +
 .../settings/applications/AppOpsDetails.java       | 51 +++++++++++++++++++---
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index abc44d1..6b42f4e 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -487,6 +487,7 @@
     <string name="app_ops_allowed_count">Allowed <xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_ignored_count">Denied <xliff:g id="count" example="2 times">%s</xliff:g></string>
     <string name="app_ops_both_count">Allowed <xliff:g id="count">%1$s</xliff:g>, denied <xliff:g id="count">%2$s</xliff:g></string>
+    <string name="app_ops_disabled_by_optimization">Disabled by battery optimization</string>
 
     <!-- App ops menu options -->
     <string name="app_ops_show_user_apps">Show user apps</string>
diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index af80367..07ef72e 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -31,6 +31,10 @@ import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
 import android.net.NetworkPolicyManager;
 import android.os.Bundle;
+import android.os.IDeviceIdleController;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -49,6 +53,8 @@ import com.android.settings.R;
 import com.android.settings.SettingsActivity;
 import com.android.settings.Utils;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;
@@ -143,6 +149,20 @@ public class AppOpsDetails extends InstrumentedFragment {
 
         Resources res = getActivity().getResources();
 
+        final IDeviceIdleController iDeviceIdleController = IDeviceIdleController.Stub.asInterface(
+                ServiceManager.getService(Context.DEVICE_IDLE_CONTROLLER));
+        List<String> allowInPowerSave;
+        if (iDeviceIdleController != null) {
+            try {
+                allowInPowerSave = Arrays.asList(iDeviceIdleController.getSystemPowerWhitelist());
+            } catch (RemoteException e) {
+                Log.e(TAG, "couldn't get system power white list", e);
+                allowInPowerSave = new ArrayList<>();
+            }
+        } else {
+            allowInPowerSave = new ArrayList<>();
+        }
+
         mOperationsSection.removeAllViews();
         String lastPermGroup = "";
         boolean isPlatformSigned = isPlatformSigned();
@@ -176,12 +196,6 @@ public class AppOpsDetails extends InstrumentedFragment {
                     } catch (NameNotFoundException e) {
                     }
                 }
-                ((TextView)view.findViewById(R.id.op_name)).setText(
-                        entry.getSwitchText(mState));
-                ((TextView)view.findViewById(R.id.op_counts)).setText(
-                        entry.getCountsText(res));
-                ((TextView)view.findViewById(R.id.op_time)).setText(
-                        entry.getTimeText(res, true));
 
                 Spinner sp = (Spinner) view.findViewById(R.id.spinnerWidget);
                 sp.setVisibility(View.GONE);
@@ -191,6 +205,31 @@ public class AppOpsDetails extends InstrumentedFragment {
                 final int switchOp = AppOpsManager.opToSwitch(firstOp.getOp());
                 int mode = mAppOps.checkOp(switchOp, entry.getPackageOps().getUid(),
                         entry.getPackageOps().getPackageName());
+
+                final TextView opNameText = (TextView) view.findViewById(R.id.op_name);
+                final TextView opCountText = (TextView) view.findViewById(R.id.op_counts);
+                final TextView opTimeText = (TextView) view.findViewById(R.id.op_time);
+
+                opNameText.setText(entry.getSwitchText(mState));
+
+                if (switchOp == AppOpsManager.OP_WAKE_LOCK
+                        && allowInPowerSave.contains(entry.getPackageOps().getPackageName())) {
+                    // sooper special case; app is marked to be allowed in power save; it is
+                    // probably critical to functionality, don't allow user to change it, because
+                    // we'll ignore it either way
+                    sw.setVisibility(View.VISIBLE);
+                    sw.setChecked(true);
+                    sw.setEnabled(false);
+
+                    opCountText.setVisibility(View.GONE);
+                    opTimeText.setText(R.string.app_ops_disabled_by_optimization);
+
+                    continue;
+                }
+
+                opCountText.setText(entry.getCountsText(res));
+                opTimeText.setText(entry.getTimeText(res, true));
+
                 sp.setSelection(modeToPosition(mode));
                 sp.setOnItemSelectedListener(new Spinner.OnItemSelectedListener() {
                     boolean firstMode = true;
-- 
cgit v1.1


From bac4604893d4e24682e7bc016c362a2793bf1069 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Mon, 28 Mar 2016 23:23:21 +0200
Subject: Settings: Fix one-time vibration intensity restore

Change-Id: I8d9f1288dddc98f58f3565c8927be0642b026a64
---
 src/com/android/settings/hardware/VibratorIntensity.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index e847933..e55d456 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -166,8 +166,7 @@ public class VibratorIntensity extends DialogPreference implements
         int percent = prefs.getInt(PREF_NAME, defaultValue);
 
         CMSettings.Secure.putInt(context.getContentResolver(),
-                CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(min, max,
-                        percentToIntensity(min, max, percent)));
+                CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(min, max, percent));
     }
 
     @Override
-- 
cgit v1.1


From 29b521d5628d1c479d7ec84c8090b0ed4cfa8b0a Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Mon, 14 Mar 2016 09:57:31 -0700
Subject: LLS: Use LiveLockScreenManager for selecting LLS

Change-Id: Ib404b4fb1cdbad773703e4702490b92cc14a548e
---
 .../cyanogenmod/LiveLockScreenSettings.java        | 26 +++++++++-------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
index 4ffcc31..800e59c 100644
--- a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
+++ b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
@@ -52,9 +52,9 @@ import com.android.settings.SettingsActivity;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
+import cyanogenmod.app.LiveLockScreenManager;
 import cyanogenmod.externalviews.KeyguardExternalViewProviderService;
 import cyanogenmod.providers.CMSettings;
-import org.cyanogenmod.internal.util.CmLockPatternUtils;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -316,12 +316,12 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement
 
         private final Context mContext;
         private final LiveLockScreenInfoComparator mComparator;
-        private CmLockPatternUtils mLockPatternUtils;
+        private LiveLockScreenManager mLLSM;
 
         public LiveLockScreenBackend(Context context) {
             mContext = context;
             mComparator = new LiveLockScreenInfoComparator(null);
-            mLockPatternUtils = new CmLockPatternUtils(context);
+            mLLSM = LiveLockScreenManager.getInstance(context);
         }
 
         public List<LiveLockScreenInfo> getLiveLockScreenInfos() {
@@ -381,26 +381,20 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement
         }
 
         private void setBoolean(String key, boolean value) {
-            CMSettings.Secure.putInt(mContext.getContentResolver(), key, value ? 1 : 0);
+            mLLSM.setLiveLockScreenEnabled(value);
         }
 
         public void setActiveLiveLockScreen(ComponentName liveLockScreen) {
             logd("setActiveLiveLockScreen(%s)", liveLockScreen);
-            if (mLockPatternUtils == null) {
-                return;
-            }
-            try {
-                mLockPatternUtils.setThirdPartyKeyguard(liveLockScreen);
-            } catch (PackageManager.NameNotFoundException e) {
-                Log.w(TAG, "Failed to set active live lock screen to " + liveLockScreen, e);
-            }
+            cyanogenmod.app.LiveLockScreenInfo.Builder builder =
+                    new cyanogenmod.app.LiveLockScreenInfo.Builder();
+            builder.setComponent(liveLockScreen);
+            mLLSM.setDefaultLiveLockScreen(builder.build());
         }
 
         public ComponentName getActiveLiveLockScreen() {
-            if (mLockPatternUtils == null) {
-                return null;
-            }
-            return mLockPatternUtils.getThirdPartyKeyguardComponent();
+            cyanogenmod.app.LiveLockScreenInfo llsInfo = mLLSM.getDefaultLiveLockScreen();
+            return llsInfo != null ? llsInfo.component : null;
         }
 
         public void launchSettings(LiveLockScreenInfo liveLockScreenInfo) {
-- 
cgit v1.1


From 94a007eaba29502844da1d4a501c73891ae7218f Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Fri, 25 Mar 2016 15:34:31 -0700
Subject: Settings: implicitly link to lls settings

Ticket: CYNGNOS-2241
Change-Id: I39e883dd52ed4574a1ce1c2becb104c5458e800f
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 AndroidManifest.xml                            | 17 +++++++++++++++++
 src/com/android/settings/SecuritySettings.java |  3 ++-
 src/com/android/settings/Settings.java         |  1 +
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f38e0bc..9196532 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2784,6 +2784,23 @@
                        android:resource="@id/lockscreen_settings" />
         </activity>
 
+        <activity android:name=".Settings$LiveLockScreenSettingsActivity"
+                  android:label="@string/live_lock_screen_title"
+                  android:taskAffinity="">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.VOICE_LAUNCH" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.SHORTCUT" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="cyanogenmod.intent.action.OPEN_LIVE_LOCKSCREEN_SETTINGS" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.cyanogenmod.LiveLockScreenSettings" />
+        </activity>
+
         <provider
             android:name=".search.SettingsSearchIndexablesProvider"
             android:authorities="com.android.settings"
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 8f2db6b..d311134 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -71,6 +71,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
+import static cyanogenmod.content.Intent.ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS;
 
 /**
  * Gesture lock pattern settings.
@@ -349,7 +350,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                     root.findPreference(KEY_GENERAL_CATEGORY);
             if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null) {
                 Preference liveLockPreference = new Preference(getContext(), null);
-                liveLockPreference.setFragment(LiveLockScreenSettings.class.getCanonicalName());
+                liveLockPreference.setIntent(new Intent(ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS));
                 liveLockPreference.setOrder(0);
                 liveLockPreference.setTitle(R.string.live_lock_screen_title);
                 liveLockPreference.setSummary(R.string.live_lock_screen_summary);
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index d392a0a..692b292 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -126,5 +126,6 @@ public class Settings extends SettingsActivity {
     public static class ContributorsCloudActivity extends SettingsActivity { /* empty */ }
     public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class LiveLockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationManagerActivity extends SettingsActivity { /* empty */ }
 }
-- 
cgit v1.1


From df398a9c5050e8f0485f3bee143bfaf39bfd2690 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Wed, 30 Mar 2016 10:58:39 -0700
Subject: LLS: Add LiveLockScreenSettings to ENTRY_FRAGMENTS

Trying to launch Live lock screen settings will throw an
IllegalArgumentException since the fragment is not considered
valid.  Add it to ENTRY_FRAGMENTS so it is considered valid.

Change-Id: I13b52dc2f65f62fe7146b3002720a901dd363338
---
 src/com/android/settings/SettingsActivity.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index f837878..8e0bb98 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -83,6 +83,7 @@ import com.android.settings.blacklist.BlacklistSettings;
 import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.contributors.ContributorsCloudFragment;
 import com.android.settings.cyanogenmod.DisplayRotation;
+import com.android.settings.cyanogenmod.LiveLockScreenSettings;
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.DashboardTile;
@@ -375,7 +376,8 @@ public class SettingsActivity extends Activity
             BlacklistSettings.class.getName(),
             ProfilesSettings.class.getName(),
             ContributorsCloudFragment.class.getName(),
-            NotificationManagerSettings.class.getName()
+            NotificationManagerSettings.class.getName(),
+            LiveLockScreenSettings.class.getName()
     };
 
 
-- 
cgit v1.1


From 44a5b78ccbfb7ab39451209cdfa6feeebb0508db Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Wed, 20 May 2015 09:46:51 -0700
Subject: Settings: add marquee to Device administrators screen

Noticed while doing CTS testing that it was really hard to pick the
correct receivers to enable when you cannot see their full names.

Change-Id: I8f14d04f1037158c94d5501c115b5100456d7619
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 83b4a9951b8aadfba35d8f12d075231e7cb36385)
---
 res/layout/device_admin_item.xml                  | 2 ++
 src/com/android/settings/DeviceAdminSettings.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 0420bb5..4ff66b7 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -55,6 +55,8 @@
             android:singleLine="true"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:ellipsize="marquee"
+            android:marqueeRepeatLimit="marquee_forever"
+            android:scrollHorizontally="true"
             android:layout_alignParentTop="true"
             android:fadingEdge="horizontal" />
 
diff --git a/src/com/android/settings/DeviceAdminSettings.java b/src/com/android/settings/DeviceAdminSettings.java
index f0b3070..1f05131 100644
--- a/src/com/android/settings/DeviceAdminSettings.java
+++ b/src/com/android/settings/DeviceAdminSettings.java
@@ -337,6 +337,7 @@ public class DeviceAdminSettings extends ListFragment {
             }
             vh.checkbox.setEnabled(enabled);
             vh.name.setEnabled(enabled);
+            vh.name.setSelected(true);
             vh.description.setEnabled(enabled);
             vh.icon.setEnabled(enabled);
         }
-- 
cgit v1.1


From 2703eb717e542ff225611cb9e0217815ee14661c Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Mon, 21 Mar 2016 10:08:14 -0700
Subject: Add Weather Content Provider [2/5]

Introduce a new entry in the settings menu to select the available
weather provider services.

This entry will be parked in the System category between Date&Time
and Accessibility

Change-Id: Ida230f3be72eb575a2b09504c99eaa16851c99f8
---
 AndroidManifest.xml                                |  11 +
 res/drawable/ic_settings_weather.xml               |  30 ++
 res/layout/empty_weather_state.xml                 |  47 +++
 res/layout/weather_service_provider_info_row.xml   | 104 +++++++
 res/values/cm_colors.xml                           |   1 +
 res/values/cm_strings.xml                          |   6 +
 res/xml/dashboard_categories.xml                   |   8 +
 src/com/android/settings/Settings.java             |   1 +
 src/com/android/settings/SettingsActivity.java     |  10 +-
 .../cyanogenmod/WeatherServiceSettings.java        | 343 +++++++++++++++++++++
 10 files changed, 560 insertions(+), 1 deletion(-)
 create mode 100644 res/drawable/ic_settings_weather.xml
 create mode 100644 res/layout/empty_weather_state.xml
 create mode 100644 res/layout/weather_service_provider_info_row.xml
 create mode 100644 src/com/android/settings/cyanogenmod/WeatherServiceSettings.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9196532..239abbb 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2904,5 +2904,16 @@
             </intent-filter>
         </activity>
 
+        <!-- Weather Service Providers settings -->
+        <activity android:name="Settings$WeatherProviderServicesActivity"
+                  android:taskAffinity=""
+                  android:label="@string/weather_settings_title">
+            <intent-filter>
+                <action android:name="cyanogenmod.intent.action.MANAGE_WEATHER_PROVIDER_SERVICES" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                       android:value="com.android.settings.cyanogenmod.WeatherServiceSettings" />
+        </activity>
     </application>
 </manifest>
diff --git a/res/drawable/ic_settings_weather.xml b/res/drawable/ic_settings_weather.xml
new file mode 100644
index 0000000..1a5a8a9
--- /dev/null
+++ b/res/drawable/ic_settings_weather.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M5.3,6.7L3.5,4.9L5,3.5l1.8,1.8L5.3,6.7z M13,1h-2v3h2V1z M1,13h3v-2H1V13z
+M20.5,4.9L19,3.5l-1.8,1.8l1.4,1.4L20.5,4.9z
+M17.3,9.1c-1-1.9-3-3.2-5.3-3.2c-3.3,0-6,2.7-6,6c0,0.9,0.2,1.7,0.5,2.5C5.6,15.3,5,16.6,5,18c0,2.8,2.2,5,5,5h6c3.9,0,7-3.1,7-7
+C23,12.6,20.5,9.7,17.3,9.1z
+M16,11c2.8,0,5,2.2,5,5s-2.2,5-5,5h-6c-1.7,0-3-1.3-3-3s1.3-3,3-3h1.1C11.6,12.7,13.6,11,16,11" />
+</vector>
\ No newline at end of file
diff --git a/res/layout/empty_weather_state.xml b/res/layout/empty_weather_state.xml
new file mode 100644
index 0000000..09c3794
--- /dev/null
+++ b/res/layout/empty_weather_state.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 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.
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:id="@+id/empty_weather_state"
+             android:layout_width="fill_parent"
+             android:layout_height="fill_parent"
+             android:visibility="gone">
+    <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+        <ImageView
+                android:id="@+id/icon"
+                android:layout_width="192dp"
+                android:layout_height="192dp"
+                android:layout_marginBottom="12dip"
+                android:src="@drawable/ic_settings_weather"
+                android:tint="@color/weather_settings_icon_tint"
+                android:contentDescription="@null">
+        </ImageView>
+
+        <TextView
+                android:id="@+id/message"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textSize="18dp"
+                android:textColor="?android:attr/textColorSecondary">
+        </TextView>
+
+    </LinearLayout>
+</FrameLayout>
diff --git a/res/layout/weather_service_provider_info_row.xml b/res/layout/weather_service_provider_info_row.xml
new file mode 100644
index 0000000..36d5470
--- /dev/null
+++ b/res/layout/weather_service_provider_info_row.xml
@@ -0,0 +1,104 @@
+<!--
+     Copyright (C) 2016 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.
+-->
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
+    <RelativeLayout
+            android:id="@android:id/widget_frame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toStartOf="@+id/divider"
+            android:clickable="true"
+            android:focusable="true"
+            android:background="?android:attr/selectableItemBackground" >
+
+        <!-- Weather Provider Service icon -->
+
+        <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="@android:dimen/app_icon_size"
+                android:layout_height="@android:dimen/app_icon_size"
+                android:layout_centerVertical="true"
+                android:layout_marginBottom="10dp"
+                android:layout_marginStart="0dp"
+                android:layout_marginEnd="6dp"
+                android:layout_marginTop="10dp"
+                android:contentDescription="@null"
+                android:maxHeight="@android:dimen/app_icon_size"
+                android:maxWidth="@android:dimen/app_icon_size"
+                android:scaleType="fitCenter" />
+
+        <!-- Weather Provider Service caption -->
+
+        <TextView
+                android:id="@android:id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:layout_toStartOf="@android:id/button1"
+                android:layout_toEndOf="@android:id/icon"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textAlignment="viewStart"
+                android:labelFor="@android:id/button2" />
+
+        <!-- Weather Provider Service radio button -->
+
+        <RadioButton
+                android:id="@android:id/button1"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_alignParentEnd="true"
+                android:layout_centerVertical="true"
+                android:duplicateParentState="true"
+                android:clickable="false"
+                android:focusable="false" />
+
+    </RelativeLayout>
+
+    <!-- Divider -->
+
+    <ImageView
+            android:id="@id/divider"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_centerVertical="true"
+            android:layout_toStartOf="@android:id/button2"
+            android:contentDescription="@null"
+            android:src="@drawable/nav_divider" />
+
+    <ImageView
+            android:id="@android:id/button2"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignBottom="@android:id/widget_frame"
+            android:layout_alignParentEnd="true"
+            android:layout_alignTop="@android:id/widget_frame"
+            android:layout_centerVertical="true"
+            android:layout_margin="0dip"
+            android:background="?android:attr/selectableItemBackground"
+            android:contentDescription="@string/weather_settings_button"
+            android:padding="8dip"
+            android:clickable="true"
+            android:focusable="true"
+            android:src="@drawable/ic_bt_config" />
+
+
+</RelativeLayout>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 8fa69de..8e0a0f1 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -127,4 +127,5 @@ limitations under the License.
     <color name="crypt_keeper_emergency_button_text_color">@color/text_color_white</color>
     <color name="custom_screencolor_buttons_text_color">@color/text_color_white</color>
 
+    <color name="weather_settings_icon_tint">#B4B9BA</color>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 6b42f4e..78c0576 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1163,4 +1163,10 @@
     <string name="restrict_app_cellular_title">Disable app cellular usage</string>
     <string name="restrict_app_cellular_summary">Prevent app from using cellular data connection</string>
     <string name="privacy_guard_internet_category">Internet</string>
+
+    <!-- Weather -->
+    <string name="weather_settings_title">Weather</string>
+    <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
+    <string name="weather_settings_button">Provider settings</string>
+
 </resources>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 56b3b8e..24deb20 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -270,6 +270,14 @@
                 android:icon="@drawable/ic_settings_date_time"
                 />
 
+        <!-- Weather -->
+        <dashboard-tile
+                android:id="@+id/weather_settings"
+                android:title="@string/weather_settings_title"
+                android:fragment="com.android.settings.cyanogenmod.WeatherServiceSettings"
+                android:icon="@drawable/ic_settings_weather"
+                />
+
         <!-- Accessibility feedback -->
         <dashboard-tile
                 android:id="@+id/accessibility_settings"
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 692b292..8af3c80 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -128,4 +128,5 @@ public class Settings extends SettingsActivity {
     public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LiveLockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationManagerActivity extends SettingsActivity { /* empty */ }
+    public static class WeatherProviderServicesActivity extends SettingsActivity { /* empty */ }
 }
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8e0bb98..dfef1a4 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -84,6 +84,7 @@ import com.android.settings.bluetooth.BluetoothSettings;
 import com.android.settings.contributors.ContributorsCloudFragment;
 import com.android.settings.cyanogenmod.DisplayRotation;
 import com.android.settings.cyanogenmod.LiveLockScreenSettings;
+import com.android.settings.cyanogenmod.WeatherServiceSettings;
 import com.android.settings.dashboard.DashboardCategory;
 import com.android.settings.dashboard.DashboardSummary;
 import com.android.settings.dashboard.DashboardTile;
@@ -137,6 +138,7 @@ import com.android.settings.wifi.SavedAccessPointsWifiSettings;
 import com.android.settings.wifi.WifiSettings;
 import com.android.settings.wifi.p2p.WifiP2pSettings;
 
+import cyanogenmod.app.CMContextConstants;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
@@ -377,7 +379,8 @@ public class SettingsActivity extends Activity
             ProfilesSettings.class.getName(),
             ContributorsCloudFragment.class.getName(),
             NotificationManagerSettings.class.getName(),
-            LiveLockScreenSettings.class.getName()
+            LiveLockScreenSettings.class.getName(),
+            WeatherServiceSettings.class.getName()
     };
 
 
@@ -1328,6 +1331,11 @@ public class SettingsActivity extends Activity
                     if (!hasDeviceKeys) {
                         removeTile = true;
                     }
+                } else if (id == R.id.weather_settings) {
+                    if (!getPackageManager().hasSystemFeature(
+                            CMContextConstants.Features.WEATHER_SERVICES)) {
+                        removeTile = true;
+                    }
                 }
 
                 if (UserHandle.MU_ENABLED && UserHandle.myUserId() != 0
diff --git a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
new file mode 100644
index 0000000..424f7de
--- /dev/null
+++ b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
@@ -0,0 +1,343 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.android.settings.cyanogenmod;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Xml;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.ListView;
+import android.widget.RadioButton;
+import android.widget.TextView;
+import com.android.internal.content.PackageMonitor;
+import com.android.internal.os.BackgroundThread;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+import cyanogenmod.providers.CMSettings;
+import cyanogenmod.weatherservice.WeatherProviderService;
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import static org.cyanogenmod.internal.logging.CMMetricsLogger.WEATHER_SETTINGS;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class WeatherServiceSettings extends SettingsPreferenceFragment {
+
+    private Context mContext;
+    private WeatherProviderServiceInfoAdapter mAdapter;
+    private Handler mHandler;
+    private static final String TAG = WeatherServiceSettings.class.getSimpleName();
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+        mContext = activity;
+        mHandler = new Handler(mContext.getMainLooper());
+    }
+
+    @Override
+    protected int getMetricsCategory() {
+        return WEATHER_SETTINGS;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateAdapter();
+        registerPackageMonitor();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        unregisterPackageMonitor();
+    }
+
+    private void registerPackageMonitor() {
+        mPackageMonitor.register(mContext, BackgroundThread.getHandler().getLooper(),
+                UserHandle.ALL, true);
+    }
+
+    private void unregisterPackageMonitor() {
+        mPackageMonitor.unregister();
+    }
+
+    private PackageMonitor mPackageMonitor = new PackageMonitor() {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    updateAdapter();
+                }
+            });
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                    updateAdapter();
+                }
+            });
+        }
+    };
+
+    private void updateAdapter() {
+        final PackageManager pm = getContext().getPackageManager();
+        final Intent intent = new Intent(WeatherProviderService.SERVICE_INTERFACE);
+        List<ResolveInfo> resolveInfoList = pm.queryIntentServices(intent,
+                PackageManager.GET_SERVICES | PackageManager.GET_META_DATA);
+        List<WeatherProviderServiceInfo> weatherProviderServiceInfos
+                = new ArrayList<>(resolveInfoList.size());
+        ComponentName activeService = getEnabledWeatherServiceProvider();
+        for (ResolveInfo resolveInfo : resolveInfoList) {
+            if (resolveInfo.serviceInfo == null) continue;
+
+            if (resolveInfo.serviceInfo.packageName == null
+                    || resolveInfo.serviceInfo.name == null) {
+                //Really?
+                continue;
+            }
+
+            if (!resolveInfo.serviceInfo.permission.equals(
+                    cyanogenmod.platform.Manifest.permission.BIND_WEATHER_PROVIDER_SERVICE)) {
+                continue;
+            }
+            WeatherProviderServiceInfo serviceInfo = new WeatherProviderServiceInfo();
+            serviceInfo.componentName = new ComponentName(resolveInfo.serviceInfo.packageName,
+                    resolveInfo.serviceInfo.name);
+            serviceInfo.isActive = serviceInfo.componentName.equals(activeService);
+            serviceInfo.caption = resolveInfo.loadLabel(pm);
+            serviceInfo.icon = resolveInfo.loadIcon(pm);
+            serviceInfo.settingsComponentName = getSettingsComponent(pm, resolveInfo);
+
+            weatherProviderServiceInfos.add(serviceInfo);
+        }
+        mAdapter.clear();
+        mAdapter.addAll(weatherProviderServiceInfos);
+
+    }
+
+    private ComponentName getSettingsComponent(PackageManager pm, ResolveInfo resolveInfo) {
+        if (resolveInfo == null
+                || resolveInfo.serviceInfo == null
+                || resolveInfo.serviceInfo.metaData == null) {
+            return null;
+        }
+        String cn = null;
+        XmlResourceParser parser = null;
+        Exception caughtException = null;
+
+        try {
+            parser = resolveInfo.serviceInfo.loadXmlMetaData(pm,
+                    WeatherProviderService.SERVICE_META_DATA);
+            if (parser == null) {
+                Log.w(TAG, "Can't find " + WeatherProviderService.SERVICE_META_DATA + " meta-data");
+                return null;
+            }
+            Resources res =
+                    pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
+            AttributeSet attrs = Xml.asAttributeSet(parser);
+            int type;
+            while ((type=parser.next()) != XmlPullParser.END_DOCUMENT
+                    && type != XmlPullParser.START_TAG) {
+            }
+            String nodeName = parser.getName();
+            if (!"weather-provider-service".equals(nodeName)) {
+                Log.w(TAG, "Meta-data does not start with weather-provider-service tag");
+                return null;
+            }
+            //Will use Dream styleable for now, it has the attribute we need
+            TypedArray sa = res.obtainAttributes(attrs, com.android.internal.R.styleable.Dream);
+            cn = sa.getString(com.android.internal.R.styleable.Dream_settingsActivity);
+            sa.recycle();
+        } catch (PackageManager.NameNotFoundException e) {
+            caughtException = e;
+        } catch (IOException e) {
+            caughtException = e;
+        } catch (XmlPullParserException e) {
+            caughtException = e;
+        } finally {
+            if (parser != null) parser.close();
+        }
+        if (caughtException != null) {
+            Log.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName,
+                    caughtException);
+            return null;
+        }
+        if (cn != null && cn.indexOf('/') < 0) {
+            cn = resolveInfo.serviceInfo.packageName + "/" + cn;
+        }
+        return cn == null ? null : ComponentName.unflattenFromString(cn);
+    }
+
+    private ComponentName getEnabledWeatherServiceProvider() {
+        String activeWeatherServiceProvider = CMSettings.Secure.getString(
+                mContext.getContentResolver(), CMSettings.Secure.WEATHER_PROVIDER_SERVICE);
+        if (activeWeatherServiceProvider == null) return null;
+        return ComponentName.unflattenFromString(activeWeatherServiceProvider);
+    }
+
+    @Override
+    public void onViewCreated(View view, Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        ListView listView = getListView();
+        ViewGroup contentRoot = (ViewGroup) listView.getParent();
+        listView.setItemsCanFocus(true);
+
+        View emptyView = getActivity().getLayoutInflater().inflate(
+                R.layout.empty_weather_state, contentRoot, false);
+        TextView emptyTextView = (TextView) emptyView.findViewById(R.id.message);
+        emptyTextView.setText(R.string.weather_settings_no_services_prompt);
+
+        listView.setEmptyView(emptyView);
+
+        contentRoot.addView(emptyView);
+        mAdapter = new WeatherProviderServiceInfoAdapter(mContext);
+        listView.setAdapter(mAdapter);
+    }
+
+    private class WeatherProviderServiceInfo {
+        CharSequence caption;
+        Drawable icon;
+        boolean isActive;
+        ComponentName componentName;
+        public ComponentName settingsComponentName;
+    }
+
+    private class WeatherProviderServiceInfoAdapter
+            extends ArrayAdapter<WeatherProviderServiceInfo> {
+
+        private final LayoutInflater mInflater;
+
+        public WeatherProviderServiceInfoAdapter(Context context) {
+            super(context, 0);
+            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            WeatherProviderServiceInfo info = getItem(position);
+            final View row = convertView != null ? convertView :
+                    buildRow(parent);
+            row.setTag(info);
+
+            ((ImageView) row.findViewById(android.R.id.icon))
+                    .setImageDrawable(info.icon);
+
+            ((TextView) row.findViewById(android.R.id.title)).setText(info.caption);
+
+            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+            radioButton.setChecked(info.isActive);
+            radioButton.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    row.onTouchEvent(event);
+                    return false;
+                }
+            });
+
+            boolean showSettings = info.settingsComponentName != null;
+            View settingsDivider = row.findViewById(R.id.divider);
+            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+            settingsButton.setAlpha(info.isActive ? 1f : Utils.DISABLED_ALPHA);
+            settingsButton.setEnabled(info.isActive);
+            settingsButton.setFocusable(info.isActive);
+            settingsButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    launchSettingsActivity((WeatherProviderServiceInfo)row.getTag());
+                }
+            });
+
+            return row;
+        }
+
+        private void launchSettingsActivity(WeatherProviderServiceInfo info) {
+            if (info != null && info.settingsComponentName != null) {
+                mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
+            }
+        }
+
+        private View buildRow(ViewGroup parent) {
+            final View row =  mInflater.inflate(R.layout.weather_service_provider_info_row,
+                    parent, false);
+            final View header = row.findViewById(android.R.id.widget_frame);
+            header.setOnClickListener(new View.OnClickListener(){
+                @Override
+                public void onClick(View v) {
+                    v.setPressed(true);
+                    setActiveWeatherProviderService((WeatherProviderServiceInfo) row.getTag());
+                }
+            });
+
+            return row;
+        }
+
+        private void setActiveWeatherProviderService(WeatherProviderServiceInfo info) {
+            WeatherProviderServiceInfo currentSelection = getCurrentSelection();
+            if (info.equals(currentSelection)) return;
+            if (currentSelection != null) {
+                currentSelection.isActive = false;
+            }
+            info.isActive = true;
+            CMSettings.Secure.putString(mContext.getContentResolver(),
+                    CMSettings.Secure.WEATHER_PROVIDER_SERVICE,
+                        info.componentName.flattenToString());
+            if (info.settingsComponentName != null) {
+                mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
+            }
+            notifyDataSetChanged();
+        }
+
+        private WeatherProviderServiceInfo getCurrentSelection() {
+            for (int indx = 0; indx < getCount(); indx++) {
+                WeatherProviderServiceInfo info = getItem(indx);
+                if (info.isActive) {
+                    return info;
+                }
+            }
+            return null;
+        }
+    }
+}
-- 
cgit v1.1


From c932de51d42a70989a9c93b5e6fd0fb7fcc82333 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Thu, 31 Mar 2016 10:58:15 -0700
Subject: LLS: Add config for showing LLS settings at top

This config allows the live lock screen settings to be displayed
at the top of the Lock screen settings when set to true, by default
it is false

Change-Id: I051f07c4d7b05e89f4efdc018ce833190a4e14af
TICKET: CYNGNOS-2242
---
 res/values/config.xml                          | 3 +++
 src/com/android/settings/SecuritySettings.java | 8 ++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 325398f..26508b4 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -117,4 +117,7 @@
     <!-- When true enable color temperature setting. -->
     <bool name="config_enableColorTemperature">false</bool>
 
+    <!-- When true Live lock screen settings will be positioned at the top -->
+    <bool name="config_showLiveLockScreenSettingsFirst">false</bool>
+
 </resources>
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index d311134..2652e8c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -349,12 +349,16 @@ public class SecuritySettings extends SettingsPreferenceFragment
             PreferenceGroup generalCategory = (PreferenceGroup)
                     root.findPreference(KEY_GENERAL_CATEGORY);
             if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null) {
+                boolean moveToTop = getResources().getBoolean(
+                        R.bool.config_showLiveLockScreenSettingsFirst);
+
+                PreferenceGroup groupToAddTo = moveToTop ? root : generalCategory;
                 Preference liveLockPreference = new Preference(getContext(), null);
                 liveLockPreference.setIntent(new Intent(ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS));
-                liveLockPreference.setOrder(0);
+                liveLockPreference.setOrder(-1);
                 liveLockPreference.setTitle(R.string.live_lock_screen_title);
                 liveLockPreference.setSummary(R.string.live_lock_screen_summary);
-                generalCategory.addPreference(liveLockPreference);
+                groupToAddTo.addPreference(liveLockPreference);
             }
         }
 
-- 
cgit v1.1


From bae22333f9a241e14c8dda5532d8dbda1c5c79eb Mon Sep 17 00:00:00 2001
From: Kamaljeet Maini <kmaini@cyngn.com>
Date: Tue, 29 Mar 2016 15:46:54 -0700
Subject: Settings app Data Usage UI enhancements

Modified Settings app to support following new features in
Data Usage Summary screen:
1) Added two items to overflow menu
   a) Enable/disable data usage alerts: to enable/disable global
      switch for data alerts. Shown only when DataUsage provider
      is installed.
   b) Reset data statistics: to reset data stats for current tab

2) Added a new per app switch "Mobile Data Alert"
3) Added a new per app switch "Restrict cellular data access"
4) Modified per app background data access feature to support
   three options
   a) Over mobile and WiFi
   b) Only over WiFi
   c) No access

DataUsage provider, service and notification receivers have been
refactored into a standalone package to minimize the changes to the
Settings App.

Change-Id: Ic0e42e57d04dc8e164ebfdab4531cced31c4e6eb
Issue-Id: SETTINGS-75
Issue-Id: SETTINGS-76
Issue-Id: SETTINGS-77
Issue-Id: SETTINGS-76
---
 AndroidManifest.xml                            |   4 +
 res/menu/data_usage.xml                        |   6 +
 res/values/cm_arrays.xml                       |   6 +
 res/values/cm_strings.xml                      |  17 ++
 src/com/android/settings/DataUsageSummary.java | 375 +++++++++++++++++++++++--
 src/com/android/settings/DataUsageUtils.java   | 121 ++++++++
 6 files changed, 498 insertions(+), 31 deletions(-)
 create mode 100644 src/com/android/settings/DataUsageUtils.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 239abbb..fde2300 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2335,6 +2335,10 @@
         <activity android:name="Settings$DataUsageSummaryActivity"
                 android:label="@string/data_usage_summary_title"
                 android:taskAffinity="">
+            <intent-filter android:priority="1">
+                <action android:name="cyanogenmod.settings.ACTION_DATA_USAGE" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/menu/data_usage.xml b/res/menu/data_usage.xml
index 749eb16..9994ca2 100644
--- a/res/menu/data_usage.xml
+++ b/res/menu/data_usage.xml
@@ -36,4 +36,10 @@
     <item
         android:id="@+id/data_usage_menu_help"
         android:title="@string/help_label" />
+    <item
+        android:id="@+id/data_usage_menu_data_alerts"
+        android:title="@string/data_usage_menu_enable_data_alerts" />
+    <item
+        android:id="@+id/data_usage_menu_reset_stats"
+        android:title="@string/data_usage_menu_reset_stats" />
 </menu>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 21bcedc..830f74d 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -591,4 +591,10 @@
         <item>600000</item>
     </string-array>
 
+    <string-array name="background_data_access_choices">
+        <item>Over mobile data &amp; WiFi</item>
+        <item>Only over WiFi</item>
+        <item>No access</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 78c0576..80a86bb 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1169,4 +1169,21 @@
     <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
     <string name="weather_settings_button">Provider settings</string>
 
+    <string name="background_data_access">Background data access</string>
+    <string name="allow_background_both">Over mobile data &amp; WiFi</string>
+    <string name="allow_background_wlan">Only over WiFi</string>
+    <string name="allow_background_none">No access</string>
+    <string name="mobile_data_alert">Mobile Data Alert</string>
+    <string name="mobile_data_alert_summary">Notify when the app uses a significant amount of data</string>
+    <string name="data_usage_menu_enable_data_alerts">Enable data usage alerts</string>
+    <string name="data_usage_menu_disable_data_alerts">Disable data usage alerts</string>
+    <string name="data_usage_menu_reset_stats">Reset data statistics</string>
+    <string name="reset_data_stats_msg">Confirming this will clear all past and present data tracking information.</string>
+    <string name="reset_stats_confirm">Confirm</string>
+
+    <string name="restrict_cellular_access_title">Restrict cellular data access</string>
+    <string name="restrict_cellular_access_summary">Disable data access on cellular networks</string>
+    <string name="restrict_cellular_access_dialog_title">Restrict cellular data access?</string>
+    <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only cellular networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
+
 </resources>
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 63120e3..22a9994 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -25,6 +25,8 @@ import static android.net.NetworkPolicy.WARNING_DISABLED;
 import static android.net.NetworkPolicyManager.EXTRA_NETWORK_TEMPLATE;
 import static android.net.NetworkPolicyManager.POLICY_NONE;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN_BACKGROUND;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;
 import static android.net.NetworkPolicyManager.computeLastCycleBoundary;
 import static android.net.NetworkPolicyManager.computeNextCycleBoundary;
 import static android.net.NetworkTemplate.MATCH_MOBILE_3G_LOWER;
@@ -127,6 +129,7 @@ import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.PhoneConstants;
+import com.android.settings.DataUsageUtils;
 import com.android.settings.drawable.InsetBoundsDrawable;
 import com.android.settings.net.DataUsageMeteredSettings;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -176,6 +179,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     private static final String TAB_ETHERNET = "ethernet";
 
     private static final String TAG_CONFIRM_DATA_DISABLE = "confirmDataDisable";
+    private static final String TAG_CONFIRM_DATA_RESET = "confirmDataReset";
+    private static final String TAG_CONFIRM_APP_RESTRICT_CELLULAR = "confirmAppRestrictCellular";
     private static final String TAG_CONFIRM_LIMIT = "confirmLimit";
     private static final String TAG_CYCLE_EDITOR = "cycleEditor";
     private static final String TAG_WARNING_EDITOR = "warningEditor";
@@ -194,6 +199,9 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
 
     private static final int LOADER_CHART_DATA = 2;
     private static final int LOADER_SUMMARY = 3;
+    private static final int DATA_USAGE_BACKGROUND_FULL_ACCESS = 0;
+    private static final int DATA_USAGE_BACKGROUND_WLAN_ACCESS = 1;
+    private static final int DATA_USAGE_BACKGROUND_NO_ACCESS = 2;
 
     private INetworkManagementService mNetworkService;
     private INetworkStatsService mStatsService;
@@ -206,6 +214,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     private static final String PREF_FILE = "data_usage";
     private static final String PREF_SHOW_WIFI = "show_wifi";
     private static final String PREF_SHOW_ETHERNET = "show_ethernet";
+    private static final String PREF_ENABLE_DATA_USAGE_NOTIFY = "enable_data_usage_notify";
 
     private SharedPreferences mPrefs;
 
@@ -250,11 +259,17 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     private Button mAppSettings;
 
     private LinearLayout mAppSwitches;
-    private Switch mAppRestrict;
+    private Switch mAppDataAlert;
+    private Switch mAppCellularAccess;
     private View mAppRestrictView;
+    private View mAppDataAlertView;
+    private View mAppCellularAccessView;
+    private Spinner mRestrictSpinner;
 
     private boolean mShowWifi = false;
     private boolean mShowEthernet = false;
+    private boolean mShowAlerts = false;
+    private boolean mDataAlertsSupported = false;
 
     private NetworkTemplate mTemplate;
     private ChartData mChartData;
@@ -273,6 +288,8 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     private MenuItem mMenuShowEthernet;
     private MenuItem mMenuSimCards;
     private MenuItem mMenuCellularNetworks;
+    private MenuItem mMenuDataAlerts;
+    private MenuItem mMenuResetStats;
 
     private List<SubscriptionInfo> mSubInfoList;
     private Map<Integer,String> mMobileTagMap;
@@ -334,6 +351,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
 
         mShowWifi = mPrefs.getBoolean(PREF_SHOW_WIFI, true);
         mShowEthernet = mPrefs.getBoolean(PREF_SHOW_ETHERNET, false);
+        mShowAlerts = mPrefs.getBoolean(PREF_ENABLE_DATA_USAGE_NOTIFY, false);
 
         // override preferences when no mobile radio
         if (!hasReadyMobileRadio(context)) {
@@ -444,14 +462,51 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
 
             mAppSettings = (Button) mAppDetail.findViewById(R.id.app_settings);
 
-            mAppRestrict = new Switch(inflater.getContext());
-            mAppRestrict.setClickable(false);
-            mAppRestrict.setFocusable(false);
-            mAppRestrictView = inflatePreference(inflater, mAppSwitches, mAppRestrict);
+            ArrayAdapter<String> restrictAdapter = new ArrayAdapter<String>(
+                    inflater.getContext(), android.R.layout.simple_spinner_dropdown_item,
+                    getResources().getStringArray(R.array.background_data_access_choices));
+
+            mRestrictSpinner = new Spinner(inflater.getContext());
+            mRestrictSpinner.setAdapter(restrictAdapter);
+            mRestrictSpinner.setOnItemSelectedListener(mAppRestrictListener);
+
+            mAppRestrictView = inflatePreferenceWithInvisibleWidget(inflater,
+                    mAppSwitches, mRestrictSpinner);
             mAppRestrictView.setClickable(true);
             mAppRestrictView.setFocusable(true);
-            mAppRestrictView.setOnClickListener(mAppRestrictListener);
+            mAppRestrictView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mRestrictSpinner.performClick();
+                }
+            });
             mAppSwitches.addView(mAppRestrictView);
+
+            //switch for per app data alert enable/disable
+            mAppDataAlert = new Switch(inflater.getContext());
+            mAppDataAlert.setClickable(false);
+            mAppDataAlert.setFocusable(false);
+            mAppDataAlertView = inflatePreference(inflater, mAppSwitches, mAppDataAlert);
+            mAppDataAlertView.setClickable(true);
+            mAppDataAlertView.setFocusable(true);
+            mAppDataAlertView.setOnClickListener(mAppDataAlertListner);
+            mAppSwitches.addView(mAppDataAlertView);
+
+            // check if content provider is installed. If not, hide data alert switch
+            mDataAlertsSupported = DataUsageUtils.isDbEnabled(context);
+            if (!mDataAlertsSupported) {
+                mAppDataAlertView.setVisibility(View.GONE);
+            }
+
+            // switch for per app cellular access enabled/disable
+            mAppCellularAccess = new Switch(inflater.getContext());
+            mAppCellularAccess.setClickable(false);
+            mAppCellularAccess.setFocusable(false);
+            mAppCellularAccessView = inflatePreference(inflater, mAppSwitches, mAppCellularAccess);
+            mAppCellularAccessView.setClickable(true);
+            mAppCellularAccessView.setFocusable(true);
+            mAppCellularAccessView.setOnClickListener(mAppRestrictCellularListener);
+            mAppSwitches.addView(mAppCellularAccessView);
         }
 
         mDisclaimer = mHeader.findViewById(R.id.disclaimer);
@@ -591,6 +646,17 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
             help.setVisible(false);
         }
 
+        mMenuDataAlerts = menu.findItem(R.id.data_usage_menu_data_alerts);
+
+        if (mDataAlertsSupported) {
+            mMenuDataAlerts.setVisible(!appDetailMode);
+        } else {
+            mMenuDataAlerts.setVisible(false);
+        }
+
+        mMenuResetStats = menu.findItem(R.id.data_usage_menu_reset_stats);
+        mMenuResetStats.setVisible(!appDetailMode);
+
         updateMenuTitles();
     }
 
@@ -612,6 +678,11 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         } else {
             mMenuShowEthernet.setTitle(R.string.data_usage_menu_show_ethernet);
         }
+        if (mShowAlerts) {
+            mMenuDataAlerts.setTitle(R.string.data_usage_menu_disable_data_alerts);
+        } else {
+            mMenuDataAlerts.setTitle(R.string.data_usage_menu_enable_data_alerts);
+        }
     }
 
     @Override
@@ -658,6 +729,14 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
                         R.string.data_usage_metered_title, null, this, 0);
                 return true;
             }
+            case R.id.data_usage_menu_reset_stats: {
+                ConfirmDataResetFragment.show(DataUsageSummary.this, mTemplate);
+                return true;
+            }
+            case R.id.data_usage_menu_data_alerts: {
+                updateShowAlertsState(!mShowAlerts);
+                return true;
+            }
         }
         return false;
     }
@@ -675,6 +754,13 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         super.onDestroy();
     }
 
+    private void updateShowAlertsState(boolean showAlert) {
+        mShowAlerts = showAlert;
+        mPrefs.edit().putBoolean(PREF_ENABLE_DATA_USAGE_NOTIFY, mShowAlerts).apply();
+        updateMenuTitles();
+        DataUsageUtils.enableDataUsageService(getContext(), mShowAlerts);
+    }
+
     /**
      * Build and assign {@link LayoutTransition} to various containers. Should
      * only be assigned after initial layout is complete.
@@ -1026,17 +1112,52 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
 
         updateDetailData();
 
-        if (UserHandle.isApp(uid) && !mPolicyManager.getRestrictBackground()
-                && isBandwidthControlEnabled() && hasReadyMobileRadio(context)) {
-            setPreferenceTitle(mAppRestrictView, R.string.data_usage_app_restrict_background);
-            setPreferenceSummary(mAppRestrictView,
-                    getString(R.string.data_usage_app_restrict_background_summary));
+        if (UserHandle.isApp(uid) && isBandwidthControlEnabled()) {
+            setPreferenceTitle(mAppRestrictView, R.string.background_data_access);
 
+            int backgroundPolicy = getAppRestrictBackground();
+            final int summaryResId, position;
+            if ((backgroundPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) {
+                if ((backgroundPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) {
+                    summaryResId = R.string.allow_background_none;
+                    position = DATA_USAGE_BACKGROUND_NO_ACCESS;
+                } else {
+                    summaryResId = R.string.allow_background_wlan;
+                    position = DATA_USAGE_BACKGROUND_WLAN_ACCESS;
+                }
+            } else {
+                summaryResId = R.string.allow_background_both;
+                position = DATA_USAGE_BACKGROUND_FULL_ACCESS;
+            }
+            setPreferenceSummary(mAppRestrictView, getString(summaryResId));
+            mRestrictSpinner.setSelection(position);
             mAppRestrictView.setVisibility(View.VISIBLE);
-            mAppRestrict.setChecked(getAppRestrictBackground());
 
+            if (isMobileTab(mCurrentTab) || TAB_3G.equals(mCurrentTab)
+                    || TAB_4G.equals(mCurrentTab)) {
+                setPreferenceTitle(mAppCellularAccessView, R.string.restrict_cellular_access_title);
+                setPreferenceSummary(mAppCellularAccessView,
+                        getString(R.string.restrict_cellular_access_summary));
+                mAppCellularAccessView.setVisibility(View.VISIBLE);
+                mAppCellularAccess.setChecked(getAppRestrictCellular());
+            } else {
+                mAppCellularAccessView.setVisibility(View.GONE);
+            }
+
+            if (mDataAlertsSupported) {
+                setPreferenceTitle(mAppDataAlertView, R.string.mobile_data_alert);
+                setPreferenceSummary(mAppDataAlertView,
+                        getString(R.string.mobile_data_alert_summary));
+
+                mAppDataAlertView.setVisibility(View.VISIBLE);
+                mAppDataAlert.setChecked(getAppDataAlert());
+            } else {
+                mAppDataAlertView.setVisibility(View.GONE);
+            }
         } else {
             mAppRestrictView.setVisibility(View.GONE);
+            mAppDataAlertView.setVisibility(View.GONE);
+            mAppCellularAccessView.setVisibility(View.GONE);
         }
     }
 
@@ -1090,6 +1211,29 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         updatePolicy(false);
     }
 
+    private void resetDataStats(NetworkTemplate template) {
+        // kick off background task to reset stats
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(Void... params) {
+                try {
+                    mStatsService.resetDataUsageHistoryForAllUid(mTemplate);
+                    mPolicyEditor.setPolicyLimitBytes(mTemplate,
+                            mPolicyEditor.getPolicyLimitBytes(mTemplate));
+                    mStatsService.forceUpdate();
+                } catch (RemoteException e) {
+
+                }
+                return null;
+            }
+            @Override
+            protected void onPostExecute (Void result) {
+                updateBody();
+            }
+
+        }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+    }
+
     private boolean isNetworkPolicyModifiable(NetworkPolicy policy) {
         return policy != null && isBandwidthControlEnabled() && mDataEnabled.isChecked()
                 && ActivityManager.getCurrentUser() == UserHandle.USER_OWNER;
@@ -1109,18 +1253,106 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         updateMenuTitles();
     }
 
-    private boolean getAppRestrictBackground() {
+    private int getAppRestrictBackground() {
         final int uid = mCurrentApp.key;
         final int uidPolicy = mPolicyManager.getUidPolicy(uid);
-        return (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0;
+
+        return ((uidPolicy & POLICY_REJECT_METERED_BACKGROUND) | (uidPolicy &
+                POLICY_REJECT_ON_WLAN_BACKGROUND));
     }
 
-    private void setAppRestrictBackground(boolean restrictBackground) {
+    private void setAppRestrictBackground(int newPolicy) {
         if (LOGD) Log.d(TAG, "setAppRestrictBackground()");
         final int uid = mCurrentApp.key;
-        mPolicyManager.setUidPolicy(
-                uid, restrictBackground ? POLICY_REJECT_METERED_BACKGROUND : POLICY_NONE);
-        mAppRestrict.setChecked(restrictBackground);
+        final int currentPolicy = mPolicyManager.getUidPolicy(uid);
+
+        if (newPolicy == currentPolicy) {
+            return;
+        }
+
+        if (((newPolicy & POLICY_REJECT_METERED_BACKGROUND) ^ (currentPolicy &
+                POLICY_REJECT_METERED_BACKGROUND)) != 0 ) {
+            if ((newPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) {
+                mPolicyManager.addUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
+            } else {
+                mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_METERED_BACKGROUND);
+            }
+        }
+
+        if (((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) ^ (currentPolicy &
+                POLICY_REJECT_ON_WLAN_BACKGROUND)) != 0 ) {
+            if ((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) {
+                mPolicyManager.addUidPolicy(uid, POLICY_REJECT_ON_WLAN_BACKGROUND);
+            } else {
+                mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_ON_WLAN_BACKGROUND);
+            }
+        }
+
+        final int summaryResId;
+        if ((newPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) {
+            if ((newPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) {
+                summaryResId = R.string.allow_background_none;
+            } else {
+                summaryResId = R.string.allow_background_wlan;
+            }
+        } else {
+            summaryResId = R.string.allow_background_both;
+        }
+        setPreferenceSummary(mAppRestrictView, getString(summaryResId));
+    }
+
+    private boolean getAppRestrictCellular() {
+        final int uid = mCurrentApp.key;
+        final int uidPolicy = mPolicyManager.getUidPolicy(uid);
+        return (uidPolicy & POLICY_REJECT_ON_DATA) != 0;
+    }
+
+    private void setAppRestrictCellular(boolean restrictCellular) {
+        if (LOGD) Log.d(TAG, "setAppRestrictCellular()");
+        final int uid = mCurrentApp.key;
+        if (restrictCellular) {
+            mPolicyManager.addUidPolicy(uid, POLICY_REJECT_ON_DATA);
+        } else {
+            mPolicyManager.removeUidPolicy(uid, POLICY_REJECT_ON_DATA);
+        }
+        mAppCellularAccess.setChecked(restrictCellular);
+    }
+
+
+    private void setAppDataAlert(boolean enableDataAlert) {
+        final int uid = mCurrentApp.key;
+
+        // Get app's details to send to the DataUsage Provider. Don't block if not in the
+        // DetailProvider cache. (should be in the cache, as the app's label had already
+        // been displayed in the list of apps)
+        UidDetail detail = mUidDetailProvider.getUidDetail(uid, false);
+        String label = detail != null ? detail.label.toString() : "";
+
+        try {
+            DataUsageUtils.enableApp(getContext(), uid, enableDataAlert, label);
+        } catch (Exception e) {
+            //content provider may not be installed.
+            Log.d(TAG, "Unable to set data alert state");
+            return;
+        }
+        mAppDataAlert.setChecked(enableDataAlert);
+
+        // automatically enable global alert for notifications when enabling first per app alert
+        if (enableDataAlert && !mShowAlerts) {
+            updateShowAlertsState(true);
+        }
+    }
+
+    private boolean getAppDataAlert() {
+        final int uid = mCurrentApp.key;
+
+        try {
+            return DataUsageUtils.isAppEnabled(getContext(), uid);
+        } catch (Exception e) {
+            //content provider may not be installed.
+            Log.d(TAG, "Unable to get data alert state");
+            return false;
+        }
     }
 
     /**
@@ -1298,22 +1530,53 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         }
     };
 
-    private View.OnClickListener mAppRestrictListener = new View.OnClickListener() {
+    private AdapterView.OnItemSelectedListener mAppRestrictListener =
+            new AdapterView.OnItemSelectedListener() {
+        @Override
+        public void onItemSelected(AdapterView<?> parent, View v, int position, long id) {
+            final int backgroundPolicy;
+
+            if (position == DATA_USAGE_BACKGROUND_WLAN_ACCESS) {
+                backgroundPolicy = POLICY_REJECT_METERED_BACKGROUND;
+            } else if (position == DATA_USAGE_BACKGROUND_NO_ACCESS) {
+                backgroundPolicy = POLICY_REJECT_METERED_BACKGROUND |
+                        POLICY_REJECT_ON_WLAN_BACKGROUND;
+            } else {
+                backgroundPolicy = DATA_USAGE_BACKGROUND_FULL_ACCESS;
+            }
+            setAppRestrictBackground(backgroundPolicy);
+        }
+
+        @Override
+        public void onNothingSelected(AdapterView<?> parent) {
+            // noop
+        }
+    };
+
+    private View.OnClickListener mAppRestrictCellularListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
-            final boolean restrictBackground = !mAppRestrict.isChecked();
+            final boolean restrictCellular = !mAppCellularAccess.isChecked();
 
-            if (restrictBackground) {
+            if (restrictCellular) {
                 // enabling restriction; show confirmation dialog which
-                // eventually calls setRestrictBackground() once user
+                // eventually calls setRestrictCellular() once user
                 // confirms.
-                ConfirmAppRestrictFragment.show(DataUsageSummary.this);
+                ConfirmAppRestrictCellularFragment.show(DataUsageSummary.this);
             } else {
-                setAppRestrictBackground(false);
+                setAppRestrictCellular(false);
             }
         }
     };
 
+    private View.OnClickListener mAppDataAlertListner = new View.OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            final boolean enableDataAlert = !mAppDataAlert.isChecked();
+            setAppDataAlert(enableDataAlert);
+        }
+    };
+
     private OnItemClickListener mListListener = new OnItemClickListener() {
         @Override
         public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -2199,6 +2462,45 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     }
 
     /**
+     * Dialog to request user confirmation before resetting data.
+     */
+    public static class ConfirmDataResetFragment extends DialogFragment {
+        static NetworkTemplate mTemplate;
+        public static void show(DataUsageSummary parent, NetworkTemplate template) {
+            mTemplate = template;
+            if (!parent.isAdded()) return;
+
+            final ConfirmDataResetFragment dialog = new ConfirmDataResetFragment();
+            dialog.setTargetFragment(parent, 0);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_DATA_RESET);
+        }
+
+        @Override
+        public Dialog onCreateDialog(Bundle savedInstanceState) {
+            final Context context = getActivity();
+
+            final AlertDialog.Builder builder = new AlertDialog.Builder(context);
+            builder.setTitle(R.string.data_usage_menu_reset_stats);
+            builder.setMessage(R.string.reset_data_stats_msg);
+
+            builder.setPositiveButton(R.string.reset_stats_confirm,
+                    new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
+                            if (target != null) {
+                                // TODO: extend to modify policy enabled flag.
+                                target.resetDataStats(mTemplate);
+                            }
+                        }
+                    });
+            builder.setNegativeButton(android.R.string.cancel, null);
+
+            return builder.create();
+        }
+    }
+
+    /**
      * Dialog to request user confirmation before setting
      * {@link INetworkPolicyManager#setRestrictBackground(boolean)}.
      */
@@ -2267,15 +2569,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
 
     /**
      * Dialog to request user confirmation before setting
-     * {@link #POLICY_REJECT_METERED_BACKGROUND}.
+     * {@link #POLICY_REJECT_ON_DATA}.
      */
-    public static class ConfirmAppRestrictFragment extends DialogFragment {
+    public static class ConfirmAppRestrictCellularFragment extends DialogFragment {
         public static void show(DataUsageSummary parent) {
             if (!parent.isAdded()) return;
 
-            final ConfirmAppRestrictFragment dialog = new ConfirmAppRestrictFragment();
+            final ConfirmAppRestrictCellularFragment dialog = new
+                    ConfirmAppRestrictCellularFragment();
             dialog.setTargetFragment(parent, 0);
-            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_APP_RESTRICT);
+            dialog.show(parent.getFragmentManager(), TAG_CONFIRM_APP_RESTRICT_CELLULAR);
         }
 
         @Override
@@ -2283,15 +2586,15 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
             final Context context = getActivity();
 
             final AlertDialog.Builder builder = new AlertDialog.Builder(context);
-            builder.setTitle(R.string.data_usage_app_restrict_dialog_title);
-            builder.setMessage(R.string.data_usage_app_restrict_dialog);
+            builder.setTitle(R.string.restrict_cellular_access_dialog_title);
+            builder.setMessage(R.string.restrict_cellular_access_dialog_summary);
 
             builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
                     final DataUsageSummary target = (DataUsageSummary) getTargetFragment();
                     if (target != null) {
-                        target.setAppRestrictBackground(true);
+                        target.setAppRestrictCellular(true);
                     }
                 }
             });
@@ -2517,6 +2820,16 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
         return view;
     }
 
+    private static View inflatePreferenceWithInvisibleWidget(LayoutInflater inflater,
+            ViewGroup root, View widget) {
+        final ViewGroup view = (ViewGroup) inflater.inflate(R.layout.preference, root, false);
+        view.addView(widget, 0);
+        final ViewGroup.LayoutParams lp = widget.getLayoutParams();
+        lp.width = 0;
+        widget.setLayoutParams(lp);
+        return view;
+    }
+
     /**
      * Test if any networks are currently limited.
      */
diff --git a/src/com/android/settings/DataUsageUtils.java b/src/com/android/settings/DataUsageUtils.java
new file mode 100644
index 0000000..5f08067
--- /dev/null
+++ b/src/com/android/settings/DataUsageUtils.java
@@ -0,0 +1,121 @@
+package com.android.settings;
+
+
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.util.Log;
+
+import cyanogenmod.providers.DataUsageContract;
+
+
+/**
+ * This class contains utility helper functions for accessing DataUsageProvider
+ */
+public class DataUsageUtils {
+    private static final String TAG = DataUsageUtils.class.getSimpleName();
+    private static final int DATAUSAGE_SERVICE_ALARM_ID = 0x102030;
+    private static boolean DEBUG = true;
+
+    public static void addApp(Context context, int uid, String label) {
+        if (DEBUG) {
+            Log.v(TAG, "addApp: uid:" + uid + " label:" + label);
+        }
+
+        ContentValues values = new ContentValues();
+
+        values.put(DataUsageContract.UID, uid);
+        values.put(DataUsageContract.LABEL, label);
+
+        context.getContentResolver().insert(
+                DataUsageContract.CONTENT_URI,
+                values
+        );
+    }
+
+    public static void removeApp(Context context, int uid) {
+        if (DEBUG) {
+            Log.v(TAG, "removeApp: uid:" + uid);
+        }
+        context.getContentResolver().delete(
+                DataUsageContract.CONTENT_URI,
+                DataUsageContract.UID + " = ? ",
+                new String [] { String.valueOf(uid)}
+        );
+    }
+
+    public static void enableApp(Context context, int uid, boolean enable) {
+        enableApp(context, uid, enable, null);
+    }
+
+    public static void enableApp(Context context, int uid, boolean enable, String label) {
+        if (DEBUG) {
+            Log.v(TAG, "enableApp: uid:" + uid + " enable:" + enable +
+                    (label == null ? "" : " label:" + label));
+        }
+        ContentValues values = new ContentValues();
+
+        values.put(DataUsageContract.ENABLE, enable);
+        values.put(DataUsageContract.ACTIVE, 0);
+        if (label != null) {
+            values.put(DataUsageContract.LABEL, label);
+        }
+        context.getContentResolver().update(
+                DataUsageContract.CONTENT_URI,
+                values,
+                DataUsageContract.UID + " = ? ",
+                new String [] { String.valueOf(uid)}
+        );
+    }
+
+    public static boolean isDbEnabled(Context context) {
+        boolean dbEnabled = false;
+        Cursor cursor = context.getContentResolver().query(
+                DataUsageContract.CONTENT_URI,
+                null,
+                DataUsageContract.UID + " = ? ",
+                new String [] { String.valueOf("0") },
+                null
+        );
+
+        if (cursor != null) {
+            cursor.close();
+            dbEnabled = true;
+        }
+        return dbEnabled;
+    }
+
+
+    public static boolean isAppEnabled(Context context, int uid) {
+        boolean appEnabled = false;
+        Cursor cursor = context.getContentResolver().query(
+                DataUsageContract.CONTENT_URI,
+                null,
+                DataUsageContract.UID + " = ? ",
+                new String [] { String.valueOf(uid) },
+                null
+        );
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                appEnabled = cursor.getInt(DataUsageContract.COLUMN_OF_ENABLE) == 1;
+            }
+            cursor.close();
+        }
+
+        if (DEBUG) {
+            Log.v(TAG, "isAppEnabled: uid:" + uid + " enabled:" + appEnabled);
+        }
+
+        return appEnabled;
+    }
+
+    public static void enableDataUsageService(Context context, boolean enable) {
+        Intent intent = new Intent();
+        intent.setAction("org.cyanogenmod.providers.datausage.enable");
+        intent.putExtra("enable", enable);
+        context.sendBroadcast(intent);
+    }
+}
-- 
cgit v1.1


From ec1bbc82a49056353c5be0d60ef2b0f98f5df30f Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Mon, 4 Apr 2016 18:55:50 +0300
Subject: Improve cellular data strings

* Follow standards

Change-Id: Idab832e96eefd7d3937f60bf8b61af1b12001b7a
---
 res/values/cm_strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 80a86bb..44c7548 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1170,15 +1170,15 @@
     <string name="weather_settings_button">Provider settings</string>
 
     <string name="background_data_access">Background data access</string>
-    <string name="allow_background_both">Over mobile data &amp; WiFi</string>
-    <string name="allow_background_wlan">Only over WiFi</string>
+    <string name="allow_background_both">Over cellular data &amp; Wi\u2011Fi</string>
+    <string name="allow_background_wlan">Only over Wi\u2011Fi</string>
     <string name="allow_background_none">No access</string>
-    <string name="mobile_data_alert">Mobile Data Alert</string>
+    <string name="mobile_data_alert">Cellular data alert</string>
     <string name="mobile_data_alert_summary">Notify when the app uses a significant amount of data</string>
     <string name="data_usage_menu_enable_data_alerts">Enable data usage alerts</string>
     <string name="data_usage_menu_disable_data_alerts">Disable data usage alerts</string>
     <string name="data_usage_menu_reset_stats">Reset data statistics</string>
-    <string name="reset_data_stats_msg">Confirming this will clear all past and present data tracking information.</string>
+    <string name="reset_data_stats_msg">This will clear all past and present data tracking information</string>
     <string name="reset_stats_confirm">Confirm</string>
 
     <string name="restrict_cellular_access_title">Restrict cellular data access</string>
-- 
cgit v1.1


From 9282d9e14334bdfe01f9917889fd83c060a8f556 Mon Sep 17 00:00:00 2001
From: Unpublished <unpublished@gmx.net>
Date: Sun, 3 Apr 2016 13:14:45 +0200
Subject: AppOps: Don't show option to restrict network usage for platform
 signed apps

Using the option results in an IllegalArgumentException of the settings app.

Change-Id: Ia3ceddb39fccc6ae445a7e4e307a248794127878
---
 src/com/android/settings/applications/AppOpsDetails.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/AppOpsDetails.java b/src/com/android/settings/applications/AppOpsDetails.java
index 07ef72e..1d4a684 100644
--- a/src/com/android/settings/applications/AppOpsDetails.java
+++ b/src/com/android/settings/applications/AppOpsDetails.java
@@ -34,6 +34,7 @@ import android.os.Bundle;
 import android.os.IDeviceIdleController;
 import android.os.RemoteException;
 import android.os.ServiceManager;
+import android.os.UserHandle;
 import android.util.ArraySet;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -271,8 +272,9 @@ public class AppOpsDetails extends InstrumentedFragment {
             }
         }
 
-        if (mPm.checkPermission(Manifest.permission.INTERNET, mPackageInfo.packageName)
-                == PackageManager.PERMISSION_GRANTED) {
+        if (UserHandle.isApp(mPackageInfo.applicationInfo.uid) &&
+                    mPm.checkPermission(Manifest.permission.INTERNET,
+                    mPackageInfo.packageName) == PackageManager.PERMISSION_GRANTED) {
             TextView internetCategory = (TextView) mInflater.inflate(
                     R.layout.preference_category_material, null);
             internetCategory.setText(R.string.privacy_guard_internet_category);
-- 
cgit v1.1


From d36cdf3a39dc0f0664198020b6cd4fbcbaea00d9 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 4 Apr 2016 08:39:00 -0700
Subject: Settings: fix profiles nw selection with 1 sim in MSIM DUT

Ticket: CYNGNOS-1463
Change-Id: I2ad9436c17f0c2ecc9aea7cae7d2f6c806eb9ed7
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/profiles/SetupActionsFragment.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/profiles/SetupActionsFragment.java b/src/com/android/settings/profiles/SetupActionsFragment.java
index d1ca91b..b94632a 100644
--- a/src/com/android/settings/profiles/SetupActionsFragment.java
+++ b/src/com/android/settings/profiles/SetupActionsFragment.java
@@ -230,7 +230,7 @@ public class SetupActionsFragment extends SettingsPreferenceFragment
 
             final List<SubscriptionInfo> subs = SubscriptionManager.from(getContext())
                     .getActiveSubscriptionInfoList();
-            if (subs != null && subs.size() > 1) {
+            if (subs != null) {
                 for (SubscriptionInfo sub : subs) {
                     mItems.add(generatePreferredNetworkOverrideItem(sub.getSubscriptionId()));
                 }
-- 
cgit v1.1


From 8b1fe7d8b3d704ce841f4af12cd9d7b98eb9330d Mon Sep 17 00:00:00 2001
From: Ankit Gupta <agupta@cyngn.com>
Date: Tue, 23 Feb 2016 11:14:59 -0800
Subject: Settings: disable wifi display from search indexing if disabled

If wifi display is disabled from the system property or from
the overlay file, disable its key indexing to stop appearing
it in search result. Also update the database version to reflect
the changes.
Also fix indexing for saved access point settings.

Issue-id: YAM-141

Change-Id: Ia3688e4b294ad67ab8029dd47d1067fd722cbff7
---
 src/com/android/settings/DisplaySettings.java            | 5 +++++
 src/com/android/settings/search/IndexDatabaseHelper.java | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 97353a8..2067887 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -820,6 +820,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     }
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
+
+                    if (!context.getResources().getBoolean(
+                                 com.android.internal.R.bool.config_enableWifiDisplay) &&
+                            (SystemProperties.getInt(FORCE_WIFI_DISPLAY_ENABLE, -1) != 1)) {
+                        result.add(KEY_WIFI_DISPLAY);
                     }
                     return result;
                 }
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 84a2922..fd7b762 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 118;
+    private static final int DATABASE_VERSION = 119;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";
-- 
cgit v1.1


From ba09a13d6bfc772cce24bfa86eb146ec3839292e Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Thu, 31 Mar 2016 16:10:26 -0700
Subject: Settings: Use correct LOW_POWER_MODE_TRIGGER default

* Low power mode was set to never enable automatically upstream in
  frameworks/base. We erroneously read from the
  config_lowBatteryWarningLevel resource for the default in change:
  821fd62d952e380a260fc6edae8919284785796a, which is usually 15.
* Reset this to 0 to align with the default value set in the provider.

REF: CYNGNOS-2274
Change-Id: Iec32f972fe6d67b258ee17eff603c4a67c99d783
---
 src/com/android/settings/fuelgauge/PowerUsageSummary.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 8f8a5a4..fda2a7e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -285,10 +285,8 @@ public class PowerUsageSummary extends PowerUsageBase
             case MENU_BATTERY_SAVER:
                 Resources res = getResources();
 
-                final int defWarnLevel = res.getInteger(
-                        com.android.internal.R.integer.config_lowBatteryWarningLevel);
                 final int value = Settings.Global.getInt(getContentResolver(),
-                        Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, defWarnLevel);
+                        Settings.Global.LOW_POWER_MODE_TRIGGER_LEVEL, 0);
 
                 int selectedIndex = -1;
                 final int[] intVals = res.getIntArray(R.array.battery_saver_trigger_values);
-- 
cgit v1.1


From d6098ce16fa4bc11b5a59d1228745357ffb3d72e Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Fri, 1 Apr 2016 11:05:02 -0700
Subject: DevelopmentSettings: Synchronize USB connection data state

* UsbModeChooserActivity now takes into account whether the user has
  unlocked USB data for the current composition mode, but the development
  settings USB mode chooser dialog does not. This patchset makes it
  aware.
* Assume if USB data hasn't been unlocked by the user, that USB charging
  mode is the current composition mode. This patch makes assumptions
  that the charging composition mode occurs at position 0 of the
  resources however. Any devices which have custom USB composition modes
  set in the overlay should be aware of this change.

REF: CYNGNOS-2322
Change-Id: I8789f23b1c58bfb6e23f4fcde2b2c10d5fd4adf2
---
 src/com/android/settings/DevelopmentSettings.java | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index d7a4145..10f650e 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1576,14 +1576,15 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         updateLogdSizeValues();
     }
 
-    private void updateUsbConfigurationValues() {
+    private void updateUsbConfigurationValues(boolean isUnlocked) {
         if (mUsbConfiguration != null) {
             UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE);
 
             String[] values = getResources().getStringArray(R.array.usb_configuration_values);
             String[] titles = getResources().getStringArray(R.array.usb_configuration_titles);
             int index = 0;
-            for (int i = 0; i < titles.length; i++) {
+            // Assume if !isUnlocked -> charging, which should be at index 0
+            for (int i = 0; i < titles.length && isUnlocked; i++) {
                 if (manager.isFunctionEnabled(values[i])) {
                     index = i;
                     break;
@@ -1598,10 +1599,11 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private void writeUsbConfigurationOption(Object newValue) {
         UsbManager manager = (UsbManager)getActivity().getSystemService(Context.USB_SERVICE);
         String function = newValue.toString();
-        manager.setCurrentFunction(function);
         if (function.equals("none")) {
+            manager.setCurrentFunction(null);
             manager.setUsbDataUnlocked(false);
         } else {
+            manager.setCurrentFunction(function);
             manager.setUsbDataUnlocked(true);
         }
     }
@@ -2263,7 +2265,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private BroadcastReceiver mUsbReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateUsbConfigurationValues();
+            boolean isUnlocked = intent.getBooleanExtra(UsbManager.USB_DATA_UNLOCKED, false);
+            updateUsbConfigurationValues(isUnlocked);
         }
     };
 
-- 
cgit v1.1


From ecb148707eb376fc5dc60b3626dec34ae847ecc8 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 4 Apr 2016 22:35:43 -0700
Subject: Revert "Settings: disable wifi display from search indexing if
 disabled"

 * Breaks the build. Missing variables, bad syntax.

DONUTS-1234

This reverts commit 8b1fe7d8b3d704ce841f4af12cd9d7b98eb9330d.

Change-Id: Idf1a5a9580d85148d117893568515562bea31af2
---
 src/com/android/settings/DisplaySettings.java            | 5 -----
 src/com/android/settings/search/IndexDatabaseHelper.java | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 2067887..97353a8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -820,11 +820,6 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     }
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
-
-                    if (!context.getResources().getBoolean(
-                                 com.android.internal.R.bool.config_enableWifiDisplay) &&
-                            (SystemProperties.getInt(FORCE_WIFI_DISPLAY_ENABLE, -1) != 1)) {
-                        result.add(KEY_WIFI_DISPLAY);
                     }
                     return result;
                 }
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index fd7b762..84a2922 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 119;
+    private static final int DATABASE_VERSION = 118;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";
-- 
cgit v1.1

-- 
cgit v1.1


From d1c26ab6a6d484e769685741251f7d870593981a Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Wed, 6 Apr 2016 01:18:23 +0300
Subject: Automatic translation import

Change-Id: I3d5131973925152ad0d2ebd21d4c57f03c5d1cd2
---
 res/values-af/cm_strings.xml      |    1 +
 res/values-am/cm_strings.xml      |    1 +
 res/values-ar/cm_strings.xml      |    1 +
 res/values-as-rIN/cm_strings.xml  |    1 +
 res/values-ast-rES/cm_strings.xml |    1 +
 res/values-az-rAZ/cm_strings.xml  |    1 +
 res/values-be/cm_strings.xml      |    1 +
 res/values-bg/cm_strings.xml      |   22 +-
 res/values-bn-rBD/cm_strings.xml  |    1 +
 res/values-br-rFR/cm_strings.xml  |    1 +
 res/values-ca/cm_strings.xml      |   20 +
 res/values-cs/cm_strings.xml      |   20 +
 res/values-cy/cm_strings.xml      |    1 +
 res/values-da/cm_strings.xml      |   55 +-
 res/values-de/cm_strings.xml      |   11 +
 res/values-el/cm_strings.xml      |   20 +
 res/values-en-rAU/cm_strings.xml  |    1 +
 res/values-en-rGB/cm_strings.xml  |    1 +
 res/values-en-rIN/cm_strings.xml  |    1 +
 res/values-en-rPT/cm_strings.xml  |    1 +
 res/values-eo/cm_strings.xml      |    1 +
 res/values-es-rMX/cm_strings.xml  |    1 +
 res/values-es-rUS/cm_strings.xml  |    1 +
 res/values-es/cm_strings.xml      |    1 +
 res/values-et-rEE/cm_strings.xml  |    1 +
 res/values-eu-rES/cm_strings.xml  |    5 +
 res/values-fa/cm_strings.xml      |    1 +
 res/values-fi/cm_strings.xml      |   20 +
 res/values-fil-rPH/cm_strings.xml |    1 +
 res/values-fr-rCA/cm_strings.xml  |    1 +
 res/values-fr/cm_strings.xml      |    1 +
 res/values-frp-rIT/arrays.xml     |  156 ++
 res/values-frp-rIT/cm_strings.xml |  183 +++
 res/values-frp-rIT/strings.xml    | 3100 +++++++++++++++++++++++++++++++++++++
 res/values-fy-rNL/cm_strings.xml  |    1 +
 res/values-gd-rGB/cm_strings.xml  |    1 +
 res/values-gl-rES/cm_strings.xml  |    1 +
 res/values-gu-rIN/cm_strings.xml  |    3 +
 res/values-hi/cm_strings.xml      |    1 +
 res/values-hr/cm_strings.xml      |    1 +
 res/values-hu/cm_strings.xml      |    3 +
 res/values-hy-rAM/cm_strings.xml  |    1 +
 res/values-in/cm_strings.xml      |    1 +
 res/values-is-rIS/cm_strings.xml  |    1 +
 res/values-it/cm_strings.xml      |   20 +
 res/values-iw/cm_strings.xml      |  110 +-
 res/values-ja/cm_strings.xml      |    1 +
 res/values-ka-rGE/cm_strings.xml  |    1 +
 res/values-kk-rKZ/cm_strings.xml  |    1 +
 res/values-km-rKH/cm_strings.xml  |    1 +
 res/values-kn-rIN/cm_strings.xml  |    1 +
 res/values-ko/cm_strings.xml      |    1 +
 res/values-ku/cm_strings.xml      |    1 +
 res/values-ky-rKG/cm_strings.xml  |    1 +
 res/values-lb/cm_strings.xml      |    1 +
 res/values-lo-rLA/cm_strings.xml  |    1 +
 res/values-lt/cm_strings.xml      |    1 +
 res/values-lv/cm_strings.xml      |    1 +
 res/values-mk-rMK/cm_strings.xml  |    1 +
 res/values-ml-rIN/cm_strings.xml  |    1 +
 res/values-mn-rMN/cm_strings.xml  |    1 +
 res/values-mr-rIN/cm_strings.xml  |    1 +
 res/values-ms-rMY/cm_strings.xml  |    1 +
 res/values-my-rMM/cm_strings.xml  |    1 +
 res/values-nb/cm_strings.xml      |    1 +
 res/values-ne-rNP/cm_strings.xml  |    1 +
 res/values-nl/cm_strings.xml      |    4 +
 res/values-oc-rFR/cm_strings.xml  |    1 +
 res/values-or-rIN/cm_strings.xml  |    1 +
 res/values-pa-rIN/cm_strings.xml  |    1 +
 res/values-pl/cm_strings.xml      |    5 +
 res/values-pt-rBR/cm_strings.xml  |  347 +++--
 res/values-pt-rPT/cm_strings.xml  |   22 +-
 res/values-rm/cm_strings.xml      |    1 +
 res/values-ro/cm_strings.xml      |    2 +
 res/values-ru/cm_strings.xml      |    1 +
 res/values-si-rLK/cm_strings.xml  |    1 +
 res/values-sk/cm_strings.xml      |    1 +
 res/values-sl/cm_strings.xml      |   20 +
 res/values-sq-rAL/cm_strings.xml  |    1 +
 res/values-sr/cm_strings.xml      |    5 +
 res/values-sv/cm_strings.xml      |    1 +
 res/values-sw/cm_strings.xml      |    1 +
 res/values-ta-rIN/cm_strings.xml  |    1 +
 res/values-te-rIN/cm_strings.xml  |    1 +
 res/values-th/cm_strings.xml      |    1 +
 res/values-tr/cm_strings.xml      |    1 +
 res/values-ug/cm_strings.xml      |    1 +
 res/values-uk/cm_strings.xml      |    1 +
 res/values-ur-rPK/cm_strings.xml  |    1 +
 res/values-uz-rUZ/cm_strings.xml  |    1 +
 res/values-vi/cm_strings.xml      |    1 +
 res/values-zh-rCN/cm_strings.xml  |   20 +
 res/values-zh-rHK/cm_strings.xml  |    1 +
 res/values-zh-rTW/cm_strings.xml  |    1 +
 res/values-zu/cm_strings.xml      |    1 +
 96 files changed, 4027 insertions(+), 219 deletions(-)
 create mode 100644 res/values-frp-rIT/arrays.xml
 create mode 100644 res/values-frp-rIT/cm_strings.xml
 create mode 100644 res/values-frp-rIT/strings.xml

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9a40093..cd878ec 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -999,4 +999,5 @@
   <string name="restrict_app_cellular_title">Deaktiveer toep sellulêre data gebruik</string>
   <string name="restrict_app_cellular_summary">Voorkom toep om sellulêre data konneksie te gebruik</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 6cab1d7..feac856 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <string name="restrict_app_cellular_title">تعطيل الاستخدام الخلوي للتطبيق</string>
   <string name="restrict_app_cellular_summary">منع التطبيق من استخدام اتصال البيانات الخلوي</string>
   <string name="privacy_guard_internet_category">الإنترنت</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 24ae35c..833beda 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">ডক AC ত চাৰ্জিং কৰি আছে</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ডক USB ত চাৰ্জিং কৰি আছে</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 81da5e9..ccd72bc 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -761,4 +761,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 478267d..aecc7c4 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -694,4 +694,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 5396923..3380d83 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -977,4 +977,5 @@
   <string name="battery_info_status_charging_dock_ac">Зарадка ад адаптара дак-станцыі</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зарадка праз USB дак-станцыю</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index a25e61c..40cde4a 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -257,7 +257,7 @@
   <string name="notification_light_zen_mode">Индикации в режим \"Не безпокойте\"</string>
   <string name="notification_light_use_multiple_leds">Множество светодиоди</string>
   <string name="keywords_lights_brightness_level">Слаба светодиодна яркост</string>
-  <string name="notification_light_automagic">Автоматичен избор на цвятове</string>
+  <string name="notification_light_automagic">Автоматичен избор на цветове</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Настройки на светлината</string>
   <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Разрешени <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_ignored_count">Не разрешени <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_both_count">Разрешени <xliff:g id="count">%1$s </xliff:g>, не разрешени <xliff:g id="count">%2$s </xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Изключване чрез оптимизация на батерията</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Потребителски приложения</string>
   <string name="app_ops_show_system_apps">Системни приложения</string>
@@ -999,4 +1000,23 @@
   <string name="restrict_app_cellular_title">Забрани на проложението да използва мобилни данни</string>
   <string name="restrict_app_cellular_summary">Забрани предаването на данните от приложенията през мобилни мрежи</string>
   <string name="privacy_guard_internet_category">Интернет</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Прогноза за времето</string>
+  <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
+  <string name="weather_settings_button">Настройки на доставчика</string>
+  <string name="background_data_access">Достъп до данни на заден план</string>
+  <string name="allow_background_both">Надвишени мобилни данни &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Само над Wi\u2011Fi</string>
+  <string name="allow_background_none">Без достъп</string>
+  <string name="mobile_data_alert">Предупреждение за мобилни данни</string>
+  <string name="mobile_data_alert_summary">Уведоми, когато приложението използва значително количество данни</string>
+  <string name="data_usage_menu_enable_data_alerts">Разреши предупреждения за използване на данни</string>
+  <string name="data_usage_menu_disable_data_alerts">Забрани предупреждения за използване на данни</string>
+  <string name="data_usage_menu_reset_stats">Статистиката на батерията ще бъде нулирана</string>
+  <string name="reset_data_stats_msg">Това ще изчисти всички минали и настоящи данни за проследяване</string>
+  <string name="reset_stats_confirm">Потвърдете</string>
+  <string name="restrict_cellular_access_title">Ограничи достъпа до мобилни данни</string>
+  <string name="restrict_cellular_access_summary">Забрани достъпа до данни на клетъчни мрежи</string>
+  <string name="restrict_cellular_access_dialog_title">Да бъде ли ограничен достъпа до мобилни данни?</string>
+  <string name="restrict_cellular_access_dialog_summary">Тази функция може да спре работата на приложение което зависи от достъп до интернет когато са налични само мобилни данни\n\n Може да намерите по-подходящи настройки в настройките на приложението.</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 93b20f0..bca10e7 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -558,4 +558,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 3d3bd13..9db75e5 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Permès <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Denegat <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permès <xliff:g id="count">%1$s</xliff:g>, denegat <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Inhabilitat per optimitzar la bateria</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Mostra les aplicacions de l\'usuari</string>
   <string name="app_ops_show_system_apps">Mostra les aplicacions integrades</string>
@@ -999,4 +1000,23 @@
   <string name="restrict_app_cellular_title">Deshabilita l\'ús de dades mòbils per part de l\'aplicació</string>
   <string name="restrict_app_cellular_summary">Impedeix que l\'aplicació utilitzi la connexió de dades mòbils</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">El temps</string>
+  <string name="weather_settings_no_services_prompt">No hi ha cap servei de proveïdor de temps instal·lat</string>
+  <string name="weather_settings_button">Configuració del proveïdor</string>
+  <string name="background_data_access">Accés a les dades en segon pla</string>
+  <string name="allow_background_both">Sobre dades mòbils &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Només sobre Wi\u2011Fi</string>
+  <string name="allow_background_none">Sense accés</string>
+  <string name="mobile_data_alert">Alerta de dades mòbils</string>
+  <string name="mobile_data_alert_summary">Avisa quan l\'aplicació utilitzi una quantitat significativa de dades</string>
+  <string name="data_usage_menu_enable_data_alerts">Habilita els avisos d\'ús de dades</string>
+  <string name="data_usage_menu_disable_data_alerts">Deshabilita els avisos d\'ús de dades</string>
+  <string name="data_usage_menu_reset_stats">Reinicia les estadístiques de dades</string>
+  <string name="reset_data_stats_msg">Així esborrarà totes les dades d\'informació de seguiment passades i actuals</string>
+  <string name="reset_stats_confirm">Confirma</string>
+  <string name="restrict_cellular_access_title">Restringeix l\'accés a les dades mòbils</string>
+  <string name="restrict_cellular_access_summary">Deshabilita l\'accés a les dades en xarxes mòbils</string>
+  <string name="restrict_cellular_access_dialog_title">Vols restringir l\'accés a les dades mòbils?</string>
+  <string name="restrict_cellular_access_dialog_summary">Aquesta característica podria provocar que una aplicació que depèn de l\'accés a la xarxa deixi de funcionar quan només les xarxes mòbils estiguin disponibles.\n\nPots trobar els controls d\'ús de dades més adequats a la configuració disponible dins de l\'aplicació.</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index facad1c..0169b98 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -431,6 +431,7 @@
   <string name="app_ops_allowed_count">Povoleno <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Zakázáno <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Povoleno <xliff:g id="count">%1$s</xliff:g>, zakázáno <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Zakázáno optimalizací baterie</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Zobrazit uživatelské aplikace</string>
   <string name="app_ops_show_system_apps">Zobrazit systémové aplikace</string>
@@ -999,4 +1000,23 @@
   <string name="restrict_app_cellular_title">Zakázat aplikaci používat mobilní data</string>
   <string name="restrict_app_cellular_summary">Zabrání aplikaci využívat datové připojení mobilních dat</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Počasí</string>
+  <string name="weather_settings_no_services_prompt">Nejsou nainstalovány žádné služby poskytovatele počasí</string>
+  <string name="weather_settings_button">Nastavení poskytovatele</string>
+  <string name="background_data_access">Přístup k datům na pozadí</string>
+  <string name="allow_background_both">Přes mobilní data a Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Pouze přes Wi\u2011Fi</string>
+  <string name="allow_background_none">Bez přístupu</string>
+  <string name="mobile_data_alert">Upozornění mobilních dat</string>
+  <string name="mobile_data_alert_summary">Upozornit, pokud aplikace využije veliké množství přenášených dat</string>
+  <string name="data_usage_menu_enable_data_alerts">Povolit upozornění využití dat</string>
+  <string name="data_usage_menu_disable_data_alerts">Zakázat upozornění využití dat</string>
+  <string name="data_usage_menu_reset_stats">Vyčistit statistiku přenesených dat</string>
+  <string name="reset_data_stats_msg">Tímto dojde k vymazání všech minulých i aktuálních sledovacích informací</string>
+  <string name="reset_stats_confirm">Potvrdit</string>
+  <string name="restrict_cellular_access_title">Omezit přístup k mobilním datům</string>
+  <string name="restrict_cellular_access_summary">Zakázat přístup k datům na mobilních sítích</string>
+  <string name="restrict_cellular_access_dialog_title">Omezit přístup k mobilním datům?</string>
+  <string name="restrict_cellular_access_dialog_summary">Tato vlastnost může způsobit zastavení funkčnosti některých aplikací, které jsou závislé na přístupu k datům a zařízení je právě připojeno pouze k mobilní datové síti.\n\nVhodnějsí omezení využití dat je možné nalézt v ovládání používání datových sítí v nastavení aplikace.</string>
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index da615f6..b257150 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -48,6 +48,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Enhedens navn</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">CyanogenMod API niveau</string>
   <string name="mod_api_level_default">Ukendt</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Kørselsdato</string>
@@ -104,6 +105,7 @@
   <string name="rename_dialog_hint">Indtast profilnavn</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Nulstil</string>
+  <string name="profile_reset_message">Slet egne profiler samt app-grupper og nulstil dem til standard?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Fjern denne app?</string>
   <!-- Profile network mode -->
@@ -163,6 +165,7 @@
   <string name="toggleData">Dataforbindelse</string>
   <string name="toggleSync">Auto-synk. data</string>
   <string name="toggle2g3g4g">Foretrukken netværkstype</string>
+  <string name="toggle2g3g4g_msim">Foretrukken netværkstype (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi-regionskode</string>
@@ -251,8 +254,10 @@
   <string name="notification_light_missed_call_title">Ubesvaret opkald</string>
   <string name="notification_light_voicemail_title">Telefonsvarer</string>
   <string name="notification_light_screen_on">Lys med skærmen tændt</string>
+  <string name="notification_light_zen_mode">Lys i tilstanden Vil ikke forstyrres</string>
   <string name="notification_light_use_multiple_leds">Flere LED\'er</string>
   <string name="keywords_lights_brightness_level">dæmp led lysstyrke</string>
+  <string name="notification_light_automagic">Vælg farver automatisk</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Lysindstillinger</string>
   <string name="led_notification_text">LED-lys aktiveret via indstillinger</string>
@@ -325,6 +330,12 @@
   <string name="app_ops_summaries_toast_window">Vis toastbeskeder</string>
   <string name="app_ops_summaries_project_media">projekt medie</string>
   <string name="app_ops_summaries_activate_vpn">aktiver VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">skriv baggrund</string>
+  <string name="app_ops_summaries_assist_structure">assistance struktur</string>
+  <string name="app_ops_summaries_assist_screenshot">assistance skærmbillede</string>
+  <string name="app_ops_summaries_read_phone_state">læs telefon status</string>
+  <string name="app_ops_summaries_add_voicemail">tilføj voicemail</string>
+  <string name="app_ops_summaries_use_sip">brug SIP</string>
   <string name="app_ops_summaries_make_call">foretag opkald</string>
   <string name="app_ops_summaries_use_fingerprint">brug fingeraftryk</string>
   <string name="app_ops_summaries_use_body_sensors">brug krops sensor</string>
@@ -335,11 +346,13 @@
   <string name="app_ops_summaries_turn_screen_on">tænd skærmen</string>
   <string name="app_ops_summaries_toggle_wifi">Wi-Fi til/fra</string>
   <string name="app_ops_summaries_toggle_bluetooth">bluetooth til/fra</string>
+  <string name="app_ops_summaries_start_at_boot">start ved opstart</string>
   <string name="app_ops_summaries_toggle_nfc">NFC til/fra</string>
   <string name="app_ops_summaries_toggle_mobile_data">slå mobildata til/fra</string>
   <string name="app_ops_summaries_superuser">root-adgang</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Grov placering</string>
+  <string name="app_ops_labels_fine_location">Fin placering</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrér</string>
   <string name="app_ops_labels_read_contacts">Læs kontaktpersoner</string>
@@ -377,15 +390,22 @@
   <string name="app_ops_labels_notification_volume">Systemlydstyrke</string>
   <string name="app_ops_labels_bluetooth_volume">Lydstyrke for Bluetooth</string>
   <string name="app_ops_labels_keep_awake">Hold vågen</string>
+  <string name="app_ops_labels_monitor_location">Overvåg placering</string>
+  <string name="app_ops_labels_get_usage_stats">Få brugsstatistik</string>
   <string name="app_ops_labels_mute_unmute_microphone">Mikrofon til/fra</string>
   <string name="app_ops_labels_toast_window">Vis toastbeskeder</string>
   <string name="app_ops_labels_project_media">Projekt medie</string>
   <string name="app_ops_labels_activate_vpn">Aktiver VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Skriv baggrund</string>
+  <string name="app_ops_labels_assist_structure">Assistance struktur</string>
+  <string name="app_ops_labels_assist_screenshot">Assistance skærmbillede</string>
+  <string name="app_ops_labels_read_phone_state">Læs telefon status</string>
   <string name="app_ops_labels_add_voicemail">Tilføj voicemail</string>
   <string name="app_ops_labels_use_sip">Brug SIP</string>
   <string name="app_ops_labels_make_call">Foretag opkald</string>
   <string name="app_ops_labels_use_fingerprint">Brug fingeraftryk</string>
   <string name="app_ops_labels_use_body_sensors">Brug kropssensorer</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Læs mobil-transmissioner</string>
   <string name="app_ops_labels_mock_location">Immitér placering</string>
   <string name="app_ops_labels_read_external_storage">Læs eksternt lager</string>
   <string name="app_ops_labels_write_external_storage">Skriv til eksternt lager</string>
@@ -405,6 +425,7 @@
   <string name="app_ops_allowed_count">Tilladt <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Afvist <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Tilladt <xliff:g id="count">%1$s</xliff:g>, afvist <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Deaktiveret via batterioptimering</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Vis bruger-apps</string>
   <string name="app_ops_show_system_apps">Vis indbyggede apps</string>
@@ -689,6 +710,8 @@
   <string name="status_bar_battery_percentage_text_inside">Inde i ikonet</string>
   <string name="status_bar_battery_percentage_text_next">Ved siden af ikonet</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Statuslinje-ikoner</string>
+  <string name="status_bar_icons_summary">Kontroller hvilke statuslinje-ikoner der vises</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokér berøringsevents for bevægelser</string>
   <string name="edge_gesture_service_summary">Send ikke berøringsevents for navigations- og statuslinjebevægelser til apps</string>
@@ -725,6 +748,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Vis musikvisualisator</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Deaktiveret via hurtig-indstillinger</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Tryk for at aktivere skærmlåsen</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Skærmlås aktiveret!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Grænse for strømspare</string>
   <string name="battery_saver_summary">Reducere ydeevnen og begrænser baggrundsdata</string>
@@ -734,6 +760,7 @@
   <string name="autoperf_summary">Vælg automatisk en passende batteritilstand for forskellige apps</string>
   <string name="perf_profile_title">Batteri tilstand</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Apps startet under opstart</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Meddelelseslyd</string>
   <!-- Advanced reboot options -->
@@ -857,9 +884,16 @@
   <string name="advanced">Avanceret</string>
   <string name="link_volume_option_title">Forbind ringe- og meddelelseslydstyrke</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP telefonnummer</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Identisk APN</string>
+  <string name="duplicate_apn_error_message">APN\'en eksisterer allerede. Kassere eller ændre parametrene.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> er <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">deaktiveret</string>
   <string name="sim_missing">mangler eller defekt</string>
+  <string name="sim_enabler_need_disable_sim">SIM-kortet vil blive deaktiveret. Vil du fortsætte?</string>
+  <string name="sim_enabler_will_disable_sim_title">Advarsel</string>
+  <string name="sim_enabler_need_switch_data_service">Dette SIM-kort deaktiveres og SIM-<xliff:g id="slotid">%1$s</xliff:g> vil blive anvendt til data-tjenester. Vil du fortsætte?</string>
   <string name="sim_enabler_airplane_on">Kan ikke udføre operationen, mens flytilstand er slået til.</string>
   <string name="sim_enabler_in_call">Kan ikke udføre handlingen under igangværende opkald.</string>
   <string name="sim_enabler_both_inactive">Kan ikke deaktivere alle SIM-kort</string>
@@ -884,6 +918,7 @@
   <string name="zen_mode_summary_events">begivenheder</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">valgte beskeder</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hoved: %1$s W/kg</string>
@@ -916,17 +951,22 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Andet</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tidsudløb for Wi\u2011Fi hotspot</string>
   <string name="hotstpot_inactivity_timeout_never">Aldrig</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 minut</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minutter</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minutter</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Ingen tidsgrænse for Mobil Wi\u2011Fi hotspot</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Tidsgrænse for Mobil Wi\u2011Fi hotspot udløber efter <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
-  <string name="live_lock_screen_title">Animeret låseskærm</string>
+  <string name="live_lock_screen_title">Levende skærmlås</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Aktiverer og konfigurer Levende skærmlåse</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Indstillinger</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">For at se tilgængelige Levende skærmlåse, slå Levende skærmlåse til.</string>
   <string name="interruptions_ignore_while_media_title">Undgå lyddæmpning</string>
   <string name="interruptions_ignore_while_media_summary">Reducér ikke lydstyrken, når en meddelelse modtages</string>
   <!-- CM Legal -->
@@ -941,4 +981,17 @@
   <string name="battery_info_status_charging_dock_ac">Oplader på dock AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Oplader via dock USB</string>
+  <string name="restrict_app_wlan_title">Deaktivér brugen af Wi\u2011Fi for appen</string>
+  <string name="restrict_app_wlan_summary">Forhindre, at appen bruger Wi\u2011Fi forbindelsen</string>
+  <string name="restrict_app_cellular_title">Deaktivér brugen af mobildata for appen</string>
+  <string name="restrict_app_cellular_summary">Forhindre, at appen bruger mobildataforbindelsen</string>
+  <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Vejr</string>
+  <string name="weather_settings_button">Udbyderindstillinger</string>
+  <string name="allow_background_none">Ingen adgang</string>
+  <string name="mobile_data_alert">Mobildata alarm</string>
+  <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
+  <string name="reset_stats_confirm">Bekræft</string>
+  <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index c5991fa..34c787b 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -862,6 +862,7 @@
   <string name="menu_hidden_apps_delete">Zurücksetzen</string>
   <string name="menu_hidden_apps_reset_lock">Sperrmuster zurücksetzen</string>
   <string name="protected_apps">Geschützte Apps</string>
+  <string name="protected_apps_summary">Verwalten Sie, welche Apps hinter einer sicheren Sperre verborgen sind.</string>
   <string name="saving_protected_components">Geschützte Komponenten werden gespeichert\u2026</string>
   <string name="pa_login_username_hint">Benutzername (E-Mail)</string>
   <string name="pa_login_password_hint">Passwort</string>
@@ -993,5 +994,15 @@
   <string name="battery_info_status_charging_dock_ac">Laden über Ladedock</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laden über USB-Dock</string>
+  <string name="restrict_app_wlan_title">WLAN-Nutzung verhindern</string>
+  <string name="restrict_app_wlan_summary">Verhindert die Nutzung von WLAN durch die App</string>
+  <string name="restrict_app_cellular_title">Mobile Daten-Nutzung verhindern</string>
+  <string name="restrict_app_cellular_summary">Verhindert die Nutzung mobiler Daten durch die App</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Wetter</string>
+  <string name="weather_settings_no_services_prompt">Keine Wetteranbieterdienste installiert</string>
+  <string name="weather_settings_button">Anbieter-Einstellungen</string>
+  <string name="allow_background_wlan">Nur über WLAN</string>
+  <string name="reset_stats_confirm">Bestätigen</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index fa8987e..aa46de4 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Επιτράπηκε <xliff:g id="count" example="2 φορές">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Δεν επιτράπηκε <xliff:g id="count" example="2 φορές">%s</xliff:g></string>
   <string name="app_ops_both_count">Επιτράπηκε <xliff:g id="count">%1$s</xliff:g>, δεν επιτράπηκε <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Απενεργοποιήθηκε από τη βελτιστοποίηση μπαταρίας</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Εμφάνιση εφαρμογών χρήστη</string>
   <string name="app_ops_show_system_apps">Εμφάνιση ενσωματωμένων εφαρμογών</string>
@@ -1003,4 +1004,23 @@
   <string name="restrict_app_cellular_title">Απενεργοποίηση χρήσης δεδομένων για την εφαρμογή</string>
   <string name="restrict_app_cellular_summary">Αποτροπή εφαρμογής από τη χρήση δεδομένων κινητής τηλεφωνίας</string>
   <string name="privacy_guard_internet_category">Διαδίκτυο</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Καιρός</string>
+  <string name="weather_settings_no_services_prompt">Δεν υπάρχουν εγκατεστημένοι πάροχοι καιρού</string>
+  <string name="weather_settings_button">Ρυθμίσεις παρόχου</string>
+  <string name="background_data_access">Πρόσβαση δεδομένων στο παρασκήνιο</string>
+  <string name="allow_background_both">Μέσω δεδομένων κινητής τηλεφωνίας &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Μόνο μέσω Wi\u2011Fi</string>
+  <string name="allow_background_none">Χωρίς πρόσβαση</string>
+  <string name="mobile_data_alert">Προειδοποίηση δεδομένων κινητής τηλεφωνίας</string>
+  <string name="mobile_data_alert_summary">Ειδοποίηση όταν η εφαρμογή χρησιμοποιεί ένα σημαντικό ποσό δεδομένων</string>
+  <string name="data_usage_menu_enable_data_alerts">Ενεργοποίηση των προειδοποιήσεων χρήσης δεδομένων</string>
+  <string name="data_usage_menu_disable_data_alerts">Απενεργοποίηση των προειδοποιήσεων χρήσης δεδομένων</string>
+  <string name="data_usage_menu_reset_stats">Επαναφορά στατιστικών δεδομένων</string>
+  <string name="reset_data_stats_msg">Αυτό θα διαγράψει όλες τις καταγεγραμμένες πληροφορίες χρήσης δεδομένων στη συσκευή σας</string>
+  <string name="reset_stats_confirm">Επιβεβαίωση</string>
+  <string name="restrict_cellular_access_title">Περιορισμός πρόσβασης δεδομένων</string>
+  <string name="restrict_cellular_access_summary">Απενεργοποίηση της πρόσβασης δεδομένων σε δίκτυα κινητής τηλεφωνίας</string>
+  <string name="restrict_cellular_access_dialog_title">Περιορισμός πρόσβασης δεδομένων;</string>
+  <string name="restrict_cellular_access_dialog_summary">Αυτή η δυνατότητα μπορεί να προκαλέσει μια εφαρμογή που εξαρτάται από την πρόσβαση στο δίκτυο να σταματήσει να λειτουργεί όταν υπάρχουν μόνο δίκτυα κινητής τηλεφωνίας διαθέσιμα.\n\nΜπορείτε να βρείτε πιο κατάλληλους ελέγχους της χρήσης δεδομένων στις ρυθμίσεις που είναι διαθέσιμες μέσα από την εφαρμογή.</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index d45c2a6..27d46c2 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -765,4 +765,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index a999648..c84da7d 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -897,4 +897,5 @@
   <string name="battery_info_status_charging_dock_ac">Charging on dock AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 86685f9..77f42ee 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -832,4 +832,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index b9d686a..2ddbf25 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -294,4 +294,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 1b36f48..9874cf8 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">Carga en estado AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 435b230..5c4680e 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -999,4 +999,5 @@
   <string name="restrict_app_cellular_title">Desactivar el uso de la red celular</string>
   <string name="restrict_app_cellular_summary">Prevenir que la aplicación utilice conexión de datos</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 0c48dd0..53ae0fa 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -872,4 +872,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="battery_info_status_charging_dock_ac">Laen doki AC-ga</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laen üle doki USB</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 4fc6130..95ae2cf 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> baimenduta</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> ukatuta</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> baimenduta, <xliff:g id="count">%2$s</xliff:g> ukatuta</string>
+  <string name="app_ops_disabled_by_optimization">Bateria optimizazioak desgaituta</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Erakutsi erabiltzailearen aplikazioak</string>
   <string name="app_ops_show_system_apps">Erakutsi sistemaren aplikazioak</string>
@@ -999,4 +1000,8 @@
   <string name="restrict_app_cellular_title">Desgaitu aplikazioaren datu mugikorren erabilera</string>
   <string name="restrict_app_cellular_summary">Eragotzi aplikazioari datu mugikorren konexioa erabiltzea</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Eguraldia</string>
+  <string name="weather_settings_no_services_prompt">Ez da eguraldi hornitzailerik instalatu</string>
+  <string name="weather_settings_button">Hornitzailearen ezarpenak</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index cd30416..01b1e06 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -880,4 +880,5 @@
   <string name="battery_info_status_charging_dock_ac">در حال شارژ در داک AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">در حال شارژ در داک یواس‌بی</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 28dbd00..cb7c335 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Sallittu <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Estetty <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Sallittu <xliff:g id="count">%1$s</xliff:g>, estetty <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Poistettu käytöstä akun optimoimiseksi</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Näytä käyttäjän sovellukset</string>
   <string name="app_ops_show_system_apps">Näytä järjestelmäsovellukset</string>
@@ -999,4 +1000,23 @@
   <string name="restrict_app_cellular_title">Estä sovelluksen mobiilidatan käyttö</string>
   <string name="restrict_app_cellular_summary">Estä sovellusta käyttämästä mobiilidatayhteyttä</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Sää</string>
+  <string name="weather_settings_no_services_prompt">Säätarjoajapalveluita ei asennettu</string>
+  <string name="weather_settings_button">Tarjoajan asetukset</string>
+  <string name="background_data_access">Taustatiedonsiirron käyttö</string>
+  <string name="allow_background_both">Mobiiliverkon &amp; Wi\u2011Fin yli</string>
+  <string name="allow_background_wlan">Vain Wi\u2011Fin yli</string>
+  <string name="allow_background_none">Ei käyttöoikeutta</string>
+  <string name="mobile_data_alert">Mobiilidatan hälytys</string>
+  <string name="mobile_data_alert_summary">Ilmoita kun sovellus käyttää huomattavan määrän dataa</string>
+  <string name="data_usage_menu_enable_data_alerts">Ota datan käytön hälytykset käyttöön</string>
+  <string name="data_usage_menu_disable_data_alerts">Poista datan käytön hälytykset käytöstä</string>
+  <string name="data_usage_menu_reset_stats">Nollaa datan käytön tilastot</string>
+  <string name="reset_data_stats_msg">Tämä poistaa aiemmat ja nykyiset datan seurantatiedot</string>
+  <string name="reset_stats_confirm">Vahvista</string>
+  <string name="restrict_cellular_access_title">Rajoita mobiilidatan käyttöä</string>
+  <string name="restrict_cellular_access_summary">Poista datan käyttö mobiiliverkoissa</string>
+  <string name="restrict_cellular_access_dialog_title">Rajoita mobiilidatan käyttöä?</string>
+  <string name="restrict_cellular_access_dialog_summary">Tämä ominaisuus voi aiheuttaa verkkoyhteydestä riippuvaisen sovelluksen toiminnan lakkaamisen kun vain mobiilidataverkko on käytettävissä.\n\nLöydät lisää tiedonsiirron hallintaominaisuuksia sovelluksesta.</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 5b82dfb..a3ebbe5 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -993,4 +993,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="battery_info_status_charging_dock_ac">Chargement sur secteur du dock</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Chargement par l\'USB du dock</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-frp-rIT/arrays.xml b/res/values-frp-rIT/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-frp-rIT/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 0000000..82cf3b1
--- /dev/null
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2016 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">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Launch Dev Tools -->
+  <!-- Development shortcut -->
+  <!-- Setting checkbox title for root access -->
+  <!-- NFC PreferenceCategory title -->
+  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, Device model -->
+  <!-- About phone screen, Device name -->
+  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, build date -->
+  <!-- CM Updater -->
+  <!-- Settings switch for updating Cyanogen recovery -->
+  <!-- Themes Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Sound settings screen -->
+  <!-- Profiles settings  -->
+  <!-- Profile mode options. -->
+  <!-- Add Profile -->
+  <!-- Rename Dialog  -->
+  <!-- Reset Profiles -->
+  <!-- Delete confimation messages -->
+  <!-- Profile network mode -->
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <!-- Menu item for managing profiles -->
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <!-- Profile Settings sound modes labels -->
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <!-- Title for application group setting screen -->
+  <!-- Add application dialog box title -->
+  <!-- Profiles - system settings -->
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <!-- Wi-Fi region code -->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Profiles -->
+  <!-- Title for application group setting screen -->
+  <!-- Navigation Bar -->
+  <!-- Notification light dialogs -->
+  <!-- Values for the notification light pulse spinners -->
+  <!-- Battery light settings -->
+  <!-- Lights settings screen, notification light settings -->
+  <!-- Lights settings, LED notification -->
+  <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- App ops permissions -->
+  <!-- App ops detail -->
+  <!-- App ops menu options -->
+  <!-- Hostname setting -->
+  <!-- Backlight brightness settings screen -->
+  <!-- Sunlight readability enhancement screen -->
+  <!-- Color enhancement settings screen -->
+  <!-- Key backlight -->
+  <!-- Gesture Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Power menu -->
+  <!-- Buttons - Enable navbar -->
+  <!-- tap-to-sleep -->
+  <!-- Proximity wake -->
+  <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <!-- Font size sample text. This needs to be a very short string, as it is shown in
+    multiple font sizes in a limited amount of space. -->
+  <!-- Volume settings - Volume adjustment sound -->
+  <!-- Hardware tunables - Vibrator intensity -->
+  <!-- Hardware tunables - Color calibration -->
+  <!-- Hardware tunables - Gamma calibration -->
+  <!-- used if no name provided by overlay -->
+  <!-- Launch music player when headset is connected -->
+  <!-- WiFi auto-configure priorities -->
+  <!-- Display : Rotation  -->
+  <!-- Display settings.  Screen color. -->
+  <!-- LiveDisplay -->
+  <!-- Whether to display IME switcher notifcation -->
+  <!-- Heads up -->
+  <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <!-- High touch sensitivity -->
+  <!-- Display & Lights screen, setting options for LCD density -->
+  <!-- Stylus Icon -->
+  <!-- Stylus Gestures -->
+  <!-- Gestures Options -->
+  <!-- Stylus gestures -->
+  <!-- Touchscreen hovering -->
+  <!-- Increasing ring tone volume -->
+  <!-- LTO download data over wi-fi only -->
+  <!-- Category title for Charging sounds (Power state change) specific Settings.
+         [CHAR LIMIT=40] -->
+  <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <!-- Sound settings, charging sounds label for ringtone == none -->
+  <!-- Status bar -->
+  <!-- Status bar - Clock -->
+  <!-- Status bar - Battery -->
+  <!-- Status bar - Battery percentage -->
+  <!-- Status bar - icon blacklist -->
+  <!-- EdgeGesture service -->
+  <!-- Keep screen on strings -->
+  <!-- Privacy Settings Header item -->
+  <!-- Privacy Guard -->
+  <!-- Sizes for pattern lockscreen -->
+  <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <!-- Whether the keyguard will directly pass to password entry -->
+  <!-- Whether the keyguard will directly pass to pattern view -->
+  <!-- Whether the keyguard will directly pass to PIN entry -->
+  <!-- lock screen visualizer -->
+  <!-- lock screen disabled by QS tile warning -->
+  <!-- Battery saver -->
+  <!-- Battery : Automatic performance profiles -->
+  <!-- Memory -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Advanced reboot options -->
+  <!-- Expanded desktop -->
+  <!-- Kill app long-press back -->
+  <!-- Show/Hide Search Bar -->
+  <!-- Voice Wakeup -->
+  <!-- Blacklist preferences -->
+  <!-- Blacklist management -->
+  <!-- Sms security limit -->
+  <!-- Notification spamfilter -->
+  <!-- Anonymous Statistics #CM -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <!-- Anonymous Statistics - Preview -->
+  <!-- Protected apps lockpattern reset button -->
+  <!-- Protected Apps -->
+  <!-- Contributors cloud activity -->
+  <!-- Edit access point labels: PPP number -->
+  <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <!-- MSIM SIM status -->
+  <!-- Zen mode allowed event setting summary items -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
+  <!-- SAR information -->
+  <!-- IC Codes -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- Factory reset strings -->
+  <!-- Tethering & portable hotspot other category -->
+  <!-- Wi-Fi tethering inactivity timeout -->
+  <!-- Live lock screen -->
+  <!-- Live lock screen title -->
+  <!-- Live lock screen summary -->
+  <!-- Live lock screen settings content description -->
+  <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
+</resources>
diff --git a/res/values-frp-rIT/strings.xml b/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-frp-rIT/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 6863f68..bb3faa1 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 1eee349..3073904 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -434,4 +434,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 3dd9deb..63e8020 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">ડેટા જોડાણો</string>
   <string name="toggleSync">ડેટાને સ્વતઃ-સમન્વયિત કરો</string>
   <string name="toggle2g3g4g">પસંદગીનો નેટવર્ક પ્રકાર</string>
+  <string name="toggle2g3g4g_msim">પસંદગીનો નેટવર્ક પ્રકાર (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi પ્રાંત કોડ</string>
@@ -992,4 +993,6 @@
   <string name="battery_info_status_charging_dock_ac">ડૉક AC પર ચાર્જિંગ નથી</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ડૉક USB પર ચાર્જિંગ થાય છે</string>
+  <string name="privacy_guard_internet_category">ઈન્ટરનેટ</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 115d448..6ccfb34 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -845,4 +845,5 @@
   <string name="battery_info_status_charging_dock_ac">डॉक एसी पर चार्ज हो रहा है</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक यूएसबी पर चार्ज हो रहा है</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 74118bc..7f157bd 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1000,4 +1000,5 @@
   <string name="restrict_app_cellular_title">Onemogući aplikaciji mobilno korištenje</string>
   <string name="restrict_app_cellular_summary">Spriječi aplikaciju da koristi mobilnu podatkovnu vezu</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 56f4245..cb78ffa 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Adatkapcsolat</string>
   <string name="toggleSync">Szinkronizálás</string>
   <string name="toggle2g3g4g">Előnyben részesített hálózat típusa</string>
+  <string name="toggle2g3g4g_msim">Előnyben részesített hálózat típusa (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi régió kód</string>
@@ -992,4 +993,6 @@
   <string name="battery_info_status_charging_dock_ac">Töltés dokkolón (AC)</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Töltés dokkolón (USB)</string>
+  <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index e73c8a6..919d54a 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Consentito <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Negato <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Consentito <xliff:g id="count">%1$s</xliff:g>, negato <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Disattivato dall\'ottimizazzione batteria</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Mostra app utente</string>
   <string name="app_ops_show_system_apps">Mostra app integrate</string>
@@ -1001,4 +1002,23 @@
   <string name="restrict_app_cellular_title">Disattiva utilizzo reti mobili</string>
   <string name="restrict_app_cellular_summary">Impedisci all\'app di utilizzare le connessioni a reti mobili</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Meteo</string>
+  <string name="weather_settings_no_services_prompt">Nessun provider meteo installato</string>
+  <string name="weather_settings_button">Impostazioni provider</string>
+  <string name="background_data_access">Accesso dati in background</string>
+  <string name="allow_background_both">Con dati mobili &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Solo su Wi\u2011Fi</string>
+  <string name="allow_background_none">Nessun accesso</string>
+  <string name="mobile_data_alert">Avviso dati mobili</string>
+  <string name="mobile_data_alert_summary">Notifica quando un\'app utilizza un ammontare significativo di dati</string>
+  <string name="data_usage_menu_enable_data_alerts">Attiva avvisi utilizzo dati</string>
+  <string name="data_usage_menu_disable_data_alerts">Disattiva avvisi utilizzo dati</string>
+  <string name="data_usage_menu_reset_stats">Azzera statistiche dati</string>
+  <string name="reset_data_stats_msg">Tutte le informazioni sull\'utilizzo dei dati salvate saranno rimosse</string>
+  <string name="reset_stats_confirm">Conferma</string>
+  <string name="restrict_cellular_access_title">Limita utilizzo dati mobili</string>
+  <string name="restrict_cellular_access_summary">Disattiva accesso su dati mobili</string>
+  <string name="restrict_cellular_access_dialog_title">Applicare restrizione dati mobili?</string>
+  <string name="restrict_cellular_access_dialog_summary">Questa funzione potrebbe impedire ad un\'app di funzionare correttamente quando sei connesso solo con dati mobili.\n\nPotresti trovare controlli per l\'utilizzo dati pià appropriati all\'interno delle impostazioni dell\'app stessa.</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index fd9c359..75a53e8 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -80,7 +80,7 @@
   <string name="profile_write_success">התווית נכתבה בהצלחה</string>
   <string name="profile_write_failed">כתיבת תווית נכשלה!</string>
   <string name="profile_selected">הפרופיל שנבחר: %1$s</string>
-  <string name="profile_nfc_text">כתיבת פרופיל לתג NFC תאפשר את הפעלת הפרופיל על ידי נגיעה בתג. נגיעה שנייה תחזיר לפרופיל הקודם.</string>
+  <string name="profile_nfc_text">כתיבת פרופיל לתג NFC תאפשר את הפעלת הפרופיל על ידי הקשה על התג. הקשה שנייה תחזיר לפרופיל הקודם.</string>
   <string name="profile_unknown_nfc_tag">פרופיל לא ידוע</string>
   <string name="profile_add_nfc_text">תג NFC זה מחובר לפרופיל לא ידוע. חיבור תג זה לפרופיל קיים יאפשר את הפעלתו בעתיד.</string>
   <string name="profile_select">בחר פרופיל</string>
@@ -152,14 +152,14 @@
   <string name="profile_lockmode_title">מצב מסך הנעילה</string>
   <string name="profile_lockmode_policy_disabled_summary">אפשרות פרופיל זאת מושבתת עקב מדיניות מנהל המכשיר</string>
   <string name="profile_lockmode_insecure_summary">אל תבקש PIN או סיסמה</string>
-  <string name="profile_lockmode_disabled_summary">בטל מסך נעילה</string>
+  <string name="profile_lockmode_disabled_summary">השבתת מסך נעילה</string>
   <string name="profile_airplanemode_title">מצב טיסה</string>
   <string name="profile_brightness_title">בהירות מסך</string>
   <string name="profile_brightness_override_summary">הגדר ל-%1$d%%</string>
   <string name="profile_brightness_override_checkbox_label">עקוף את הבהירות</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
-  <string name="toggleWifiAp">‏נקודה חמה ניידת של Wi\u2011Fi</string>
+  <string name="toggleWifiAp">‏נקודת רשת ציבורית ניידת של Wi\u2011Fi</string>
   <string name="toggleBluetooth">Bluetooth</string>
   <string name="toggleGPS">GPS</string>
   <string name="toggleData">חיבור נתונים</string>
@@ -199,10 +199,10 @@
   <string name="profile_appgroup_name_title">שם</string>
   <string name="duplicate_appgroup_name">שם כפול לקבוצת יישומים!</string>
   <string name="profile_app_delete_confirm">להסיר יישום זה?</string>
-  <string name="no_bluetooth_triggers">אין מכשירי Bluetooth מחוברים.\nלחץ כדי לחבר מכשיר Bluetooth לפני הגדרת גורמים מפעילים.</string>
-  <string name="no_wifi_triggers">לא הוגדרו נקודות Wi-Fi.\nלחץ כדי להתחבר ל-Wi-Fi לפני הגדרת גורמים מפעילים.</string>
-  <string name="no_triggers_configured">לא הוגדרו גורמים מפעילים. לחץ כדי להגדיר עוד.</string>
-  <string name="no_triggers_configured_nfc">לחץ כדי להגדיר גורם מפעיל חדש ל-NFC.</string>
+  <string name="no_bluetooth_triggers">אין מכשירי Bluetooth מחוברים.\nהקש כדי לחבר מכשיר Bluetooth לפני הגדרת גורמים מפעילים.</string>
+  <string name="no_wifi_triggers">לא הוגדרו נקודות Wi-Fi.\nהקש כדי להתחבר ל-Wi-Fi לפני הגדרת גורמים מפעילים.</string>
+  <string name="no_triggers_configured">לא הוגדרו גורמים מפעילים. הקש כדי להגדיר עוד.</string>
+  <string name="no_triggers_configured_nfc">הקש כדי להגדיר גורם מפעיל חדש ל-NFC.</string>
   <string name="profile_setup_setup_triggers_description">הגדר גורמים מפעילים להפעלת פרופיל זה</string>
   <string name="profile_setup_actions_description">עכשיו קבע מה קורה כאשר הפרופיל מופעל</string>
   <!-- Navigation Bar -->
@@ -210,14 +210,14 @@
   <string name="navigation_bar_left_title">מצב לשמאליים</string>
   <string name="navigation_bar_left_summary">מקם את שורת ההפעלה בצד השמאלי של המסך במצב רוחב</string>
   <string name="navigation_bar_title">לחצנים ופריסה</string>
-  <string name="navigation_bar_help_text">כדי להתחיל לחץ על כפתור העריכה, כדי לפתוח את סרגל הניווט לעריכה.\n\nאתה יכול ללחוץ על סמל כדי לשנות את קיצור הדרך שלו, או ללחוץ לחיצה ארוכה על סמל כדי לשנות את סידור הפריסה.\n\nלחץ \"שמור\" כדי להחיל את השינויים שלך, או \"שחזר ברירות מחדל\" כדי לאפס את הסידור להגדרות ברירת המחדל.</string>
+  <string name="navigation_bar_help_text">כדי להתחיל, הקש על סמל העריכה, כדי לפתוח את סרגל הניווט לעריכה.\n\nניתן להקיש על סמל כדי לשנות את קיצור הדרך שלו, או ללחוץ לחיצה ארוכה על סמל כדי לשנות את סידור הפריסה.\n\nלחץ \"שמור\" כדי להחיל את השינויים שלך, או \"שחזר ברירות מחדל\" כדי לאפס את הסידור להגדרות ברירת המחדל.</string>
   <string name="navigation_restore_button_text">שחזור\nברירת מחדל</string>
   <string name="navigation_edit_button_text">ערוך</string>
   <string name="navigation_save_button_text">שמור</string>
   <string name="navigation_bar_reset_message">למחוק את ההגדרות הנוכחיות ולשחזר את פריסת ברירת המחדל?</string>
   <string name="navigation_bar_arrow_keys_title">הצג מקשי חיצים בעת הקלדה</string>
   <string name="navigation_bar_arrow_keys_summary">הצג חיצי כתיבה ימניים ושמאליים בעת הכתיבה. עוקף את מחליף IME.</string>
-  <string name="navigation_bar_recents_title">פעולת לחיצה ארוכה על כפתור ה\"אחרונים\"</string>
+  <string name="navigation_bar_recents_title">פעולת לחיצה ארוכה על לחצן ה\"אחרונים\"</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">ערוך הגדרות אור</string>
   <string name="pulse_speed_title">אורך הבהוב ומהירות</string>
@@ -253,7 +253,7 @@
   <string name="notification_light_default_value">ברירת מחדל</string>
   <string name="notification_light_missed_call_title">שיחה שלא נענתה</string>
   <string name="notification_light_voicemail_title">תא קולי</string>
-  <string name="notification_light_screen_on">תאורת התראה כאשר המסך מופעל</string>
+  <string name="notification_light_screen_on">נוריות התראה כאשר המסך מופעל</string>
   <string name="notification_light_zen_mode">אורות התראה במצב \"נא לא להפריע\"</string>
   <string name="notification_light_use_multiple_leds">נוריות LED מרובות</string>
   <string name="keywords_lights_brightness_level">עמעם בהירות נוריות</string>
@@ -267,7 +267,7 @@
   <string name="enable_adb_summary_cm">הפעל ממשק ניקוי באגים (adb)</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB דרך הרשת</string>
-  <string name="adb_over_network_summary">אפשר איתור באגים של TCP/IP דרך ממשקי רשת (Wi\u2011Fi, רשתות USB). אפשרות זו תתאפס בעת אתחול מחדש של המכשיר</string>
+  <string name="adb_over_network_summary">הפעל איתור באגים של TCP/IP דרך ממשקי רשת (Wi\u2011Fi, רשתות USB). אפשרות זו תתאפס בעת אתחול מחדש של המכשיר</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">אזהרה: כאשר ADB דרך הרשת מופעל, הטלפון שלך חדיר מכל הרשתות המחוברות!\n\nיש להשתמש באפשרות זו רק כשאתה מחובר לרשת שניתן לסמוך עליה.\n\nהאם ברצונך להפעיל את אפשרות זו?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
@@ -401,7 +401,7 @@
   <string name="app_ops_labels_project_media">הקרן מדיה</string>
   <string name="app_ops_labels_activate_vpn">הפעל VPN</string>
   <string name="app_ops_labels_write_wallpaper">קבע טפט</string>
-  <string name="app_ops_labels_assist_structure">מבנה מסייע</string>
+  <string name="app_ops_labels_assist_structure">תבנית המידע ליישום הסיוע</string>
   <string name="app_ops_labels_assist_screenshot">צילום מסך מסייע</string>
   <string name="app_ops_labels_read_phone_state">קרא מצב טלפון</string>
   <string name="app_ops_labels_add_voicemail">הוסף תא קולי</string>
@@ -417,12 +417,12 @@
   <string name="app_ops_labels_get_accounts">קבל חשבונות</string>
   <string name="app_ops_labels_toggle_wifi">הפעל/כבה Wi-Fi</string>
   <string name="app_ops_labels_toggle_bluetooth">הפעל/כבה Bluetooth</string>
-  <string name="app_ops_labels_start_at_boot">הפעל בעת איתחול המכשיר</string>
+  <string name="app_ops_labels_start_at_boot">הפעל בעת אתחול המכשיר</string>
   <string name="app_ops_labels_toggle_nfc">הפעל/כבה NFC</string>
   <string name="app_ops_labels_toggle_mobile_data">הפעל/כבה נתונים סלולריים</string>
   <string name="app_ops_labels_superuser">גישת שורש (Root)</string>
   <!-- App ops permissions -->
-  <string name="app_ops_permissions_allowed">מורשה</string>
+  <string name="app_ops_permissions_allowed">אושר</string>
   <string name="app_ops_permissions_ignored">התעלם</string>
   <string name="app_ops_permissions_always_ask">שאל תמיד</string>
   <!-- App ops detail -->
@@ -430,18 +430,19 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> אושרו</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> נחסמו</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> אושרו, <xliff:g id="count">%2$s</xliff:g> נחסמו</string>
+  <string name="app_ops_disabled_by_optimization">מושבת על-ידי שיפורי סוללה</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">הצג יישומי משתמש</string>
   <string name="app_ops_show_system_apps">הצג יישומים מובנים</string>
-  <string name="app_ops_reset_counters">אפס מוני אישור/חסימה</string>
+  <string name="app_ops_reset_counters">איפוס מוני אישור/חסימה</string>
   <string name="app_ops_reset_confirm_title">אשר איפוס מונים</string>
   <string name="app_ops_reset_confirm_mesg">בטוח שברצונך לאפס מונים?</string>
   <string name="ok">אישור</string>
   <!-- Hostname setting -->
-  <string name="device_hostname">שם הרשת עבור ההתקן</string>
+  <string name="device_hostname">שם הרשת עבור המכשיר</string>
   <string name="unlock_scramble_pin_layout_title">ערבב פריסה</string>
   <string name="unlock_scramble_pin_layout_summary">ערבב פריסת PIN בעת פתיחת המכשיר</string>
-  <string name="button_pref_title">מקשים</string>
+  <string name="button_pref_title">לחצנים</string>
   <string name="hardware_keys_power_key_title">לחצן הפעלה</string>
   <string name="hardware_keys_home_key_title">לחצן הבית</string>
   <string name="hardware_keys_back_key_title">לחצן \'הקודם\'</string>
@@ -452,18 +453,18 @@
   <string name="hardware_keys_volume_keys_title">לחצני עוצמת קול</string>
   <string name="hardware_keys_short_press_title">פעולה בלחיצה קצרה</string>
   <string name="hardware_keys_long_press_title">פעולה בלחיצה ארוכה</string>
-  <string name="hardware_keys_double_tap_title">פעולה בנגיעה כפולה</string>
+  <string name="hardware_keys_double_tap_title">פעולה בהקשה כפולה</string>
   <string name="hardware_keys_action_nothing">ללא פעולה</string>
   <string name="hardware_keys_action_menu">פתח/סגור תפריט</string>
   <string name="hardware_keys_action_app_switch">מחליף יישומים אחרונים</string>
-  <string name="hardware_keys_action_search">עוזר-חיפוש</string>
+  <string name="hardware_keys_action_search">סיוע-חיפוש</string>
   <string name="hardware_keys_action_voice_search">חיפוש קולי</string>
   <string name="hardware_keys_action_in_app_search">חיפוש ביישום</string>
   <string name="hardware_keys_action_launch_camera">הפעלת מצלמה</string>
   <string name="hardware_keys_action_sleep">כיבוי המסך</string>
   <string name="hardware_keys_action_last_app">יישום אחרון</string>
   <string name="camera_sleep_on_release_title">הצצה מהמסך</string>
-  <string name="camera_sleep_on_release_summary">חצי לחיצה תשאיר את המסך פעיל כל עוד הכפתור לחוץ</string>
+  <string name="camera_sleep_on_release_summary">חצי לחיצה תשאיר את המסך פעיל כל עוד הלחצן לחוץ</string>
   <string name="camera_launch_title">הפעלת מצלמה</string>
   <string name="camera_launch_summary">לחיצה ארוכה ושחרור תפעיל את המצלמה</string>
   <string name="volbtn_music_controls_title">שליטה על ניגון</string>
@@ -514,11 +515,11 @@
   <string name="power_menu_sound_title">לוח צלילים</string>
   <string name="power_menu_bug_report_disabled">דיווח באגים מושבת בהגדרות מפתחים</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">אפשר לחצני ניווט על המסך</string>
-  <string name="disable_navkeys_summary">אפשר לחצני ניווט על המסך ובטל לחצנים פיזיים</string>
+  <string name="disable_navkeys_title">הפעל לחצני ניווט על המסך</string>
+  <string name="disable_navkeys_summary">אפשר לחצני ניווט על המסך והשבת לחצנים פיזיים</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">נגיעה כפולה לכיבוי מסך</string>
-  <string name="double_tap_to_sleep_summary">גע פעמיים בשורת המצב כדי לכבות את המסך</string>
+  <string name="double_tap_to_sleep_title">הקשה כפולה לכיבוי מסך</string>
+  <string name="double_tap_to_sleep_summary">הקש פעמיים בשורת המצב כדי לכבות את המסך</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">מנע התעוררות מקרית</string>
   <string name="proximity_wake_summary">בדוק את חיישן הקרבה לפני הפעלת המסך</string>
@@ -599,7 +600,7 @@
   <string name="live_display_color_profile_dynamic_title">דינמי</string>
   <string name="live_display_color_profile_dynamic_summary">צבעים וגווני לבן בהירים משופרים</string>
   <string name="live_display_color_profile_cinema_title">קולנוע</string>
-  <string name="live_display_color_profile_cinema_summary">שפר הפקת צבעים עבור סרטונים</string>
+  <string name="live_display_color_profile_cinema_summary">שפר הפקת צבעים עבור וידאו</string>
   <string name="live_display_color_profile_astronomy_title">אסטרונומיה</string>
   <string name="live_display_color_profile_astronomy_summary">אדום עמוק לשמירה על ראיית לילה</string>
   <string name="live_display_color_profile_photography_title">צילום</string>
@@ -664,7 +665,7 @@
   <string name="volume_keys_control_ring_stream_summary_on">מקשי העוצמה שולטים בעוצמת הרינגטון</string>
   <string name="volume_keys_control_ring_stream_summary_off">מקשי עוצמת הקול שולטים בעוצמת המדיה</string>
   <string name="category_calibration">כיול</string>
-  <string name="display_and_lights">תצוגה ואורות</string>
+  <string name="display_and_lights">תצוגה ונוריות</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
   <string name="power_notifications_category_title">צלילי טעינה</string>
@@ -727,14 +728,14 @@
   <string name="privacy_settings_cyanogenmod_title">פרטיות</string>
   <!-- Privacy Guard -->
   <string name="privacy_guard_default_title">מופעל כברירת מחדל</string>
-  <string name="privacy_guard_default_summary">אפשר כברירת מחדל עבור יישומים שהותקנו לאחרונה</string>
+  <string name="privacy_guard_default_summary">הפעל כברירת מחדל עבור יישומים שהותקנו לאחרונה</string>
   <string name="privacy_guard_manager_title">שומר הפרטיות</string>
   <string name="privacy_guard_manager_summary">נהל לאילו יישומים יש גישה למידע הפרטי שלך</string>
   <string name="privacy_guard_no_user_apps">אין יישומים מותקנים</string>
   <string name="privacy_guard_help_title">עזרה</string>
   <string name="privacy_guard_reset_title">איפוס</string>
   <string name="privacy_guard_reset_text">לאפס הרשאות?</string>
-  <string name="privacy_guard_help_text">בחלון זה באפשרותך לבחור עבור אילו יישומים שומר הפרטיות יפעל. היישומים הנבחרים לא יקבלו גישה למידע הפרטי שלך כמו אנשי קשר, הודעות ויומן שיחות. לחיצה ארוכה על יישום תפתח את פרטי ההרשאות שלו.\n\nיישומים מובנים לא מוצגים כברירת מחדל, אבל יכולים להיחשף על ידי בחירת ההגדרה המתאימה.</string>
+  <string name="privacy_guard_help_text">בחלון זה באפשרותך לבחור באמצעות הקשה עבור אילו יישומים שומר הפרטיות יפעל. היישומים הנבחרים לא יקבלו גישה למידע הפרטי שלך כמו אנשי קשר, הודעות ויומן שיחות. לחיצה ארוכה על יישום תפתח את פרטי ההרשאות שלו.\n\nיישומים מובנים לא מוצגים כברירת מחדל, אבל יכולים להיחשף על ידי בחירת ההגדרה המתאימה.</string>
   <string name="privacy_guard_manager_show_system_apps">הצג יישומים מובנים</string>
   <string name="privacy_guard_advanced_settings_title">מתקדם</string>
   <string name="privacy_guard_notification_title">הצג התראה</string>
@@ -752,7 +753,7 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">הצג אפקטים בעת השמעת מוזיקה</string>
   <!-- lock screen disabled by QS tile warning -->
-  <string name="lockscreen_disabled_by_qs_tile_title">כובה על ידי אריח הגדרות מהירות</string>
+  <string name="lockscreen_disabled_by_qs_tile_title">הושבת על ידי אריח הגדרות מהירות</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">הקש כדי להפעיל את מסך הנעילה</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">מסך הנעילה מופעל!</string>
   <!-- Battery saver -->
@@ -764,7 +765,7 @@
   <string name="autoperf_summary">בחר באופן אוטומטי את מצב הסוללה המתאים עבור יישומים שונים</string>
   <string name="perf_profile_title">מצב סוללה</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">יישומים שהופעלו בהדלקת המכשיר</string>
+  <string name="memory_startup_apps_title">יישומים שהופעלו בעת אתחול המכשיר</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">צליל התראה</string>
   <!-- Advanced reboot options -->
@@ -777,8 +778,8 @@
   <string name="expanded_hide_status">הסתר שורת מצב</string>
   <string name="expanded_hide_navigation">הסתר סרגל ניווט</string>
   <string name="expanded_hide_both">הסתר את שניהם</string>
-  <string name="expanded_nothing_to_show">כדי להוסיף תצורה מותאמת אישית למצב מורחב עבור כל יישום, העבר את \"זמין עבור הכול\" למצב כבוי</string>
-  <string name="expanded_enabled_for_all">זמין עבור הכול</string>
+  <string name="expanded_nothing_to_show">כדי להוסיף תצורה מותאמת אישית למצב מורחב עבור כל יישום, העבר את \"הפעל עבור הכול\" למצב כבוי</string>
+  <string name="expanded_enabled_for_all">הפעל עבור הכול</string>
   <string name="expanded_desktop_style">סגנון שולחן עבודה מורחב</string>
   <string name="expanded_desktop_style_description">בחר סגנון ברירת מחדל לשולחן העבודה המורחב</string>
   <string name="expanded_desktop_title">אפשרויות שולחן עבודה מורחב</string>
@@ -787,7 +788,7 @@
   <string name="kill_app_longpress_back_summary">הרוג יישום נראה על ידי לחיצה ארוכה על לחצן החזרה</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">הצג את סרגל החיפוש במסך יישומים אחרונים</string>
-  <string name="keywords_recents_show_searchbar">אחרון אחרונים כבה הפעל הצג הסתר סרגל חיפוש סרגל-חיפוש</string>
+  <string name="keywords_recents_show_searchbar">אחרון אחרונים השבתה הפעלה הצג הסתר סרגל חיפוש סרגל-חיפוש</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">השכמה קולית</string>
   <string name="voice_wakeup_retrain_title">אמן שוב את קולך</string>
@@ -829,7 +830,7 @@
   <string name="app_security_title">אבטחת יישום</string>
   <string name="sms_security_check_limit_title">מגבלת הודעות SMS</string>
   <string name="sms_security_check_limit_summary">יישומים יכולים לשלוח %d הודעות בדקה לפני שידרשו לבקש אישור</string>
-  <string name="sms_security_check_limit_summary_none">יישומים אינם מורשים לשלוח הודעות ללא אישור</string>
+  <string name="sms_security_check_limit_summary_none">יישומים אינם מאושרים לשלוח הודעות ללא אישור</string>
   <string name="sms_security_check_limit_none">ללא</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">%1$s נוסף</string>
@@ -842,7 +843,7 @@
   <string name="anonymous_statistics_title">סטטיסטיקות CyanogenMod</string>
   <string name="anonymous_statistics_summary">עזור לשפר את CyanogenMod על ידי דיווח סטטיסטיקות אנונימי</string>
   <string name="anonymous_statistics_warning_title">אודות</string>
-  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת CyanogenMod יאפשר שליחת מידע לא אישי למפתחי CyanogenMod על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, לחץ על תצוגה מקדימה של נתונים.</string>
+  <string name="anonymous_statistics_warning">הצטרפות לסטטיסטיקת CyanogenMod תאפשר שליחת מידע לא אישי למפתחי CyanogenMod על מנת לאתר התקנות שונות בין מכשירים. המידע הנשלח כולל מזהה ייחודי, אשר אינו פוגע בפרטיותך או במידע שלך. המידע נשלח עם כל אתחול.\n\nכדי לצפות בדוגמה של המידע, הקש על תצוגה מקדימה של נתונים.</string>
   <string name="enable_reporting_title">הפעל דיווח</string>
   <string name="preview_data_title">תצוגה מקדימה של נתונים</string>
   <string name="view_stats_title">הצג סטטיסטיקות</string>
@@ -857,7 +858,7 @@
   <string name="stats_collection_summary">כאשר מופעל, מאפשר איסוף מדדים</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">איפוס דפוס</string>
-  <string name="lockpattern_settings_reset_summary">הזן חשבון דוא\"ל ראשי וססמה משויכת כדי לאפס את דפוס הנעילה</string>
+  <string name="lockpattern_settings_reset_summary">הזן חשבון דוא\"ל ראשי וסיסמה משויכת כדי לאפס את דפוס הנעילה</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">איפוס</string>
   <string name="menu_hidden_apps_reset_lock">איפוס נעילת דפוס</string>
@@ -865,7 +866,7 @@
   <string name="protected_apps_summary">נהל אילו יישומים מוחבאים מאחורי נעילה מאובטחת</string>
   <string name="saving_protected_components">שמירת מצב רכיב\u2026</string>
   <string name="pa_login_username_hint">שם משתמש (דוא\"ל)</string>
-  <string name="pa_login_password_hint">ססמה</string>
+  <string name="pa_login_password_hint">סיסמה</string>
   <string name="pa_login_submit_button">התחברות</string>
   <string name="pa_login_checking_password">בודק חשבון\u2026</string>
   <string name="pa_login_incorrect_login">התחברות נכשלה</string>
@@ -887,7 +888,7 @@
   <string name="category_sounds">צלילים</string>
   <string name="notification_manager">התראות</string>
   <string name="lockscreen_settings">מסך נעילה</string>
-  <string name="category_lights">אורות</string>
+  <string name="category_lights">נוריות</string>
   <string name="category_volume">עוצמת קול</string>
   <string name="category_vibrate">רטט</string>
   <string name="category_misc">שונות</string>
@@ -955,8 +956,8 @@
   <string name="factory_reset_instructions_summary">פעולה זאת תמחק את כל החשבונות, היישומים (כולל נתוניהם) והגדרות המערכת ממכשיר זה</string>
   <string name="factory_reset_personal_content">תוכן אישי</string>
   <string name="factory_reset_erase_stored_content">מחק תוכן מאוחסן</string>
-  <string name="factory_reset_erase_stored_content_summary">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן במכשיר זה</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">מחק מוזיקה, תמונות, סרטונים, או כל תוכן אחר המאוחסן במכשיר זה.\n\n<b>לא ניתן לשמור את התוכן עקב הצפנת המכשיר.</b></string>
+  <string name="factory_reset_erase_stored_content_summary">מחק מוזיקה, תמונות, ווידאו, או כל תוכן אחר המאוחסן במכשיר זה</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">מחק מוזיקה, תמונות, ווידאו, או כל תוכן אחר המאוחסן במכשיר זה.\n\n<b>לא ניתן לשמור את התוכן עקב הצפנת המכשיר.</b></string>
   <string name="factory_reset_erase_sd_card">פרמט כרטיס זיכרון</string>
   <string name="factory_reset_erase_sd_card_summary">מחק את כל הנתונים על כרטיס הזיכרון, כולל מוזיקה ותמונות</string>
   <string name="factory_reset_warning_text_reset_now">אפס עכשיו</string>
@@ -964,13 +965,13 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">אחר</string>
   <!-- Wi-Fi tethering inactivity timeout -->
-  <string name="hotstpot_inactivity_timeout_text">זמן קצוב לנקודת Wi-Fi חמה</string>
+  <string name="hotstpot_inactivity_timeout_text">זמן קצוב לנקודת רשת ציבורית של Wi\u2011Fi</string>
   <string name="hotstpot_inactivity_timeout_never">אף פעם</string>
   <string name="hotstpot_inactivity_timeout_1_minute">דקה אחת</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 דקות</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 דקות</string>
-  <string name="hotstpot_inactivity_timeout_never_summary_text">נקודת Wi\u2011Fi חמה ניידת לעולם לא תיכבה מעצמה</string>
-  <string name="hotstpot_inactivity_timeout_summary_text">נקודת Wi\u2011Fi חמה ניידת תיכבה לאחר <xliff:g id="timeout">%1$s</xliff:g></string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">נקוד רשת ציבורית ניידת של Wi\u2011Fi לא תיכבה לעולם מעצמה</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">נקודת רשת ציבורית ניידת של Wi\u2011Fi תיכבה לאחר <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <string name="live_lock_screen_title">מסך נעילה חי</string>
@@ -994,9 +995,28 @@
   <string name="battery_info_status_charging_dock_ac">מטעין דרך חיבור AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">מטעין דרך חיבור USB</string>
-  <string name="restrict_app_wlan_title">בטל את שימוש היישום ב- Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_title">השבת את שימוש היישום ב- Wi\u2011Fi</string>
   <string name="restrict_app_wlan_summary">מונע מיישום מלהשתמש בחיבור נתוני Wi\u2011Fi</string>
-  <string name="restrict_app_cellular_title">בטל את שימוש היישום באינטרנט סלולרי</string>
+  <string name="restrict_app_cellular_title">השבת את שימוש היישום באינטרנט סלולרי</string>
   <string name="restrict_app_cellular_summary">מונע מיישום מלהשתמש בחיבור נתונים סלולריים</string>
   <string name="privacy_guard_internet_category">אינטרנט</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">מזג אוויר</string>
+  <string name="weather_settings_no_services_prompt">לא מותקנים שירותי ספקי מזג אוויר</string>
+  <string name="weather_settings_button">הגדרות ספק</string>
+  <string name="background_data_access">גישה לנתוני רקע</string>
+  <string name="allow_background_both">מעל נתונים סלולריים ו- Wi\u2011Fi</string>
+  <string name="allow_background_wlan">רק מעל Wi\u2011Fi</string>
+  <string name="allow_background_none">אין גישה</string>
+  <string name="mobile_data_alert">התראת נתונים סלולריים</string>
+  <string name="mobile_data_alert_summary">מתריע כאשר יישום משתמש בכמות נתונים משמעותית</string>
+  <string name="data_usage_menu_enable_data_alerts">הפעל התראות שימוש נתונים</string>
+  <string name="data_usage_menu_disable_data_alerts">השבתת התראות שימוש נתונים</string>
+  <string name="data_usage_menu_reset_stats">איפוס סטטיסטיקות נתונים</string>
+  <string name="reset_data_stats_msg">פעולה זו תנקה את כל המידע שנאסף בהווה ובעבר על מעקב אחר נתונים</string>
+  <string name="reset_stats_confirm">אישור</string>
+  <string name="restrict_cellular_access_title">הגבל גישה לנתונים סלולריים</string>
+  <string name="restrict_cellular_access_summary">השבתת גישה לנתונים ברשתות סלולריות</string>
+  <string name="restrict_cellular_access_dialog_title">להגביל גישה לנתונים סלולריים?</string>
+  <string name="restrict_cellular_access_dialog_summary">תכונה זו עלולה לגרום להפסקת פעולתו של יישום התלוי בגישה לרשת כאשר קיימת זמינות לרשתות סלולריות בלבד.\n\nתוכל למצוא פקדים מתאימים יותר לשימוש בנתונים, בהגדרות הזמינות בתוך היישום.</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 9c1fa60..473fd90 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">ACでホルダーを充電しています</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USBでホルダーを充電しています</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 96b454c..4ed2a43 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -994,4 +994,5 @@
   <string name="battery_info_status_charging_dock_ac">ಡಾಕ್ ಎಸಿಯ ಮೇಲೆ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ಡಾಕ್ ಯು‍ಎಸ್‍ಬಿಯ ಮೂಲಕ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index bde61e9..b46ac17 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -989,4 +989,5 @@
   <string name="battery_info_status_charging_dock_ac">독 AC로 충전중</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">독 USB로 충전중</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index a220a47..bab94a6 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -766,4 +766,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index d4a44c8..dc23497 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -875,4 +875,5 @@
   <string name="battery_info_status_charging_dock_ac">Gëtt mam Dock gelueden</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Luede mam USB-Dock</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index b2859bb..6a0f0cd 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -880,4 +880,5 @@
   <string name="battery_info_status_charging_dock_ac">Įkraunama ant doko AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Įkraunama per USB doką</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 2b67c9a..2cd55a1 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -550,4 +550,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 3b0c23e..74d69aa 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -993,4 +993,5 @@
   <string name="battery_info_status_charging_dock_ac">ഡോക്ക് AC യില്‍ ചാര്‍ജ്ജ് ചെയ്യുന്നു</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USB ഡോക്ക് മുഖേന ചാര്‍ജ് ചെയ്യുന്നു</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 57268dd..bab9c5e 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">डॉक AC वर चार्ज करत आहे</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक USB वर चार्ज करत आहे</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 0e6c0bd..f2a1e52 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -955,4 +955,5 @@
   <string name="battery_info_status_charging_dock_ac">Lader på dokk AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Lader via dokk-USB</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index cfcd640..d9cdbd0 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Gegevensverbinding</string>
   <string name="toggleSync">Gegevenssynchronisatie</string>
   <string name="toggle2g3g4g">Voorkeursnetwerktype</string>
+  <string name="toggle2g3g4g_msim">Voorkeursnetwerktype (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wifi-regiocode</string>
@@ -861,6 +862,7 @@
   <string name="menu_hidden_apps_delete">Opnieuw instellen</string>
   <string name="menu_hidden_apps_reset_lock">Patroon opnieuw instellen</string>
   <string name="protected_apps">Beschermde apps</string>
+  <string name="protected_apps_summary">Beheren welke apps beschermd zijn</string>
   <string name="saving_protected_components">Opslaan\u2026</string>
   <string name="pa_login_username_hint">Gebruikersnaam (e-mail)</string>
   <string name="pa_login_password_hint">Wachtwoord</string>
@@ -992,4 +994,6 @@
   <string name="battery_info_status_charging_dock_ac">Opladen via dock (AC)</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
+  <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 4390cab..34c74e8 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">ଡକ୍‍ ACରେ ଚାର୍ଜିଂ</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ଡକ୍‍ USBରେ ଚାର୍ଜିଂ</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 96c954b..6243e94 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -860,6 +860,7 @@
   <string name="menu_hidden_apps_delete">Przywróć domyślne</string>
   <string name="menu_hidden_apps_reset_lock">Zresetuj wzór blokady</string>
   <string name="protected_apps">Chronione aplikacje</string>
+  <string name="protected_apps_summary">Zarządzaj, które aplikacje mają być ukryte za bezpieczną blokadą</string>
   <string name="saving_protected_components">Zapisywanie obecnego stanu\u2026</string>
   <string name="pa_login_username_hint">Użytkownik (e-mail)</string>
   <string name="pa_login_password_hint">Hasło</string>
@@ -991,6 +992,10 @@
   <string name="battery_info_status_charging_dock_ac">Ładowanie dokiem AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Ładowanie dokiem USB</string>
+  <string name="restrict_app_wlan_title">Wyłącz użycie Wi\u2011Fi przez aplikację</string>
+  <string name="restrict_app_wlan_summary">Uniemożliwia aplikacji na korzystanie z Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Wyłącz użycie danych mobilnych przez aplikację</string>
   <string name="restrict_app_cellular_summary">Uniemożliwia aplikacji na korzystanie z danych mobilnych</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index ba6ec3b..a0ffd30 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -18,19 +18,19 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">Você ativou as configurações de desenvolvimento!</string>
+  <string name="show_dev_on_cm">Você ativou as configurações de desenvolvedor!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Não é preciso, você já ativou as configurações de desenvolvimento.</string>
+  <string name="show_dev_already_cm">Não é preciso, você já ativou as configurações de desenvolvedor.</string>
   <!-- Launch Dev Tools -->
-  <string name="development_tools_title">Ferramentas de desenvolvimento</string>
+  <string name="development_tools_title">Ferramentas de desenvolvedor</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Atalho para desenvolvimento</string>
-  <string name="development_shortcut_summary">Ativar atalhos de gerenciamento de aplicativo na lista de recentes</string>
+  <string name="development_shortcut_summary">Ativar atalhos de gerenciamento de aplicativo na lista de aplicativos recentes</string>
   <!-- Setting checkbox title for root access -->
-  <string name="root_access">Acesso root</string>
-  <string name="root_access_warning_title">Permitir acesso root?</string>
-  <string name="root_access_warning_message">Permitir aplicativos a solicitarem acesso superusuário é muito perigoso e pode comprometer a segurança do seus sistema!</string>
-  <string name="root_access_none">Desabilitado</string>
+  <string name="root_access">Acesso superusuário</string>
+  <string name="root_access_warning_title">Permitir acesso superusuário?</string>
+  <string name="root_access_warning_message">Permitir que aplicativos solicitem acesso de superusuário é muito perigoso e pode comprometer a segurança do seu sistema!</string>
+  <string name="root_access_none">Desativado</string>
   <string name="root_access_apps">Somente aplicativos</string>
   <string name="root_access_adb">Somente ADB</string>
   <string name="root_access_all">Aplicativos e ADB</string>
@@ -51,10 +51,10 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Atualizações CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Atualizar o recovery da Cyanogen</string>
-  <string name="update_recovery_summary">Atualizar o recovery com atualizações de sistema</string>
-  <string name="update_recovery_on_warning">AVISO: Quando este recurso é ativado, seu recovery será substituído pelo o que é incluído no sistema operacional em execução.\n\nSeu recovery será atualizado junto com o sistema, ajudando a garantir a compatibilidade com versões futuras.\n\nVocê que você gosta de ativar este recurso?</string>
-  <string name="update_recovery_off_warning">AVISO: Quando este recurso estiver desativado, seu recovery instalado não será atualizado junto com o sistema.\n\nVersões mais atuais do sistema operacional podem não instalar com um recovery antigo ou customizado.\n\nVocê realmente quer desativar este recurso?</string>
+  <string name="update_recovery_title">Atualizar a recuperação do Cyanogen</string>
+  <string name="update_recovery_summary">Atualizar a recuperação com atualizações de sistema</string>
+  <string name="update_recovery_on_warning">AVISO: Quando este recurso é ativado, sua recuperação será substituída pela o que é incluída no sistema operacional em execução.\n\nSua recuperação será atualizada junto com o sistema, ajudando a garantir a compatibilidade com versões futuras.\n\nGostaria de ativar este recurso?</string>
+  <string name="update_recovery_off_warning">CUIDADO: Quando este recurso está desativado, sua recuperação instalada não será atualizada junto com o sistema.\n\nVersões mais atuais do sistema operacional podem não instalar com uma recuperação antiga ou personalizada.\n\nDeseja mesmo desativar este recurso?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Temas</string>
@@ -69,24 +69,24 @@
   <string name="profiles_add">Adicionar</string>
   <string name="profile_menu_delete">Remover</string>
   <string name="profile_settings_title">Perfil</string>
-  <string name="profile_empty_list_profiles_off">Para configurar e usar perfis de sistema, ative perfis.</string>
+  <string name="profile_empty_list_profiles_off">Para configurar e usar perfis de sistema, ative os perfis.</string>
   <string name="profile_trigger_configure">Configurar disparador</string>
-  <string name="profile_write_nfc_tag">Escrever na etiqueta NFC</string>
-  <string name="profile_write_touch_tag">Tocar etiqueta para escrever</string>
-  <string name="profile_write_success">Etiqueta foi escrita com sucesso</string>
+  <string name="profile_write_nfc_tag">Gravar na etiqueta NFC</string>
+  <string name="profile_write_touch_tag">Toque na etiqueta para gravar</string>
+  <string name="profile_write_success">Etiqueta gravada</string>
   <string name="profile_write_failed">Falhou ao escrever etiqueta</string>
   <string name="profile_selected">Perfil selecionado: %1$s</string>
-  <string name="profile_nfc_text">Escrevendo um perfil a uma etiqueta NFC permite você encostar a etiqueta para selecionar aquele perfil. Encostando pela segunda vez irá selecionar o perfil selecionado anterior.</string>
-  <string name="profile_unknown_nfc_tag">Perfil Desconhecido</string>
-  <string name="profile_add_nfc_text">Esta etiqueta NFC se refere a um perfil desconhecido. Ao anexar esta etiqueta NFC à um perfil existente, irá permitir selecionar o perfil no futuro.</string>
+  <string name="profile_nfc_text">Gravar um perfil em uma etiqueta NFC permite tocar na etiqueta para selecionar aquele perfil. Tocando uma segunda vez seleciona o perfil anterior.</string>
+  <string name="profile_unknown_nfc_tag">Perfil desconhecido</string>
+  <string name="profile_add_nfc_text">Esta etiqueta NFC se refere a um perfil desconhecido. Ligar essa etiqueta NFC a um perfil existente, possibilita selecionar o perfil no futuro.</string>
   <string name="profile_select">Selecione o perfil</string>
-  <string name="profile_remove_dialog_message">Apagar perfil %1$s?</string>
+  <string name="profile_remove_dialog_message">Remover perfil %1$s?</string>
   <string name="profile_populate_profile_from_state">Configurar perfil usando as configurações atuais do dispositivo?</string>
-  <string name="profile_menu_fill_from_state">Importar as configurações atuais do dispositivo</string>
+  <string name="profile_menu_fill_from_state">Importar configurações atuais do dispositivo</string>
   <string name="profile_remove_current_profile">Não é possível excluir o perfil ativo!</string>
   <string name="profile_app_group_category_title">Substituições de notificações</string>
   <string name="profile_app_group_item_instructions">Adicionar ou remover grupos</string>
-  <string name="profile_app_group_item_instructions_summary">Adicionar ou remover grupos de apps que substituem a notificação deste perfil</string>
+  <string name="profile_app_group_item_instructions_summary">Adicionar ou remover grupos de aplicativos que substituem a notificação deste perfil</string>
   <!-- Profile mode options. -->
   <string name="profile_entries_on">Ligado</string>
   <string name="profile_entries_off">Desligado</string>
@@ -96,14 +96,14 @@
   <string name="new_profile_name">&lt;novo perfil&gt;</string>
   <!-- Rename Dialog  -->
   <string name="rename_dialog_title">Renomear</string>
-  <string name="rename_dialog_message">Entre um novo nome</string>
-  <string name="duplicate_appgroup_name">Nome de grupo de apps duplicado!</string>
+  <string name="rename_dialog_message">Digite um novo nome</string>
+  <string name="duplicate_appgroup_name">Nome de grupo de aplicativos duplicado!</string>
   <string name="rename_dialog_hint">Digite o nome do perfil</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Restaurar</string>
-  <string name="profile_reset_message">Você quer remover todos os perfis e grupos de aplicação criados e restaurá-los para o padrão?</string>
+  <string name="profile_reset_message">Deseja deletar todos os perfis e grupos de aplicativos criados e restaurá-los para o padrão?</string>
   <!-- Delete confimation messages -->
-  <string name="profile_app_delete_confirm">Remover este app?</string>
+  <string name="profile_app_delete_confirm">Remover este aplicativo?</string>
   <!-- Profile network mode -->
   <string name="profile_networkmode_2g">2G</string>
   <string name="profile_networkmode_3g">3G</string>
@@ -114,12 +114,12 @@
   <string name="profile_volumeoverrides_title">Substituição de volume</string>
   <string name="connection_state_enabled">Ativar</string>
   <string name="volume_override_summary">Definir para %1$s/%2$s</string>
-  <string name="profile_volume_override_checkbox_label">Substituir volume</string>
+  <string name="profile_volume_override_checkbox_label">Controlar volume</string>
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">Perfis</string>
   <string name="profile_profile_manage">Gerenciar perfil</string>
-  <string name="profile_appgroups_manage">Grupos de apps</string>
-  <string name="profile_appgroup_manage">Gerenciar grupo de apps</string>
+  <string name="profile_appgroups_manage">Grupos de apl.</string>
+  <string name="profile_appgroup_manage">Gerenciar grupo de apl.</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
   <string name="profile_settings">Configuração do perfil</string>
   <string name="profile_trigger_connect">Ao conectar</string>
@@ -135,24 +135,24 @@
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">Toque de notificação</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grupos de apps</string>
-  <string name="profile_applist_title">Aplicações</string>
-  <string name="profile_new_appgroup">Novo grupo de apps</string>
-  <string name="profile_delete_appgroup">Remover este grupo de apps?</string>
-  <string name="profile_appgroup_name_prompt">Digite um nome para o novo grupo de apps</string>
+  <string name="profile_appgroups_title">Grupos de apl.</string>
+  <string name="profile_applist_title">Aplicativos</string>
+  <string name="profile_new_appgroup">Novo grupo de apl.</string>
+  <string name="profile_delete_appgroup">Remover este grupo de apl.?</string>
+  <string name="profile_appgroup_name_prompt">Digite um nome para o novo grupo de aplicativos</string>
   <string name="profile_appgroup_name_title">Nome</string>
   <!-- Add application dialog box title -->
-  <string name="profile_choose_app">Selecionar aplicação</string>
+  <string name="profile_choose_app">Selecionar aplicativo</string>
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">Configurações de sistema</string>
   <string name="profile_lockmode_title">Modo de bloqueio de tela</string>
-  <string name="profile_lockmode_policy_disabled_summary">Esta opção de perfil está desativada pela política do administrador do dispositivo</string>
+  <string name="profile_lockmode_policy_disabled_summary">Esta opção de perfil foi desativada pela política do administrador do dispositivo</string>
   <string name="profile_lockmode_insecure_summary">Não pedir PIN ou senha</string>
-  <string name="profile_lockmode_disabled_summary">Desabilitar a tela de bloqueio</string>
+  <string name="profile_lockmode_disabled_summary">Desativar tela de bloqueio</string>
   <string name="profile_airplanemode_title">Modo avião</string>
   <string name="profile_brightness_title">Brilho da tela</string>
   <string name="profile_brightness_override_summary">Definir para %1$d%%</string>
-  <string name="profile_brightness_override_checkbox_label">Substituir o brilho</string>
+  <string name="profile_brightness_override_checkbox_label">Controlar o brilho</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
   <string name="toggleWifiAp">Ponto de acesso Wi\u2011Fi</string>
@@ -166,7 +166,7 @@
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Código de região Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">Especificar o código de região para Wi\u2011Fi</string>
+  <string name="wifi_setting_countrycode_summary">Especifique o código de região para Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Houve um problema ao definir o código de região.</string>
   <!-- Profiles -->
@@ -185,16 +185,16 @@
   <string name="profile_setup_setup_triggers_title_config">Modificar gatilhos: <xliff:g id="profile_name">%1$s</xliff:g></string>
   <string name="profile_setup_actions_title">Etapa 2: Ações de instalação</string>
   <string name="profile_setup_actions_title_config">Reconfigurar as ações</string>
-  <string name="profile_appgroups_manage">Grupos de apps</string>
-  <string name="profile_appgroup_manage">Gerenciar grupo de apps</string>
+  <string name="profile_appgroups_manage">Grupos de apl.</string>
+  <string name="profile_appgroup_manage">Gerenciar grupo de apl.</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grupos de apps</string>
-  <string name="profile_new_appgroup">Novo grupo de apps</string>
-  <string name="profile_delete_appgroup">Remover este grupo de apps?</string>
-  <string name="profile_appgroup_name_prompt">Digite um nome para o novo grupo de apps</string>
+  <string name="profile_appgroups_title">Grupos de apl.</string>
+  <string name="profile_new_appgroup">Novo grupo de apl.</string>
+  <string name="profile_delete_appgroup">Remover este grupo de apl.?</string>
+  <string name="profile_appgroup_name_prompt">Digite um nome para o novo grupo de aplicativos</string>
   <string name="profile_appgroup_name_title">Nome</string>
-  <string name="duplicate_appgroup_name">Nome de grupo de apps duplicado!</string>
-  <string name="profile_app_delete_confirm">Remover este app?</string>
+  <string name="duplicate_appgroup_name">Nome de grupo de aplicativos duplicado!</string>
+  <string name="profile_app_delete_confirm">Remover este aplicativo?</string>
   <string name="no_bluetooth_triggers">Não há dispositivos Bluetooth pareados.\nToque para parear um dispositivo Bluetooth antes de configurar gatilhos.</string>
   <string name="no_wifi_triggers">Nenhum ponto de acesso Wi-Fi configurado.\nToque para conectar a um Wi-Fi antes de configurar gatilhos.</string>
   <string name="no_triggers_configured">Nenhum gatilho configurado. Toque para adicionar mais.</string>
@@ -204,23 +204,23 @@
   <!-- Navigation Bar -->
   <string name="navigation_bar_category">Barra de navegação</string>
   <string name="navigation_bar_left_title">Modo canhoto</string>
-  <string name="navigation_bar_left_summary">Posicionar a barra de navegação no lado esquerdo da tela quando em modo paisagem</string>
-  <string name="navigation_bar_title">Barra de Navegação</string>
-  <string name="navigation_bar_help_text">Para começar toque no ícone de editar para desbloquear a edição da barra de navegação.\n\nVocê pode tocar num ícone para alterar o seu atalho, ou aperte e segure um ícone para re-organizar o layout.\n\nToque em \'Salvar\' para confirmar as alterações, ou \'Restaurar para padrões\' para redefinir o layout para as configurações padrões.</string>
+  <string name="navigation_bar_left_summary">Posicionar a barra de navegação do lado esquerdo da tela em modo paisagem</string>
+  <string name="navigation_bar_title">Botões e layout</string>
+  <string name="navigation_bar_help_text">Para começar, toque no ícone de editar para desbloquear a edição da barra de navegação.\n\nVocê pode tocar num ícone para alterar o seu atalho ou aperte e segure um ícone para reorganizar o layout.\n\nToque em \'Salvar\' para confirmar as alterações, ou \'Restaurar padrões\' para devolver o layout para as configurações padrões.</string>
   <string name="navigation_restore_button_text">Restaurar\npadrão</string>
   <string name="navigation_edit_button_text">Editar</string>
   <string name="navigation_save_button_text">Salvar</string>
   <string name="navigation_bar_reset_message">Excluir as configurações atuais e restaurar o layout padrão?</string>
   <string name="navigation_bar_arrow_keys_title">Mostrar teclas de seta enquanto digita</string>
   <string name="navigation_bar_arrow_keys_summary">Exibir botões esquerda e direita do cursor durante a digitação. Substitui o seletor de IME.</string>
-  <string name="navigation_bar_recents_title">Ação de pressionar e segurar apps recentes</string>
+  <string name="navigation_bar_recents_title">Ação de pressionar e segurar aplicativos recentes</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Editar configurações de luz</string>
-  <string name="pulse_speed_title">Duração e velocidade da pulsação</string>
+  <string name="pulse_speed_title">Duração e velocidade do pulso</string>
   <string name="default_time">Normal</string>
   <string name="custom_time">Personalizado</string>
   <string name="dialog_delete_title">Apagar</string>
-  <string name="dialog_delete_message">Remover ítem selecionado?</string>
+  <string name="dialog_delete_message">Remover item selecionado?</string>
   <!-- Values for the notification light pulse spinners -->
   <string name="pulse_length_always_on">Sempre ligado</string>
   <string name="pulse_length_very_short">Muito curto</string>
@@ -234,7 +234,7 @@
   <string name="pulse_speed_slow">Devagar</string>
   <string name="pulse_speed_very_slow">Muito devagar</string>
   <!-- Battery light settings -->
-  <string name="battery_light_title">Luz da Bateria</string>
+  <string name="battery_light_title">Luz da bateria</string>
   <string name="battery_low_pulse_title">Pulsar quando a bateria estiver baixa</string>
   <string name="battery_light_list_title">Cores</string>
   <string name="battery_light_low_color_title">Bateria baixa</string>
@@ -251,7 +251,7 @@
   <string name="notification_light_voicemail_title">Correio de Voz</string>
   <string name="notification_light_screen_on">Luzes com a tela ligada</string>
   <string name="notification_light_zen_mode">Luzes no modo Não Perturbe</string>
-  <string name="notification_light_use_multiple_leds">LEDs múltiplos</string>
+  <string name="notification_light_use_multiple_leds">Vários LEDs</string>
   <string name="keywords_lights_brightness_level">escurecer o brilho do led</string>
   <string name="notification_light_automagic">Escolha automática das cores</string>
   <!-- Lights settings, LED notification -->
@@ -262,10 +262,10 @@
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
   <string name="enable_adb_summary_cm">Ativar a interface de Ponte de Depuração Android (adb)</string>
   <!-- Android debugging over WiFi -->
-  <string name="adb_over_network">ADB sobre rede</string>
-  <string name="adb_over_network_summary">Ativar a depuração de TCP/IP sobre as interfaces de rede (Wi\u2011Fi, USB). Esta definição é restaurada na reinicialização</string>
+  <string name="adb_over_network">ADB pela rede</string>
+  <string name="adb_over_network_summary">Ativa a depuração de TCP/IP em interfaces de rede (Wi\u2011Fi, USB). Configuração redefinida durante a reinicialização</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">Aviso: Quando o ADB sobre rede estiver ativado, seu telefone está aberto para invasões em todas as redes conectadas! \n\nApenas use este recurso quando você estiver conectado em redes confiáveis.\n\nVocê deseja realmente ativar esta função?</string>
+  <string name="adb_over_network_warning">AVISO: Quando o ADB pela rede é ativado, seu telefone fica aberto para invasões em todas as redes conectadas! \n\nSó use este recurso quando estiver conectado a redes confiáveis.\n\nDeseja realmente ativar esta função?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <string name="adb_notify">Notificação de depuração</string>
   <string name="adb_notify_summary">Exibir uma notificação quando a depuração via USB ou rede estiver ativada</string>
@@ -276,7 +276,7 @@
   <string name="app_ops_categories_media">Mídia</string>
   <string name="app_ops_categories_device">Dispositivo</string>
   <string name="app_ops_categories_bootup">Inicialização</string>
-  <string name="app_ops_categories_su">Acesso super usuário</string>
+  <string name="app_ops_categories_su">Acesso superusuário</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_summaries_coarse_location">localização imprecisa</string>
   <string name="app_ops_summaries_fine_location">localização precisa</string>
@@ -299,21 +299,21 @@
   <string name="app_ops_summaries_receive_mms">receber MMS</string>
   <string name="app_ops_summaries_receive_wap_push">receber WAP push</string>
   <string name="app_ops_summaries_send_sms">enviar SMS</string>
-  <string name="app_ops_summaries_read_icc_sms">enviar SMS ICC</string>
+  <string name="app_ops_summaries_read_icc_sms">ler SMS ICC</string>
   <string name="app_ops_summaries_write_icc_sms">escrever SMS ICC</string>
   <string name="app_ops_summaries_modify_settings">modificar configurações</string>
-  <string name="app_ops_summaries_draw_on_top">desenhar no topo</string>
+  <string name="app_ops_summaries_draw_on_top">desenhar em cima</string>
   <string name="app_ops_summaries_access_notifications">acessar notificações</string>
   <string name="app_ops_summaries_camera">câmera</string>
   <string name="app_ops_summaries_record_audio">gravar áudio</string>
-  <string name="app_ops_summaries_play_audio">reproduzir áudio</string>
+  <string name="app_ops_summaries_play_audio">tocar áudio</string>
   <string name="app_ops_summaries_read_clipboard">ler área de transferência</string>
   <string name="app_ops_summaries_modify_clipboard">modificar área de transferência</string>
   <string name="app_ops_summaries_media_buttons">botões de mídia</string>
-  <string name="app_ops_summaries_audio_focus">focar em áudio</string>
+  <string name="app_ops_summaries_audio_focus">foco em áudio</string>
   <string name="app_ops_summaries_master_volume">volume principal</string>
   <string name="app_ops_summaries_voice_volume">volume de voz</string>
-  <string name="app_ops_summaries_ring_volume">volume de chamada</string>
+  <string name="app_ops_summaries_ring_volume">volume de toque</string>
   <string name="app_ops_summaries_media_volume">volume de mídia</string>
   <string name="app_ops_summaries_alarm_volume">volume de alarme</string>
   <string name="app_ops_summaries_notification_volume">volume de notificação</string>
@@ -346,7 +346,7 @@
   <string name="app_ops_summaries_start_at_boot">começar na inicialização</string>
   <string name="app_ops_summaries_toggle_nfc">alternar NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">alternar dados de celular</string>
-  <string name="app_ops_summaries_superuser">acesso super usuário</string>
+  <string name="app_ops_summaries_superuser">acesso superusuário</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Localização imprecisa</string>
   <string name="app_ops_labels_fine_location">Localização precisa</string>
@@ -357,30 +357,30 @@
   <string name="app_ops_labels_read_call_log">Ler registro de chamadas</string>
   <string name="app_ops_labels_modify_call_log">Modificar registro de chamdas</string>
   <string name="app_ops_labels_read_calendar">Ler calendário</string>
-  <string name="app_ops_labels_modify_calendar">Motificar calendário</string>
+  <string name="app_ops_labels_modify_calendar">Modificar calendário</string>
   <string name="app_ops_labels_wifi_scan">Busca por Wi-Fi</string>
-  <string name="app_ops_labels_notification">Enviar notificação</string>
+  <string name="app_ops_labels_notification">Notificação/Aviso na tela</string>
   <string name="app_ops_labels_cell_scan">Verificação de célula</string>
   <string name="app_ops_labels_call_phone">Ligar p/ telefone</string>
   <string name="app_ops_labels_read_sms">Ler SMS</string>
   <string name="app_ops_labels_write_sms">Escrever SMS</string>
-  <string name="app_ops_labels_receive_sms">Receber SMS/MMS</string>
+  <string name="app_ops_labels_receive_sms">Receber SMS</string>
   <string name="app_ops_labels_receive_emergency_sms">Receber SMS de emergência</string>
-  <string name="app_ops_labels_receive_mms">Receber SMS/MMS</string>
+  <string name="app_ops_labels_receive_mms">Receber MMS</string>
   <string name="app_ops_labels_receive_wap_push">Receber notificações WAP</string>
-  <string name="app_ops_labels_send_sms">Enviar SMS/MMS</string>
+  <string name="app_ops_labels_send_sms">Enviar SMS</string>
   <string name="app_ops_labels_read_icc_sms">Ler SMS ICC</string>
   <string name="app_ops_labels_write_icc_sms">Escrever SMS ICC</string>
   <string name="app_ops_labels_modify_settings">Modificar configurações</string>
-  <string name="app_ops_labels_draw_on_top">Desenhar no topo</string>
+  <string name="app_ops_labels_draw_on_top">Desenhar em cima</string>
   <string name="app_ops_labels_access_notifications">Acessar notificações</string>
   <string name="app_ops_labels_camera">Câmera</string>
   <string name="app_ops_labels_record_audio">Gravar áudio</string>
-  <string name="app_ops_labels_play_audio">Reproduzir áudio</string>
+  <string name="app_ops_labels_play_audio">Tocar áudio</string>
   <string name="app_ops_labels_read_clipboard">Ler área de transferência</string>
   <string name="app_ops_labels_modify_clipboard">Modificar área de transferência</string>
   <string name="app_ops_labels_media_buttons">Botões de mídia</string>
-  <string name="app_ops_labels_audio_focus">Foco do áudio</string>
+  <string name="app_ops_labels_audio_focus">Foco em áudio</string>
   <string name="app_ops_labels_master_volume">Volume principal</string>
   <string name="app_ops_labels_voice_volume">Volume de voz</string>
   <string name="app_ops_labels_ring_volume">Volume do toque</string>
@@ -393,8 +393,8 @@
   <string name="app_ops_labels_monitor_high_power_location">Monitorar localização com precisão</string>
   <string name="app_ops_labels_get_usage_stats">Obter estatísticas de uso</string>
   <string name="app_ops_labels_mute_unmute_microphone">Silenciar/ativar microfone</string>
-  <string name="app_ops_labels_toast_window">Exibir avisos flutuantes na tela</string>
-  <string name="app_ops_labels_project_media">projetar mídia</string>
+  <string name="app_ops_labels_toast_window">Exibir avisos na tela</string>
+  <string name="app_ops_labels_project_media">Projetar mídia</string>
   <string name="app_ops_labels_activate_vpn">Ativar VPN</string>
   <string name="app_ops_labels_write_wallpaper">Alterar o papel de parede</string>
   <string name="app_ops_labels_assist_structure">Estrutura de assistência</string>
@@ -416,7 +416,7 @@
   <string name="app_ops_labels_start_at_boot">Começar na inicialização</string>
   <string name="app_ops_labels_toggle_nfc">Alternar NFC</string>
   <string name="app_ops_labels_toggle_mobile_data">Alternar dados de celular</string>
-  <string name="app_ops_labels_superuser">Acesso root</string>
+  <string name="app_ops_labels_superuser">Acesso superusuário</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Permitido</string>
   <string name="app_ops_permissions_ignored">Ignorado</string>
@@ -426,12 +426,13 @@
   <string name="app_ops_allowed_count">Permitidos <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Negados <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permitidos <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="count">%1$s</xliff:g>, negados <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desativado pela otimização de bateria</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Exibir aplicativos do usuário</string>
   <string name="app_ops_show_system_apps">Exibir aplicativos pré-instalados</string>
-  <string name="app_ops_reset_counters">Redefinir contadores permitir/negar</string>
-  <string name="app_ops_reset_confirm_title">Confirmar redefinição de contadores</string>
-  <string name="app_ops_reset_confirm_mesg">Tem certeza que deseja redefinir os contadores?</string>
+  <string name="app_ops_reset_counters">Zerar contadores permitidos/negados</string>
+  <string name="app_ops_reset_confirm_title">Confirmar zerar contadores</string>
+  <string name="app_ops_reset_confirm_mesg">Tem certeza que deseja zerar os contadores?</string>
   <string name="ok">OK</string>
   <!-- Hostname setting -->
   <string name="device_hostname">Nome do dispositivo</string>
@@ -439,51 +440,51 @@
   <string name="unlock_scramble_pin_layout_summary">Embaralhar PIN ao desbloquear o dispositivo</string>
   <string name="button_pref_title">Botões</string>
   <string name="hardware_keys_power_key_title">Botão liga/desliga</string>
-  <string name="hardware_keys_home_key_title">Botão home</string>
+  <string name="hardware_keys_home_key_title">Botão início</string>
   <string name="hardware_keys_back_key_title">Botão voltar</string>
   <string name="hardware_keys_menu_key_title">Botão menu</string>
-  <string name="hardware_keys_assist_key_title">Botão busca</string>
+  <string name="hardware_keys_assist_key_title">Botão buscar</string>
   <string name="hardware_keys_appswitch_key_title">Botão recentes</string>
   <string name="hardware_keys_camera_key_title">Botão da câmera</string>
   <string name="hardware_keys_volume_keys_title">Botões de volume</string>
   <string name="hardware_keys_short_press_title">Ação de toque rápido</string>
   <string name="hardware_keys_long_press_title">Ação de toque longo</string>
   <string name="hardware_keys_double_tap_title">Ação de toque duplo</string>
-  <string name="hardware_keys_action_nothing">Sem ação</string>
+  <string name="hardware_keys_action_nothing">Nenhuma ação</string>
   <string name="hardware_keys_action_menu">Abrir/fechar menu</string>
-  <string name="hardware_keys_action_app_switch">Alternador de apps recentes</string>
+  <string name="hardware_keys_action_app_switch">Alternador de aplicativos recentes</string>
   <string name="hardware_keys_action_search">Assistente de busca</string>
   <string name="hardware_keys_action_voice_search">Busca por voz</string>
-  <string name="hardware_keys_action_in_app_search">Busca dentro do app</string>
-  <string name="hardware_keys_action_launch_camera">Iniciar a câmera</string>
+  <string name="hardware_keys_action_in_app_search">Busca dentro do aplicativo</string>
+  <string name="hardware_keys_action_launch_camera">Abrir câmera</string>
   <string name="hardware_keys_action_sleep">Desligar a tela</string>
   <string name="hardware_keys_action_last_app">Último aplicativo</string>
   <string name="camera_sleep_on_release_title">Espiar a tela</string>
   <string name="camera_sleep_on_release_summary">Toque parcial irá manter a tela ligada somente enquanto o botão for segurado</string>
-  <string name="camera_launch_title">Iniciar a câmera</string>
-  <string name="camera_launch_summary">Pressione, segure e solte para iniciar a câmera</string>
-  <string name="volbtn_music_controls_title">Botão volume controla música</string>
-  <string name="volbtn_music_controls_summary">Quando a tela estiver desligada, manter pressionado botão de volume buscará musicas</string>
+  <string name="camera_launch_title">Abrir câmera</string>
+  <string name="camera_launch_summary">Pressione, segure e solte para abrir a câmera</string>
+  <string name="volbtn_music_controls_title">Controle de reprodução</string>
+  <string name="volbtn_music_controls_summary">Quando a tela estiver desligada, mantenha pressionado o botão de volume para buscar músicas</string>
   <string name="volbtn_cursor_control_title">Controle de cursor do teclado</string>
   <string name="volbtn_cursor_control_off">Desativado</string>
   <string name="volbtn_cursor_control_on">Volume para cima/baixo move o cursor para esquerda/direita</string>
   <string name="volbtn_cursor_control_on_reverse">Volume para cima/baixo move cursor para direita/esquerda</string>
-  <string name="power_end_call_title">Encerrar chamada</string>
-  <string name="power_end_call_summary">Pressionar o botão liga/desliga encerrará a chamada em andamento</string>
+  <string name="power_end_call_title">Desligar</string>
+  <string name="power_end_call_summary">Pressionar o botão de energia desliga a chamada</string>
   <string name="swap_volume_buttons_title">Reorientar</string>
-  <string name="swap_volume_buttons_summary">Inverter botões de volume quando virar a tela</string>
+  <string name="swap_volume_buttons_summary">Inverter botões de volume quando a tela estiver invertida</string>
   <string name="button_wake_title">Acordar o dispositivo</string>
-  <string name="home_answer_call_title">Atender chamada</string>
-  <string name="home_answer_call_summary">Pressionar o botão home irá atender a chamada</string>
+  <string name="home_answer_call_title">Atende</string>
+  <string name="home_answer_call_summary">Pressionar o botão início atende a chamada</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">Luz de fundo adaptável</string>
-  <string name="adaptive_backlight_summary">Variar de forma inteligente a luz de fundo da tela para ajudar a maximizar a vida da bateria e ao mesmo tempo mantendo a usabilidade</string>
+  <string name="adaptive_backlight_summary">Ajusta a luz de fundo da tela dinamicamente para maximizar a vida da bateria e manter a usabilidade</string>
   <!-- Sunlight readability enhancement screen -->
   <string name="sunlight_enhancement_title">Realçar com luz solar</string>
   <string name="sunlight_enhancement_summary">Realça o brilho da tela e a legibilidade sobre o brilho da luz solar</string>
   <!-- Color enhancement settings screen -->
   <string name="color_enhancement_title">Realce de cor</string>
-  <string name="color_enhancement_summary">Realçar dinamicamente a cor do visor</string>
+  <string name="color_enhancement_summary">Realça dinamicamente a cor do visor</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Luz de fundo</string>
   <string name="button_backlight_enabled">Iluminar botões</string>
@@ -508,19 +509,19 @@
   <string name="power_menu_lockdown_title">Bloqueio de dispositivo</string>
   <string name="power_menu_bug_report_title">Relatório de erros</string>
   <string name="power_menu_sound_title">Painel de som</string>
-  <string name="power_menu_bug_report_disabled">Relatório de erros está desativado nas configurações de desenvolvimento</string>
+  <string name="power_menu_bug_report_disabled">Relatório de erros desativado nas configurações de desenvolvedor</string>
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ativar barra de navegação na tela</string>
   <string name="disable_navkeys_summary">Ativar barra de navegação na tela e desativar botões físicos</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Toque duplo para dormir</string>
-  <string name="double_tap_to_sleep_summary">Dê um duplo toque na barra de status para desligar a tela</string>
+  <string name="double_tap_to_sleep_summary">Toque duas vezes na barra de status para desligar a tela</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evitar despertar acidental</string>
-  <string name="proximity_wake_summary">Verifique o sensor de proximidade antes de despertar a tela</string>
+  <string name="proximity_wake_summary">Verificar sensor de proximidade antes de despertar a tela</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
-  <string name="wake_when_plugged_or_unplugged_title">Acordar ao conectar</string>
-  <string name="wake_when_plugged_or_unplugged_summary">Ativar a tela quando conectar ou desconectar o carregador</string>
+  <string name="wake_when_plugged_or_unplugged_title">Acordar ao plugar</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Ativar a tela ao ligar ou desligar do carregador</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
   <string name="font_size_sample">Amostra</string>
@@ -531,7 +532,7 @@
   <string name="vibrator_warning">Valores maiores que %1$d não são recomendados</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibragem de cor</string>
-  <string name="color_calibration_summary">Calibra cores na tela</string>
+  <string name="color_calibration_summary">Calibra as cores da tela</string>
   <string name="color_red_title">Vermelho</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
@@ -544,18 +545,18 @@
   <string name="gamma_tuning_brightness">Brilho</string>
   <string name="gamma_tuning_saturation">Saturação</string>
   <!-- Launch music player when headset is connected -->
-  <string name="headset_connect_player_title">Abrir app de música</string>
-  <string name="headset_connect_player_summary">Iniciar o app de música padrão quando os fones de ouvido forem conectados</string>
+  <string name="headset_connect_player_title">Abrir aplicativo de música</string>
+  <string name="headset_connect_player_summary">Abrir o aplicativo de música padrão quando os fones de ouvido forem conectados</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioridade automática</string>
   <string name="auto_brightness_reset_button">Restaurar</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">Rotação</string>
-  <string name="display_rotation_disabled">Desabilitada</string>
+  <string name="display_rotation_disabled">Desativada</string>
   <string name="display_rotation_unit">graus</string>
-  <string name="display_lockscreen_rotation_title">Rotacionar tela de bloqueio</string>
+  <string name="display_lockscreen_rotation_title">Girar tela de bloqueio</string>
   <string name="display_rotation_category_title">Modos de rotação</string>
-  <string name="display_rotation_0_title">0 graus</string>
+  <string name="display_rotation_0_title">0 grau</string>
   <string name="display_rotation_90_title">90 graus</string>
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
@@ -575,7 +576,7 @@
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza sua tela com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir o cansaço visual</string>
-  <string name="live_display_mode">Modo de exibição</string>
+  <string name="live_display_mode">Modo da tela</string>
   <string name="live_display_color_temperature_title">Temperatura da cor</string>
   <string name="live_display_color_temperature_summary">Dia: <xliff:g id="day_temperature">%1$d</xliff:g>K  Noite: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
   <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
@@ -586,7 +587,7 @@
   <string name="live_display_low_power_title">Reduzir o consumo de energia</string>
   <string name="live_display_low_power_summary">Ajustar exibição para menor consumo de energia, sem degradação</string>
   <string name="live_display_enhance_color_title">Realçar cores</string>
-  <string name="live_display_enhance_color_summary">Melhorar a vivacidade da cor de tons de pele, cenário, e outras imagens</string>
+  <string name="live_display_enhance_color_summary">Melhorar a vivacidade da cor de tons de pele, cenário e outras imagens</string>
   <string name="live_display_color_profile_title">Perfil de cor</string>
   <string name="live_display_color_profile_standard_title">Padrão</string>
   <string name="live_display_color_profile_standard_summary">Cores precisas e brancos brilhantes</string>
@@ -607,13 +608,13 @@
   <string name="ime_switcher_notify_summary">Mostrar ícone de seleção de método de entrada</string>
   <!-- Heads up -->
   <string name="heads_up_notifications">Heads up</string>
-  <string name="summary_heads_up_enabled">Notificações pop-up estão ativadas</string>
-  <string name="summary_heads_up_disabled">As notificações pop-up estão desativadas</string>
+  <string name="summary_heads_up_enabled">Notificações pop-up ativadas</string>
+  <string name="summary_heads_up_disabled">Notificações pop-up desativadas</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
   <string name="bluetooth_accept_all_files">Aceitar todos os tipos de arquivo</string>
   <!-- High touch sensitivity -->
   <string name="high_touch_sensitivity_title">Toque de alta sensibilidade</string>
-  <string name="high_touch_sensitivity_summary">Aumenta a sensibilidade da tela para poder ser usada enquanto usando luvas</string>
+  <string name="high_touch_sensitivity_summary">Aumenta a sensibilidade da tela para poder ser usada com luvas</string>
   <!-- Display & Lights screen, setting options for LCD density -->
   <string name="lcd_density">Densidade do LCD</string>
   <string name="dialog_title_lcd_density">Densidade do LCD</string>
@@ -647,9 +648,9 @@
   <string name="stylus_app_not_installed">%s não está instalado</string>
   <!-- Touchscreen hovering -->
   <string name="touchscreen_hovering_title">Flutuar o dedo na tela</string>
-  <string name="touchscreen_hovering_summary">Ele permite que você flutue o dedo na tela como um mouse em navegadores web, desktops remotos, etc</string>
+  <string name="touchscreen_hovering_summary">Permite que você flutue o dedo na tela como um mouse em navegadores web, desktops remotos, etc</string>
   <!-- Increasing ring tone volume -->
-  <string name="increasing_ring_volume_option_title">Aumento gradativo do volume do toque</string>
+  <string name="increasing_ring_volume_option_title">Aumentando volume do toque</string>
   <string name="increasing_ring_min_volume_title">Volume inicial</string>
   <string name="increasing_ring_ramp_up_time_title">Intervalo de aumento</string>
   <!-- LTO download data over wi-fi only -->
@@ -658,9 +659,9 @@
   <string name="lto_download_data_wifi_only_off">Somente através de redes Wi\u2011Fi</string>
   <string name="volume_keys_control_ring_stream_title">Controle de volume do toque</string>
   <string name="volume_keys_control_ring_stream_summary_on">Botões de volume controlam o volume do toque</string>
-  <string name="volume_keys_control_ring_stream_summary_off">Teclas de volume controlam o volume de mídia</string>
-  <string name="category_calibration">Calibração</string>
-  <string name="display_and_lights">Tela e Luzes</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Teclas de volume controlam o volume da mídia</string>
+  <string name="category_calibration">Calibragem</string>
+  <string name="display_and_lights">Tela e luzes</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
   <string name="power_notifications_category_title">Notificação de carregamento</string>
@@ -676,11 +677,11 @@
   <!-- Status bar -->
   <string name="status_bar_title">Barra de status</string>
   <string name="status_bar_toggle_brightness">Controle de brilho</string>
-  <string name="status_bar_toggle_brightness_summary">Permite ajustar o brilho deslizando através da barra de status</string>
-  <string name="status_bar_notif_count_title">Mostrar contador de notificação</string>
-  <string name="status_bar_notif_count_summary">Mostrar o número de notificações pendentes na barra de status</string>
-  <string name="status_bar_quick_qs_pulldown_title">Puxar para baixo rápido</string>
-  <string name="status_bar_quick_qs_pulldown_summary">%1$s borda da barra de status para puxar configurações rápidas</string>
+  <string name="status_bar_toggle_brightness_summary">Permite ajustar o brilho deslizando de lado na barra de status</string>
+  <string name="status_bar_notif_count_title">Mostrar contador de notificações</string>
+  <string name="status_bar_notif_count_summary">Mostra o número de notificações pendentes na barra de status</string>
+  <string name="status_bar_quick_qs_pulldown_title">Puxada rápida para baixo</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s borda da barra de status puxa configurações rápidas</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Esquerda</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Direita</string>
   <string name="status_bar_quick_qs_pulldown_off">Desligado</string>
@@ -693,7 +694,7 @@
   <string name="status_bar_clock_style_center">Centro</string>
   <string name="status_bar_clock_style_hidden">Oculto</string>
   <string name="status_bar_am_pm_title">Estilo AM/PM</string>
-  <string name="status_bar_am_pm_info">O formato 24 horas está ativo</string>
+  <string name="status_bar_am_pm_info">Relógio 24 horas ativo</string>
   <string name="status_bar_am_pm_normal">Normal</string>
   <string name="status_bar_am_pm_small">Pequeno</string>
   <string name="status_bar_am_pm_hidden">Oculto</string>
@@ -713,8 +714,8 @@
   <string name="status_bar_icons_title">Ícones da barra de status</string>
   <string name="status_bar_icons_summary">Controle quais ícones da barra de status são mostrados</string>
   <!-- EdgeGesture service -->
-  <string name="edge_gesture_service_title">Bloquear eventos de gestos de touch</string>
-  <string name="edge_gesture_service_summary">Não enviar eventos de touch da barra de navegação e status para os apps</string>
+  <string name="edge_gesture_service_title">Bloquear eventos de gestos de toque</string>
+  <string name="edge_gesture_service_summary">Não enviar eventos de toque da barra de navegação e status para os aplicativos</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">Nunca</string>
   <string name="keep_screen_on_debugging">Durante a depuração USB</string>
@@ -722,21 +723,21 @@
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">Privacidade</string>
   <!-- Privacy Guard -->
-  <string name="privacy_guard_default_title">Proteção à Privacidade</string>
-  <string name="privacy_guard_default_summary">Ativar por padrão Proteção à Privacidade aos aplicativos novos instalados</string>
-  <string name="privacy_guard_manager_title">Proteção à Privacidade</string>
-  <string name="privacy_guard_manager_summary">Gerenciar quais aplicativos têm acesso aos seus dados pessoais</string>
+  <string name="privacy_guard_default_title">Ativado por padrão</string>
+  <string name="privacy_guard_default_summary">Ativar por padrão para aplicativos recém-instalados</string>
+  <string name="privacy_guard_manager_title">Proteção à privacidade</string>
+  <string name="privacy_guard_manager_summary">Gerencie quais aplicativos têm acesso aos seus dados pessoais</string>
   <string name="privacy_guard_no_user_apps">Nenhum aplicativo está instalado</string>
   <string name="privacy_guard_help_title">Ajuda</string>
   <string name="privacy_guard_reset_title">Redefinir</string>
   <string name="privacy_guard_reset_text">Redefinir permissões?</string>
-  <string name="privacy_guard_help_text">Nesta tela você pode escolher quais aplicativos a Proteção à Privacidade deve estar ativa ao simplesmente tocar neles. Os aplicativos selecionados não serão capazes de acessar seus dados pessoais, como contatos, mensagens ou registos de chamadas. Pressionando e segurando um item de aplicativo, abre a tela de detalhes do aplicativo.\n\nAplicativos do sistema não são exibidos por padrão, mas podem ser exibidos selecionando a respectiva opção no menu.</string>
+  <string name="privacy_guard_help_text">Nesta tela você pode escolher para quais aplicativos a Proteção à Privacidade deve funcionar simplesmente tocando neles. Os aplicativos selecionados não poderão acessar seus dados pessoais, como contatos, mensagens ou registos de chamadas. Pressionando e segurando um item de aplicativo, a tela de detalhes do aplicativo é exibida.\n\nAplicativos do sistema não são exibidos por padrão, mas podem ser exibidos selecionando-se a respectiva opção no menu.</string>
   <string name="privacy_guard_manager_show_system_apps">Mostrar aplicativos de sistema</string>
   <string name="privacy_guard_advanced_settings_title">Avançado</string>
   <string name="privacy_guard_notification_title">Mostrar notificação</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
-  <string name="lockpattern_settings_enable_error_path_title">Exibir erro no padrão</string>
+  <string name="lockpattern_settings_enable_error_path_title">Exibir erro de padrão</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">Exibir pontos no padrão</string>
   <!-- Whether the keyguard will directly pass to password entry -->
@@ -744,7 +745,7 @@
   <!-- Whether the keyguard will directly pass to pattern view -->
   <string name="lock_directly_show_pattern">Exibir diretamente o padrão</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
-  <string name="lock_directly_show_pin">Exibir diretamente a entrada PIN</string>
+  <string name="lock_directly_show_pin">Exibir diretamente a digitação de PIN</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Mostrar o visualizador de música</string>
   <!-- lock screen disabled by QS tile warning -->
@@ -752,7 +753,7 @@
   <string name="lockscreen_disabled_by_qs_tile_summary">Toque para ativar a tela de bloqueio</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Tela de bloqueio ativada!</string>
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">Iniciar economia de bateria</string>
+  <string name="battery_saver_threshold">Limite de economia de bateria</string>
   <string name="battery_saver_summary">Reduzir o desempenho e desativar os dados em segundo plano</string>
   <string name="battery_saver_summary_unavailable">Indisponível enquanto estiver carregando</string>
   <!-- Battery : Automatic performance profiles -->
@@ -760,12 +761,12 @@
   <string name="autoperf_summary">Escolher automaticamente um modo de bateria apropriado para vários aplicativos</string>
   <string name="perf_profile_title">Modo de bateria</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">Apps iniciados na inicialização</string>
+  <string name="memory_startup_apps_title">Aplicativos iniciados ao ligar</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Toque de notificação</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">Reinicialização avançada</string>
-  <string name="advanced_reboot_summary">Quando desbloqueado, incluem opções no menu de energia para reiniciar em recuperação, bootloader ou realizar em reiniciar via software</string>
+  <string name="advanced_reboot_summary">Quando desbloqueado, incluem opções no menu de energia para reiniciar em modo de recuperação, bootloader ou reinicialização via software</string>
   <string name="category_interface">Interface</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Área de trabalho expandida</string>
@@ -773,35 +774,35 @@
   <string name="expanded_hide_status">Ocultar barra de status</string>
   <string name="expanded_hide_navigation">Ocultar a barra de navegação</string>
   <string name="expanded_hide_both">Ocultar ambas</string>
-  <string name="expanded_nothing_to_show">Para adicionar uma configuração personalizada por aplicativo para estado expandido, defina \'Ativado para todos\' para a posição desligada</string>
+  <string name="expanded_nothing_to_show">Para adicionar uma configuração personalizada por aplicativo para estado expandido, desligue a opção \'Ativado para todos\'</string>
   <string name="expanded_enabled_for_all">Ativado para todos</string>
   <string name="expanded_desktop_style">Estilo da área de trabalho expandida</string>
   <string name="expanded_desktop_style_description">Escolha o estilo padrão da área de trabalho expandida</string>
   <string name="expanded_desktop_title">Opções da área de trabalho expandida</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">Matar app com botão voltar</string>
-  <string name="kill_app_longpress_back_summary">Matar o aplicativo aberto ao manter pressionado o botão voltar</string>
+  <string name="kill_app_longpress_back">Fechar aplicativo com botão voltar</string>
+  <string name="kill_app_longpress_back_summary">Fecha o aplicativo aberto ao manter pressionado o botão voltar</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">Mostrar barra de pesquisa no menu recentes</string>
-  <string name="keywords_recents_show_searchbar">recente recentes disativar ativar mostrar ocultar pesquisa barra barra de pesquisa</string>
+  <string name="keywords_recents_show_searchbar">recente recentes desativar ativar mostrar ocultar buscar barra barradepesquisa</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">Ativação de voz</string>
-  <string name="voice_wakeup_retrain_title">Re-treinar sua voz</string>
+  <string name="voice_wakeup_retrain_title">Retreinar sua voz</string>
   <string name="voice_wakeup_activity_title">Atividade para iniciar</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
   <string name="voice_wakeup_needs_dial_permission_warning">Ativação por voz precisa ter permissões de chamada para selecionar um contato de Discagem Direta.</string>
   <string name="picker_activities">Atividades</string>
-  <string name="select_custom_app_title">Selecione a aplicação personalizada</string>
+  <string name="select_custom_app_title">Selecione aplicativo personalizado</string>
   <string name="select_custom_activity_title">Selecione atividade personalizada</string>
   <!-- Blacklist preferences -->
   <string name="blacklist_title">Lista de chamadas bloqueadas</string>
   <string name="blacklist_edit_dialog_title">Editar número de telefone bloqueado</string>
   <string name="blacklist_prefs">Confirgurações</string>
   <string name="blacklist_button_delete">Remover</string>
-  <string name="blacklist_empty_text">Você não possui nenhum número na lista de bloqueio. Adicione um número ao tocar no botão adicionar (+).</string>
-  <string name="blacklist_disabled_empty_text">Para evitar que números de telefone te liguem ou mandem mensagens para você, habilite a lista de chamadas bloqueadas.</string>
+  <string name="blacklist_empty_text">Você não possui nenhum número na lista de bloqueio. Adicione um número tocando no botão adicionar (+).</string>
+  <string name="blacklist_disabled_empty_text">Para evitar que números de telefone liguem ou mandem mensagens para você, habilite a lista de chamadas bloqueadas.</string>
   <string name="blacklist_summary_disabled">Desativado</string>
-  <string name="blacklist_summary">Você não vai receber chamadas ou mensagens a partir de números de telefone na lista de chamadas bloqueadas</string>
+  <string name="blacklist_summary">Você não vai receber chamadas ou mensagens dos números de telefone na lista de chamadas bloqueadas</string>
   <string name="blacklist_notify">Mostrar notificação</string>
   <string name="blacklist_private_numbers_title">Números privados</string>
   <string name="blacklist_private_numbers_summary_disabled">Não bloquear chamadas de números privados</string>
@@ -812,24 +813,24 @@
   <string name="blacklist_summary_type_calls_only">chamadas</string>
   <string name="blacklist_summary_type_messages_only">mensagens</string>
   <string name="blacklist_summary_type_calls_and_messages">chamadas e mensagens</string>
-  <string name="blacklist_regex_title">Usar wildcards</string>
-  <string name="blacklist_regex_summary">Usar . como um wildcard e * para repetição. Ex. 123.* bloqueia números que começam com 123 e .*123.* bloqueia números que contém 123</string>
+  <string name="blacklist_regex_title">Usar caracteres curinga</string>
+  <string name="blacklist_regex_summary">Usar . como um curinga e * para repetição. Ex. 123.* bloqueia números que começam com 123 e .*123.* bloqueia números que contenham 123</string>
   <string name="blacklist_policy_block_calls">Bloquear chamadas recebidas</string>
   <string name="blacklist_policy_block_messages">Bloquear mensagens recebidas</string>
-  <string name="blacklist_bad_number_add">Não é possível adicionar o número de telefone inválido à lista de chamadas bloqueadas</string>
+  <string name="blacklist_bad_number_add">Não é possível adicionar um número de telefone inválido à lista de chamadas bloqueadas</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">Remover número</string>
-  <string name="remove_blacklist_entry">Você deseja remover este número de telefone bloqueado?</string>
+  <string name="remove_blacklist_entry">Deseja remover este número de telefone bloqueado?</string>
   <string name="select_contact">Selecionar contato</string>
   <!-- Sms security limit -->
   <string name="app_security_title">Segurança dos aplicativos</string>
   <string name="sms_security_check_limit_title">Limite de mensagens SMS</string>
   <string name="sms_security_check_limit_summary">Aplicativos podem enviar %d mensagens durante 1 minuto antes de exigir confirmação</string>
-  <string name="sms_security_check_limit_summary_none">Apps não são permitidos enviar qualquer mensagem sem confirmação</string>
+  <string name="sms_security_check_limit_summary_none">Aplicativos não podem enviar nenhuma mensagem sem confirmação</string>
   <string name="sms_security_check_limit_none">Nenhum</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">Adicionado %1$s</string>
-  <string name="spam_last_blocked_title">Última bloqueada %1$s</string>
+  <string name="spam_last_blocked_title">Último bloqueio: %1$s</string>
   <string name="block_notifications_title">Filtrar notificações</string>
   <string name="block_notifications_summary">Gerenciar notificações e filtros ignorados</string>
   <string name="no_filters_title">Nenhum filtro definido</string>
@@ -838,7 +839,7 @@
   <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
   <string name="anonymous_statistics_summary">Ajude a melhorar o CyanogenMod optando por enviar estatísticas anônimas</string>
   <string name="anonymous_statistics_warning_title">Sobre</string>
-  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas do CyanogenMod permitirá que dados não-pessoais sejam enviados para os desenvolvedores do CyanogenMod para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único, que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara um exemplo de dados que são enviados, toque em \'Pré-visualizar dados\'.</string>
+  <string name="anonymous_statistics_warning">Optar por enviar estatísticas anônimas ao CyanogenMod permitirá que dados não-pessoais sejam enviados para os desenvolvedores do CyanogenMod para rastrear instalações únicas em dispositivos. As informações enviadas incluem um identificador único que não compromete sua privacidade ou dados pessoais. Os dados são enviados durante cada inicialização.\n\nPara ver um exemplo dos dados enviados, toque em \'Pré-visualizar dados\'.</string>
   <string name="enable_reporting_title">Ativar relatório</string>
   <string name="preview_data_title">Pré-visualizar dados</string>
   <string name="view_stats_title">Ver estatísticas</string>
@@ -853,12 +854,12 @@
   <string name="stats_collection_summary">Quando ativado, permite a coleta de métricas</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">Redefinir padrão</string>
-  <string name="lockpattern_settings_reset_summary">Introduza a conta de e-mail principal e a senha associada para redefinir o bloqueio padrão</string>
+  <string name="lockpattern_settings_reset_summary">Digite a conta de e-mail principal e a senha associada para redefinir o bloqueio padrão</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">Redefinir</string>
   <string name="menu_hidden_apps_reset_lock">Redefinir o bloqueio padrão</string>
   <string name="protected_apps">Aplicativos protegidos</string>
-  <string name="protected_apps_summary">Gerenciar quais apps estão escondidos atrás da trava de segurança</string>
+  <string name="protected_apps_summary">Gerenciar quais aplicativos ficam escondidos atrás da trava de segurança</string>
   <string name="saving_protected_components">Salvando o estado dos componentes\u2026</string>
   <string name="pa_login_username_hint">Nome de usuário (e-mail)</string>
   <string name="pa_login_password_hint">Senha</string>
@@ -868,18 +869,18 @@
   <string name="pa_pattern_or_fingerprint_header">Desenhe o padrão ou use a impressão digital para desbloquear</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Colaboradores</string>
-  <string name="contributors_cloud_loading_message">Lendo os dados dos contribuintes\u2026</string>
-  <string name="contributors_cloud_failed_message">Não é possível carregar dados dos contribuintes</string>
+  <string name="contributors_cloud_loading_message">Lendo os dados dos colaboradores\u2026</string>
+  <string name="contributors_cloud_failed_message">Não é possível carregar dados dos colaboradores</string>
   <string name="contributor_info_menu">Informação do colaborador</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Nome:</b><xliff:g id="name">%1$s </xliff:g><br/><br/>
                  <b>Apelido:</b><xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Contribuições:</b><xliff:g id="commits">%3$s</xliff:g>]]></string>
-  <string name="contributions_info_menu">Informação de contribuições</string>
+  <string name="contributions_info_menu">Informação de colaborações</string>
   <string name="contributions_info_msg">
         <![CDATA[<b>Total de Colaboradores:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
-                 <b>Total de contribuições:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
-                 <b>Última Atualização:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+                 <b>Total de colaborações:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Última atualização:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Sons</string>
   <string name="notification_manager">Notificações</string>
   <string name="lockscreen_settings">Tela de bloqueio</string>
@@ -889,8 +890,8 @@
   <string name="category_misc">Diversos</string>
   <string name="title_general">Geral</string>
   <string name="advanced">Avançado</string>
-  <string name="link_volume_option_title">Unir volumes de toques e notificações</string>
-  <string name="lcd_density_prompt_message">Alguns apps podem não funcionar com uma configuração fora do padrão de dpi.\n\nIsto irá reiniciar seu telefone.</string>
+  <string name="link_volume_option_title">Ligar volumes de toques e notificações</string>
+  <string name="lcd_density_prompt_message">Alguns aplicativos podem não funcionar com uma configuração fora do padrão de dpi.\n\nSeu dispositivo será reiniciado.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Número de telefone de APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
@@ -904,7 +905,7 @@
   <string name="sim_enabler_need_switch_data_service">Este cartão SIM será desativado e o cartão SIM <xliff:g id="slotid">%1$s</xliff:g> será usado para serviços de dados. Tem certeza que deseja continuar?</string>
   <string name="sim_enabler_airplane_on">Não é possível executar a operação enquanto o modo avião estiver ativado.</string>
   <string name="sim_enabler_in_call">Não é possível executar a operação enquanto estiver numa chamada.</string>
-  <string name="sim_enabler_both_inactive">Não é possível desativas todos os cartões SIM</string>
+  <string name="sim_enabler_both_inactive">Não é possível desativar todos os cartões SIM</string>
   <string name="sim_enabler_enabling">Ativando\u2026</string>
   <string name="sim_enabler_disabling">Desativando\u2026</string>
   <string name="sub_activate_success">SIM ativado.</string>
@@ -915,7 +916,7 @@
   <string name="select_sim_card">Selecione o cartão SIM</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Estado do SIM %d</string>
-  <string name="sim_card_lock_settings_title">Definições de bloqueio do SIM %d</string>
+  <string name="sim_card_lock_settings_title">Configurações de bloqueio do SIM %d</string>
   <string name="sim_card_summary_empty">SIM não inserido</string>
   <string name="sim_mobile_network_settings_category_title">Configurações de rede móvel</string>
   <string name="sim_mobile_network_settings_title">Configurações do SIM %d</string>
@@ -943,20 +944,20 @@
   <!-- label for usage time -->
   <string name="usage_time_label_cm">Tempo de uso:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="tablet">Isto irá apagar todos os dados do <b>armazenamento interno</b> do seu tablet, incluindo:\n\n<li>Suas contas do dispositivo</li>\n<li>Dados e configurações do sistema e de aplicativos</li>\n<li>Aplicativos baixados</li></string>
+  <string name="master_clear_desc_cm" product="tablet">Todos os dados do <b>armazenamento interno</b> do seu tablet serão apagados, incluindo:\n\n<li>Suas contas do dispositivo</li>\n<li>Dados e configurações do sistema e de aplicativos</li>\n<li>Aplicativos baixados</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">Isto irá apagar todos os dados do <b>armazenamento interno</b> do seu telefone, incluindo:\n\n<li>Suas contas do dispositivo</li>\n<li>Dados e configurações do sistema e de aplicativos</li>\n<li>Aplicativos baixados</li></string>
+  <string name="master_clear_desc_cm" product="default">Todos os dados do <b>armazenamento interno</b> do seu telefone serão apagados, incluindo:\n\n<li>Suas contas do dispositivo</li>\n<li>Dados e configurações do sistema e de aplicativos</li>\n<li>Aplicativos baixados</li></string>
   <!-- Factory reset strings -->
-  <string name="factory_reset_instructions_title">Dados pessoais e apps</string>
-  <string name="factory_reset_instructions_summary">Isto apagará todas as suas contas, apps, dados de apps, e configurações do sistema deste dispositivo</string>
+  <string name="factory_reset_instructions_title">Dados pessoais e aplicativos</string>
+  <string name="factory_reset_instructions_summary">Isto apagará todas as suas contas, aplicativos, dados de aplicativos e configurações de sistema deste dispositivo</string>
   <string name="factory_reset_personal_content">Conteúdo pessoal</string>
-  <string name="factory_reset_erase_stored_content">Apagar o conteúdo armazenado</string>
+  <string name="factory_reset_erase_stored_content">Apagar conteúdo armazenado</string>
   <string name="factory_reset_erase_stored_content_summary">Apagar músicas, fotos, vídeos e outros dados do usuário armazenados neste dispositivo</string>
   <string name="factory_reset_erase_stored_content_summary_forced">Apaga músicas, fotos, vídeos e outros dados do usuário armazenados neste dispositivo. \n\n<b>Conteúdo não pode ser salvo devido à criptografia do dispositivo.</b></string>
   <string name="factory_reset_erase_sd_card">Formatar cartão SD</string>
-  <string name="factory_reset_erase_sd_card_summary">Apagar todos os dados do cartão SD, incluindo músicas e fotos</string>
+  <string name="factory_reset_erase_sd_card_summary">Apaga todos os dados do cartão SD, incluindo músicas e fotos</string>
   <string name="factory_reset_warning_text_reset_now">REDEFINIR AGORA</string>
-  <string name="factory_reset_warning_text_message">Todas as suas contas, apps, dados de apps, e configurações do sistema serão removidas deste dispositivo. Isto não pode ser revertido.</string>
+  <string name="factory_reset_warning_text_message">Todas as suas contas, aplicativos, dados de aplicativos e configurações de sistema serão removidas deste dispositivo. Isto não pode ser revertido.</string>
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Outros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
@@ -983,9 +984,9 @@
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Redefinir estatísticas</string>
   <!-- Reset stats confirmation dialog's message -->
-  <string name="reset_stats_msg">Estatísticas do histórico da bateria será redefinida</string>
+  <string name="reset_stats_msg">Estatísticas do histórico da bateria serão zeradas</string>
   <!-- Dock battery not present message -->
-  <string name="dock_battery_not_present">Bateria do dock não está disponível</string>
+  <string name="dock_battery_not_present">Bateria do dock não disponível</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <string name="battery_info_status_charging_dock_ac">Carregamento via dock AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
@@ -995,4 +996,8 @@
   <string name="restrict_app_cellular_title">Impedir que o app o use a rede de celular</string>
   <string name="restrict_app_cellular_summary">Impedir que este app usar a conexão de dados celular</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Previsão do Tempo</string>
+  <string name="weather_settings_no_services_prompt">Não há provedor de previsão do tempo instalado</string>
+  <string name="weather_settings_button">Configurações do provedor</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index a9bfb15..274ec5f 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -80,7 +80,7 @@
   <string name="profile_write_success">A etiqueta foi escrita com sucesso</string>
   <string name="profile_write_failed">Ocorreu um problema ao escrever na etiqueta!</string>
   <string name="profile_selected">Perfil selecionado: %1$s</string>
-  <string name="profile_nfc_text">Escrever um perfil numa etiqueta NFC vai permitir encostar na etiqueta para selecionar o perfil. Encostar uma segunda vez selecionará o perfil escolhido anteriormente.</string>
+  <string name="profile_nfc_text">Escrever um perfil numa etiqueta NFC permite que, com um toque na etiqueta, selecione esse perfil. Tocar uma segunda vez selecionará o perfil anteriormente ativado.</string>
   <string name="profile_unknown_nfc_tag">Perfil desconhecido</string>
   <string name="profile_add_nfc_text">Esta etiqueta NFC refere-se a um perfil desconhecido. Anexar esta etiqueta NFC num perfil existente permitirá selecionar o perfil no futuro.</string>
   <string name="profile_select">Selecionar perfil</string>
@@ -430,6 +430,7 @@
   <string name="app_ops_allowed_count">Permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Negado <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permitido <xliff:g id="count">%1$s</xliff:g>, negado <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desativado pela otimização de bateria</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Mostrar aplicações do utilizador</string>
   <string name="app_ops_show_system_apps">Mostrar aplicações de sistema</string>
@@ -999,4 +1000,23 @@
   <string name="restrict_app_cellular_title">Desativar utilização dos dados móveis</string>
   <string name="restrict_app_cellular_summary">Impedir que a aplicação utilize ligações de dados móveis</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Meteorologia</string>
+  <string name="weather_settings_no_services_prompt">Não há serviços de provedor de meteorologia instalados</string>
+  <string name="weather_settings_button">Definições do provedor</string>
+  <string name="background_data_access">Acesso aos dados em 2º plano</string>
+  <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
+  <string name="allow_background_none">Sem acesso</string>
+  <string name="mobile_data_alert">Alerta de dados móveis</string>
+  <string name="mobile_data_alert_summary">Notificar quando a aplicação estiver a usar uma quantidade significativa de dados</string>
+  <string name="data_usage_menu_enable_data_alerts">Ativar alertas de uso de dados</string>
+  <string name="data_usage_menu_disable_data_alerts">Desativar alertas de uso de dados</string>
+  <string name="data_usage_menu_reset_stats">Redefinir as estatísticas de dados</string>
+  <string name="reset_data_stats_msg">Isto irá limpar todas as informações de rastreamento de dados</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restringir o acesso de dados móveis</string>
+  <string name="restrict_cellular_access_summary">Desativar o acesso de dados em redes móveis</string>
+  <string name="restrict_cellular_access_dialog_title">Restringir o acesso de dados móveis?</string>
+  <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que uma aplicação que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nPoderá encontrar ferramentas mais apropriadas para o controlo de dados nas definições disponíveis na aplicação.</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index df78f0c..e908d45 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -915,4 +915,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Încărcare prin stativ USB</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Vremea</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 731ebf3..38dd1ce 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1000,4 +1000,5 @@
   <string name="restrict_app_cellular_title">Запретить исп. моб. данные</string>
   <string name="restrict_app_cellular_summary">Не разрешать приложению передачу данных по мобильным сетям</string>
   <string name="privacy_guard_internet_category">Интернет</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 12e3640..cce1706 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -558,4 +558,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 6f1a1c4..0e3e1eb 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -880,4 +880,5 @@
   <string name="battery_info_status_charging_dock_ac">Nabíjanie pomocou napájania doku</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 7654055..f5ba62c 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -432,6 +432,7 @@
   <string name="app_ops_allowed_count">Dovoljeno <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_ignored_count">Zavrnjeno <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_both_count">Dovoljeno <xliff:g id="count">%1$s </xliff:g>, zavrnjeno <xliff:g id="count">%2$s </xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Onemogočeno z optimizacijo baterije</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Prikaži uporabniške aplikacije</string>
   <string name="app_ops_show_system_apps">Prikaži vgrajene aplikacije</string>
@@ -1003,4 +1004,23 @@
   <string name="restrict_app_cellular_title">Onemogoči aplikaciji uporabo mob. omrežja</string>
   <string name="restrict_app_cellular_summary">Prepreči aplikaciji uporabo mobilnih podatkov</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Vreme</string>
+  <string name="weather_settings_no_services_prompt">Ni nameščene storitve ponudnika vremena</string>
+  <string name="weather_settings_button">Nastavitve ponudnika</string>
+  <string name="background_data_access">Dostop do podatkov v ozadju</string>
+  <string name="allow_background_both">Preko mobilnih podatkov in omr. Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Samo preko omr. Wi\u2011Fi</string>
+  <string name="allow_background_none">Ni dostopa</string>
+  <string name="mobile_data_alert">Opozorilo mobilnih podatkov</string>
+  <string name="mobile_data_alert_summary">Obvesti, ko aplikacija uporablja znatno količino podatkov</string>
+  <string name="data_usage_menu_enable_data_alerts">Omogoči opozorila uporabe podatkov</string>
+  <string name="data_usage_menu_disable_data_alerts">Onemogoči opozorila uporabe podatkov</string>
+  <string name="data_usage_menu_reset_stats">Ponastavi statistiko podatkov</string>
+  <string name="reset_data_stats_msg">To bo izbrisalo vse prejšnje in trenutne podatke sledenja</string>
+  <string name="reset_stats_confirm">Potrdi</string>
+  <string name="restrict_cellular_access_title">Omeji dostop do mobilnih podatkov</string>
+  <string name="restrict_cellular_access_summary">Onemogoči dostop do podatkov na mobilnem omrežju</string>
+  <string name="restrict_cellular_access_dialog_title">Omeji dostop do mobilnih podatkov?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ta značilnost lahko povzroči, da aplikacija, ki je odvisna od dostopa do omrežja, preneha delovati, ko so na voljo samo mob. omrežja.\n\nPrimernejše nastavitve nadzora porabe podatkov lahko najdete v aplikaciji.</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index d7217a2..0acfd95 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -431,6 +431,7 @@
   <string name="app_ops_allowed_count">Дозвољено <xliff:g id="count" example="2 пута">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Одбијено <xliff:g id="count" example="2 пута">%s</xliff:g></string>
   <string name="app_ops_both_count">Дозвољено <xliff:g id="count">%1$s</xliff:g>, одбијено <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Онемогућено од оптимизације батерије</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Прикажи корисничке апликације</string>
   <string name="app_ops_show_system_apps">Прикажи уграђене апликације</string>
@@ -1000,4 +1001,8 @@
   <string name="restrict_app_cellular_title">Онемогући апликацију да користи мобилну мрежу</string>
   <string name="restrict_app_cellular_summary">Спречи апликацију да користи мобини пренос података</string>
   <string name="privacy_guard_internet_category">Интернет</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">Време</string>
+  <string name="weather_settings_no_services_prompt">Нема инсталираног добављача услуга временске прогнозе</string>
+  <string name="weather_settings_button">Поставке добављача</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 798a573..9aef4f3 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1002,4 +1002,5 @@ inkluderar en unik identifikation,
   <string name="restrict_app_cellular_title">Inaktivera appens tillgång till mobildata</string>
   <string name="restrict_app_cellular_summary">Förhindra att appen använder en mobildataanslutning</string>
   <string name="privacy_guard_internet_category">Internet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 211ca3a..ed5838c 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">டாக் ACயில் சார்ஜ் செய்கிறது</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">டாக் USB மீது சார்ஜ் செய்கிறது</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 394b5e2..3222b6e 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -992,4 +992,5 @@
   <string name="battery_info_status_charging_dock_ac">డాక్ AC పైన చార్జింగ్ అవుతుంది</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">డాక్ USB పైన చార్జింగ్ అవుతుంది</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index c12b5da..c086067 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -998,4 +998,5 @@
   <string name="restrict_app_cellular_title">ปิดการใช้งานทางโทรศัพท์ของแอป</string>
   <string name="restrict_app_cellular_summary">ป้องกันแอปจากการใช้การเชื่อมต่อข้อมูลทางโทรศัพท์</string>
   <string name="privacy_guard_internet_category">อินเทอร์เน็ต</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 6541fa4..e12560a 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -999,4 +999,5 @@
   <string name="restrict_app_cellular_title">Uygulama hücresel veri kullanımını devre dışı bırak</string>
   <string name="restrict_app_cellular_summary">Uygulamanın hücresel veri bağlantısını kullanmasını engelle</string>
   <string name="privacy_guard_internet_category">İnternet</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index a14a538..c95a0a0 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -998,4 +998,5 @@
   <string name="restrict_app_cellular_title">ئەپنىڭ كۆچمە تورنى ئىشلىتىشىنى چەكلەش</string>
   <string name="restrict_app_cellular_summary">ئەپنىڭ كۆچمە تورنى ئىشلىتىپ تورغا ئۇلىنىشىدىن ساقلىنىش</string>
   <string name="privacy_guard_internet_category">ئىنتېرنېت</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 3c88c5a..5ab0966 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -928,4 +928,5 @@
   <string name="battery_info_status_charging_dock_ac">Заряджаємось від блока живлення док-станції</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Заряджаємось від док-станції по USB</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index f44cecd..864fc1a 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -991,4 +991,5 @@
   <string name="battery_info_status_charging_dock_ac">Đang sạc trên AC của đế</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Đang sạc qua USB của đế</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 67c6840..76fbc60 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -426,6 +426,7 @@
   <string name="app_ops_allowed_count">允许 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">拒绝 <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">允许 <xliff:g id="count">%1$s</xliff:g>，拒绝 <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">已被电池优化禁用</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">显示用户应用</string>
   <string name="app_ops_show_system_apps">显示内置应用</string>
@@ -996,4 +997,23 @@
   <string name="restrict_app_cellular_title">禁止应用使用移动数据</string>
   <string name="restrict_app_cellular_summary">防止应用使用移动网络数据连接</string>
   <string name="privacy_guard_internet_category">互联网</string>
+  <!-- Weather -->
+  <string name="weather_settings_title">天气</string>
+  <string name="weather_settings_no_services_prompt">没有安装天气提供商服务</string>
+  <string name="weather_settings_button">提供商设置</string>
+  <string name="background_data_access">后台数据访问</string>
+  <string name="allow_background_both">仅通过移动数据 &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">仅通过 Wi\u2011Fi</string>
+  <string name="allow_background_none">没有访问权限</string>
+  <string name="mobile_data_alert">移动数据警报</string>
+  <string name="mobile_data_alert_summary">当应用使用了大量的数据时通知</string>
+  <string name="data_usage_menu_enable_data_alerts">启用数据用量警报</string>
+  <string name="data_usage_menu_disable_data_alerts">禁用数据用量警报</string>
+  <string name="data_usage_menu_reset_stats">重置数据用量统计</string>
+  <string name="reset_data_stats_msg">这将清除过去和现在的所有数据跟踪信息</string>
+  <string name="reset_stats_confirm">确认</string>
+  <string name="restrict_cellular_access_title">限制访问移动数据</string>
+  <string name="restrict_cellular_access_summary">禁用移动网络的数据访问</string>
+  <string name="restrict_cellular_access_dialog_title">限制访问移动数据？</string>
+  <string name="restrict_cellular_access_dialog_summary">此功能在仅有移动数据网络时可能会导致依赖网络访问的应用停止工作。\n\n您可以在设置中找到对于该应用更加合适的数据使用情况控制。</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 7442d01..055dc9f 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -820,4 +820,5 @@
   <string name="battery_info_status_charging_dock_ac">正在 AC 插口上充電</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
+  <!-- Weather -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 14fef8c..19b7fdc 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -857,4 +857,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 7e21bf5..82cf3b1 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -179,4 +179,5 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
 </resources>
-- 
cgit v1.1


From e61e4c454e8e63111b124067f63e1630a1d537dd Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Wed, 6 Apr 2016 14:53:14 -0700
Subject: Settings: Use cm build properties correctly.

TICKET: CYNGNOS-2379
Change-Id: I8342589c52d633c044570be02f48c7f5a48f788c
---
 src/com/android/settings/DeviceInfoSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 949eaab..6a7d970 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -135,7 +135,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_BUILD_NUMBER).setEnabled(true);
         findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
-        setValueSummary(KEY_MOD_VERSION, cyanogenmod.os.Build.CYANOGENMOD_DISPLAY_VERSION);
+        findPreference(KEY_MOD_VERSION).setSummary(
+                cyanogenmod.os.Build.CYANOGENMOD_DISPLAY_VERSION);
         findPreference(KEY_MOD_VERSION).setEnabled(true);
         setValueSummary(KEY_MOD_BUILD_DATE, "ro.build.date");
         setExplicitValueSummary(KEY_MOD_API_LEVEL, constructApiLevelString());
-- 
cgit v1.1


From 8516e98709733e44090b5fcd615b580e8a83599b Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Wed, 6 Apr 2016 10:58:03 -0700
Subject: Settings: Disable and hide refresh button on power usage detail.

  Users expect immediate return on their input, so don't allow
  the input.

Change-Id: I5c2553ed6fb5dc617b458123e1e13590d64f4ba1
TICKET: CRACKLING-1035
---
 src/com/android/settings/fuelgauge/PowerUsageBase.java  | 17 ++++++++++++-----
 .../android/settings/fuelgauge/PowerUsageDetail.java    |  1 +
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/fuelgauge/PowerUsageBase.java b/src/com/android/settings/fuelgauge/PowerUsageBase.java
index 269249a..5a6bd1b 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageBase.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageBase.java
@@ -46,6 +46,7 @@ public abstract class PowerUsageBase extends SettingsPreferenceFragment {
 
     private String mBatteryLevel;
     private String mBatteryStatus;
+    private boolean mHideRefresh = false;
 
     @Override
     public void onAttach(Activity activity) {
@@ -102,11 +103,13 @@ public abstract class PowerUsageBase extends SettingsPreferenceFragment {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
-        MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
-                .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
-                .setAlphabeticShortcut('r');
-        refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        if (!mHideRefresh) {
+            MenuItem refresh = menu.add(0, MENU_STATS_REFRESH, 0, R.string.menu_stats_refresh)
+                    .setIcon(com.android.internal.R.drawable.ic_menu_refresh)
+                    .setAlphabeticShortcut('r');
+            refresh.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                    MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        }
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {
@@ -142,6 +145,10 @@ public abstract class PowerUsageBase extends SettingsPreferenceFragment {
         return false;
     }
 
+    void hideRefreshButton(boolean hide) {
+        mHideRefresh = hide;
+    }
+
     static final int MSG_REFRESH_STATS = 100;
 
     private final Handler mHandler = new Handler() {
diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 910daa7..26102c0 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -353,6 +353,7 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
         mControlsParent = (PreferenceCategory) findPreference(KEY_CONTROLS_PARENT);
         mMessagesParent = (PreferenceCategory) findPreference(KEY_MESSAGES_PARENT);
         mPackagesParent = (PreferenceCategory) findPreference(KEY_PACKAGES_PARENT);
+        hideRefreshButton(true);
 
         createDetails();
     }
-- 
cgit v1.1


From 8b7fda7bd00cbebeb15455b0b8c3655ea09a10dd Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Fri, 15 Aug 2014 11:35:54 -0700
Subject: Settings: use ActivityManager method for requesting bug report

This let's ActivityManagerService handle all the logic for requesting
bug reports.

Ticket: CYNGNOS-2329
Change-Id: I44e6a9295a0625bcdc0f3a22daf097bdccf0d3c4
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 3d56d11794d8a5c3637a347986c9d2908e096d19)
(cherry picked from commit 952b0d9acb2ce0cbf42728a65d77fcba2885adb4)
---
 src/com/android/settings/BugreportPreference.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index ba58ef4..ca4fa1d 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -16,11 +16,12 @@
 
 package com.android.settings;
 
+import android.app.ActivityManagerNative;
 import android.app.AlertDialog.Builder;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.os.SystemProperties;
+import android.os.RemoteException;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
 import android.view.View;
@@ -55,7 +56,11 @@ public class BugreportPreference extends DialogPreference {
     @Override
     public void onClick(DialogInterface dialog, int which) {
         if (which == DialogInterface.BUTTON_POSITIVE) {
-            SystemProperties.set("ctl.start", "bugreport");
+            try {
+                ActivityManagerNative.getDefault().requestBugReport();
+            } catch (RemoteException e) {
+                // ignore
+            }
         }
     }
 }
-- 
cgit v1.1


From 467fae0d11044f3642779ae8dfdd1172c8ea3161 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Thu, 7 Apr 2016 00:59:38 +0200
Subject: Add explanation for customizing apps

Settings->Display & LEDs->Notification light->Apps

Currently this is header only if no apps are added yet.
Populate it with an explanation when it's empty.

Change-Id: I83193dfdd01f05bcd1d597033ef710a1b0eb7e82
---
 res/values/cm_strings.xml                                    |  1 +
 .../notificationlight/NotificationLightSettings.java         | 12 ++++++++++++
 2 files changed, 13 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 44c7548..a390a9a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -310,6 +310,7 @@
     <!-- Lights settings, LED notification -->
     <string name="led_notification_title">Light settings</string>
     <string name="led_notification_text">LED light enabled by settings</string>
+    <string name="notification_light_no_apps_summary">To add per app control, activate \'%1$s\' and press \'\u002b\' on the menu bar</string>
 
     <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
     <string name="enable_adb_cm">Android debugging</string>
diff --git a/src/com/android/settings/notificationlight/NotificationLightSettings.java b/src/com/android/settings/notificationlight/NotificationLightSettings.java
index 95a354d..c4b55d4 100644
--- a/src/com/android/settings/notificationlight/NotificationLightSettings.java
+++ b/src/com/android/settings/notificationlight/NotificationLightSettings.java
@@ -284,6 +284,18 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
                     // Do nothing
                 }
             }
+
+            /* Display a pref explaining how to add apps */
+            if (mPackages.size() == 0) {
+                String summary = getResources().getString(
+                        R.string.notification_light_no_apps_summary);
+                String useCustom = getResources().getString(
+                        R.string.notification_light_use_custom);
+                Preference pref = new Preference(context);
+                pref.setSummary(String.format(summary, useCustom));
+                pref.setEnabled(false);
+                mApplicationPrefList.addPreference(pref);
+            }
         }
     }
 
-- 
cgit v1.1


From 72806b399d37519ce13dc642293087f96d8c1a7d Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Fri, 8 Apr 2016 18:44:08 +0200
Subject: Allow adding a shortcut icon for carrier selection

e.g. to homescreen

Change-Id: I4d16519ee84b50b229c82a41c404690bb2618c29
---
 AndroidManifest.xml                            | 14 +++++++++--
 res/values/cm_strings.xml                      |  2 ++
 src/com/android/settings/CarrierSelection.java | 34 ++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 src/com/android/settings/CarrierSelection.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index fde2300..6870873 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2320,11 +2320,11 @@
                 android:label="@string/crypt_keeper_encrypt_title">
             <intent-filter android:priority="1">
                 <action android:name="android.app.action.START_ENCRYPTION" />
-                <category android:name="android.intent.category.DEFAULT" /> />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" /> />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                 android:value="com.android.settings.CryptKeeperSettings" />
@@ -2919,5 +2919,15 @@
             <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                        android:value="com.android.settings.cyanogenmod.WeatherServiceSettings" />
         </activity>
+
+        <activity android:name=".CarrierSelection"
+                  android:label="@string/shortcut_carrier_title"
+                  android:excludeFromRecents="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="com.android.settings.SHORTCUT" />
+            </intent-filter>
+        </activity>
+
     </application>
 </manifest>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a390a9a..906f19d 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1187,4 +1187,6 @@
     <string name="restrict_cellular_access_dialog_title">Restrict cellular data access?</string>
     <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only cellular networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
 
+    <!-- Label for settings shortcut: carrier selection -->
+    <string name="shortcut_carrier_title">Network operators</string>
 </resources>
diff --git a/src/com/android/settings/CarrierSelection.java b/src/com/android/settings/CarrierSelection.java
new file mode 100644
index 0000000..1044380
--- /dev/null
+++ b/src/com/android/settings/CarrierSelection.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2014-2016 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.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.Intent;
+import android.os.Bundle;
+
+public class CarrierSelection extends Activity {
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+        Intent intent = new Intent(Intent.ACTION_MAIN);
+        intent.setComponent(new ComponentName("com.android.phone",
+                "com.android.phone.NetworkSetting"));
+        startActivity(intent);
+        finish();
+    }
+}
-- 
cgit v1.1


From 65758277651d6c55db0475851e659e59994829e9 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Thu, 7 Apr 2016 11:20:04 -0700
Subject: Settings: fix default sim radio selections

Change-Id: I8ba32f3b203751e79697c7dcbc2cfcf1c6ae4ad0
Ticket: CYNGNOS-2388, CYNGNOS-2212
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/sim/SimDialogActivity.java | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 0b73d65..fe6642e 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -238,7 +238,7 @@ public class SimDialogActivity extends Activity {
                 }
             };
 
-        int currentIndex = -1;
+        int currentIndex = 0;
         ArrayList<SubscriptionInfo> callsSubInfoList = new ArrayList<SubscriptionInfo>();
         if (id == CALLS_PICK) {
             final TelecomManager telecomManager = TelecomManager.from(context);
@@ -295,7 +295,7 @@ public class SimDialogActivity extends Activity {
                 }
             }
         } else {
-            SubscriptionInfo defaultSub = subscriptionManager.getDefaultDataSubscriptionInfo();
+            final int defaultDataSubId = SubscriptionManager.getDefaultDataSubId();
             for (int i = 0; i < selectableSubInfoLength; ++i) {
                 final SubscriptionInfo sir = subInfoList.get(i);
                 CharSequence displayName = sir.getDisplayName();
@@ -303,8 +303,7 @@ public class SimDialogActivity extends Activity {
                     displayName = "";
                 }
                 list.add(displayName.toString());
-                if (defaultSub != null && defaultSub.getSubscriptionId()
-                        == sir.getSubscriptionId()) {
+                if (defaultDataSubId == sir.getSubscriptionId()) {
                     currentIndex = list.size() - 1;
                 }
             }
-- 
cgit v1.1


From 70e9aea5d4bc36ac400e5f7e09c51fe018bb168a Mon Sep 17 00:00:00 2001
From: Martin Brabham <optedoblivion@cyngn.com>
Date: Wed, 26 Aug 2015 16:40:26 -0700
Subject: Fix the improper string and increment database version to kick off a
 new indexing job.

Change-Id: Iec878ec4414a47f05f9d0de03eb2268ef0b3d6ee
Ticket-Id: CYNGNOS-812
(cherry picked from commit 13ccd1c41aaf1238ca128addda3ec4c1b15abb3c)
---
 res/xml/privacy_settings_cyanogenmod.xml                 | 2 +-
 src/com/android/settings/search/IndexDatabaseHelper.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/xml/privacy_settings_cyanogenmod.xml b/res/xml/privacy_settings_cyanogenmod.xml
index 256ca00..1ce0f12 100644
--- a/res/xml/privacy_settings_cyanogenmod.xml
+++ b/res/xml/privacy_settings_cyanogenmod.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/privacy_settings_title">
+        android:title="@string/privacy_settings_cyanogenmod_title">
 
         <Preference
             android:key="privacy_guard_manager"
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 84a2922..fd7b762 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 118;
+    private static final int DATABASE_VERSION = 119;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";
-- 
cgit v1.1


From 4370045fac8a70750bc6e90ddb2bd8ab51fce90a Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sun, 10 Apr 2016 18:20:46 -0700
Subject: livedisplay: Update Settings for new LiveDisplay API

 * LiveDisplay is getting a proper API. This patch refactors
   the settings to use it.
 * Also kill off the deprecated "gamma calibration" tunable
   which nobody should be using at this point.

Change-Id: I948b8845cd06c8c634a201cb5d5b93b5766cc51d
---
 AndroidManifest.xml                                |   4 +-
 res/layout/display_gamma_calibration.xml           |  32 --
 res/values-af/cm_strings.xml                       |   7 -
 res/values-am/cm_strings.xml                       |   1 -
 res/values-ar/cm_strings.xml                       |   7 -
 res/values-as-rIN/cm_strings.xml                   |   7 -
 res/values-ast-rES/cm_strings.xml                  |   7 -
 res/values-az-rAZ/cm_strings.xml                   |   6 -
 res/values-be/cm_strings.xml                       |   7 -
 res/values-bg/cm_strings.xml                       |   7 -
 res/values-bn-rBD/cm_strings.xml                   |   4 -
 res/values-br-rFR/cm_strings.xml                   |   1 -
 res/values-ca/cm_strings.xml                       |   7 -
 res/values-cs/cm_strings.xml                       |   7 -
 res/values-cy/cm_strings.xml                       |   1 -
 res/values-da/cm_strings.xml                       |   7 -
 res/values-de/cm_strings.xml                       |   7 -
 res/values-el/cm_strings.xml                       |   7 -
 res/values-en-rAU/cm_strings.xml                   |   7 -
 res/values-en-rGB/cm_strings.xml                   |   1 -
 res/values-en-rIN/cm_strings.xml                   |   7 -
 res/values-en-rPT/cm_strings.xml                   |   1 -
 res/values-eo/cm_strings.xml                       |   7 -
 res/values-es-rMX/cm_strings.xml                   |   1 -
 res/values-es-rUS/cm_strings.xml                   |   7 -
 res/values-es/cm_strings.xml                       |   7 -
 res/values-et-rEE/cm_strings.xml                   |   7 -
 res/values-eu-rES/cm_strings.xml                   |   7 -
 res/values-fa/cm_strings.xml                       |   7 -
 res/values-fi/cm_strings.xml                       |   7 -
 res/values-fil-rPH/cm_strings.xml                  |   1 -
 res/values-fr-rCA/cm_strings.xml                   |   1 -
 res/values-fr/cm_strings.xml                       |   7 -
 res/values-frp-rIT/cm_strings.xml                  |   1 -
 res/values-fy-rNL/cm_strings.xml                   |   1 -
 res/values-gd-rGB/cm_strings.xml                   |   1 -
 res/values-gl-rES/cm_strings.xml                   |   1 -
 res/values-gu-rIN/cm_strings.xml                   |   7 -
 res/values-hi/cm_strings.xml                       |   7 -
 res/values-hr/cm_strings.xml                       |   7 -
 res/values-hu/cm_strings.xml                       |   7 -
 res/values-hy-rAM/cm_strings.xml                   |   1 -
 res/values-in/cm_strings.xml                       |   1 -
 res/values-is-rIS/cm_strings.xml                   |   1 -
 res/values-it/cm_strings.xml                       |   7 -
 res/values-iw/cm_strings.xml                       |   7 -
 res/values-ja/cm_strings.xml                       |   7 -
 res/values-ka-rGE/cm_strings.xml                   |   1 -
 res/values-kk-rKZ/cm_strings.xml                   |   1 -
 res/values-km-rKH/cm_strings.xml                   |   1 -
 res/values-kn-rIN/cm_strings.xml                   |   7 -
 res/values-ko/cm_strings.xml                       |   7 -
 res/values-ku/cm_strings.xml                       |   7 -
 res/values-ky-rKG/cm_strings.xml                   |   1 -
 res/values-lb/cm_strings.xml                       |   7 -
 res/values-lo-rLA/cm_strings.xml                   |   1 -
 res/values-lt/cm_strings.xml                       |   7 -
 res/values-lv/cm_strings.xml                       |   4 -
 res/values-mk-rMK/cm_strings.xml                   |   1 -
 res/values-ml-rIN/cm_strings.xml                   |   7 -
 res/values-mn-rMN/cm_strings.xml                   |   1 -
 res/values-mr-rIN/cm_strings.xml                   |   7 -
 res/values-ms-rMY/cm_strings.xml                   |   1 -
 res/values-my-rMM/cm_strings.xml                   |   1 -
 res/values-nb/cm_strings.xml                       |   7 -
 res/values-ne-rNP/cm_strings.xml                   |   1 -
 res/values-nl/cm_strings.xml                       |   7 -
 res/values-oc-rFR/cm_strings.xml                   |   1 -
 res/values-or-rIN/cm_strings.xml                   |   7 -
 res/values-pa-rIN/cm_strings.xml                   |   1 -
 res/values-pl/cm_strings.xml                       |   7 -
 res/values-pt-rBR/cm_strings.xml                   |   7 -
 res/values-pt-rPT/cm_strings.xml                   |   7 -
 res/values-rm/cm_strings.xml                       |   1 -
 res/values-ro/cm_strings.xml                       |   7 -
 res/values-ru/cm_strings.xml                       |   7 -
 res/values-si-rLK/cm_strings.xml                   |   4 -
 res/values-sk/cm_strings.xml                       |   7 -
 res/values-sl/cm_strings.xml                       |   7 -
 res/values-sq-rAL/cm_strings.xml                   |   1 -
 res/values-sr/cm_strings.xml                       |   7 -
 res/values-sv/cm_strings.xml                       |   7 -
 res/values-sw/cm_strings.xml                       |   1 -
 res/values-ta-rIN/cm_strings.xml                   |   7 -
 res/values-te-rIN/cm_strings.xml                   |   7 -
 res/values-th/cm_strings.xml                       |   7 -
 res/values-tr/cm_strings.xml                       |   7 -
 res/values-ug/cm_strings.xml                       |   7 -
 res/values-uk/cm_strings.xml                       |   7 -
 res/values-ur-rPK/cm_strings.xml                   |   1 -
 res/values-uz-rUZ/cm_strings.xml                   |   1 -
 res/values-vi/cm_strings.xml                       |   7 -
 res/values-zh-rCN/cm_strings.xml                   |   7 -
 res/values-zh-rHK/cm_strings.xml                   |   7 -
 res/values-zh-rTW/cm_strings.xml                   |   7 -
 res/values-zu/cm_strings.xml                       |   1 -
 res/values/cm_arrays.xml                           |   5 -
 res/values/cm_strings.xml                          |   7 -
 res/xml/livedisplay.xml                            |   7 -
 .../android/settings/cyanogenmod/BootReceiver.java |   2 -
 .../android/settings/livedisplay/DisplayColor.java |  68 +---
 .../android/settings/livedisplay/DisplayGamma.java | 383 ---------------------
 .../settings/livedisplay/DisplayTemperature.java   |  40 +--
 .../android/settings/livedisplay/LiveDisplay.java  | 102 ++----
 104 files changed, 58 insertions(+), 1042 deletions(-)
 delete mode 100644 res/layout/display_gamma_calibration.xml
 delete mode 100644 src/com/android/settings/livedisplay/DisplayGamma.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6870873..451f370 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -86,6 +86,7 @@
     <uses-permission android:name="cyanogenmod.permission.MODIFY_PROFILES" />
     <uses-permission android:name="cyanogenmod.permission.PROTECTED_APP" />
     <uses-permission android:name="cyanogenmod.permission.PERFORMANCE_ACCESS" />
+    <uses-permission android:name="cyanogenmod.permission.MANAGE_LIVEDISPLAY" />
 
     <application android:label="@string/settings_label"
             android:icon="@mipmap/ic_launcher_settings"
@@ -2227,8 +2228,7 @@
                 android:excludeFromRecents="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-                <action android:name="android.settings.LIVEDISPLAY_SETTINGS" />
-                <action android:name="com.android.settings.LIVEDISPLAY_SETTINGS" />
+                <action android:name="cyanogenmod.settings.LIVEDISPLAY_SETTINGS" />
                 <category android:name="android.intent.category.VOICE_LAUNCH" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.SHORTCUT" />
diff --git a/res/layout/display_gamma_calibration.xml b/res/layout/display_gamma_calibration.xml
deleted file mode 100644
index db66f7f..0000000
--- a/res/layout/display_gamma_calibration.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.
--->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-    <LinearLayout
-            android:id="@+id/gamma_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:paddingBottom="20dp" >
-
-        <!-- children will be filled in dynamically -->
-
-    </LinearLayout>
-</ScrollView>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index cd878ec..d47185e 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Rooi</string>
   <string name="color_green_title">Groen</string>
   <string name="color_blue_title">Blou</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrasie</string>
-  <string name="gamma_tuning_summary_head">Verstel gamma waardes</string>
-  <string name="gamma_tuning_control_set_header">Groep <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontras</string>
-  <string name="gamma_tuning_brightness">Helderheid</string>
-  <string name="gamma_tuning_saturation">Versadigingspunt</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Begin musiek program</string>
   <string name="headset_connect_player_summary">Begin die standaard musiek program wanneer oorfone gekoppel word</string>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index feac856..6872e24 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -543,14 +543,7 @@
   <string name="color_red_title">أحمر</string>
   <string name="color_green_title">أخضر</string>
   <string name="color_blue_title">أزرق</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">معايرة چاما</string>
-  <string name="gamma_tuning_summary_head">قيم Tweak gamma</string>
-  <string name="gamma_tuning_control_set_header">مجموعة <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">التباين</string>
-  <string name="gamma_tuning_brightness">السطوع</string>
-  <string name="gamma_tuning_saturation">التشبع</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">بدء تشغيل تطبيق الموسيقى</string>
   <string name="headset_connect_player_summary">بدء تشغيل تطبيق الموسيقى المبدئيّ عند توصيل سماعات الرأس</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 833beda..422e3b0 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">ৰঙা</string>
   <string name="color_green_title">সেউজীয়া</string>
   <string name="color_blue_title">নীলা</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">গামা কেলিব্ৰেচন</string>
-  <string name="gamma_tuning_summary_head">টুইক গামাৰ মানবোৰ</string>
-  <string name="gamma_tuning_control_set_header">গ্ৰুপ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">কনট্ৰাষ্ট</string>
-  <string name="gamma_tuning_brightness">উজ্বলতা</string>
-  <string name="gamma_tuning_saturation">পৰিপূৰ্ণ কৰা</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">সংগীত এপ্প্ লান্চ্চ কৰক</string>
   <string name="headset_connect_player_summary">হেডছেট সংযোগ কৰিলে ডিফ\'ল্ট সংগীত এপ্প লান্চ্চ কৰক</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index ccd72bc..2594c18 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -446,14 +446,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="color_red_title">Bermeyu</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Correición gamma</string>
-  <string name="gamma_tuning_summary_head">Axustar la correición gamma de la pantalla</string>
-  <string name="gamma_tuning_control_set_header">Grupu <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Brillu</string>
-  <string name="gamma_tuning_saturation">Saturación</string>
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioridá automática</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index aecc7c4..29877b6 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -440,13 +440,7 @@
   <string name="color_red_title">Qırmızı</string>
   <string name="color_green_title">Yaşıl</string>
   <string name="color_blue_title">Mavi</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Qamma kalibrasiyası</string>
-  <string name="gamma_tuning_summary_head">Qamma dəyərlərini düzəltin</string>
-  <string name="gamma_tuning_control_set_header">Qrup <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_brightness">Parlaqlıq</string>
-  <string name="gamma_tuning_saturation">Doydurma</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musiqi tətbiqini başlat</string>
   <string name="headset_connect_player_summary">Qulaqcıq taxılanda musiqi tətbiqetməsini başladar</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 3380d83..f34ba05 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -535,14 +535,7 @@
   <string name="color_red_title">Чырвоны</string>
   <string name="color_green_title">Зялёны</string>
   <string name="color_blue_title">Сіні</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Гама</string>
-  <string name="gamma_tuning_summary_head">Налада гама-карэкцыі экрана</string>
-  <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Кантраснасць</string>
-  <string name="gamma_tuning_brightness">Яскравасць</string>
-  <string name="gamma_tuning_saturation">Насычанасць</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Аўтазапуск плэера</string>
   <string name="headset_connect_player_summary">Запускаць плэер пры падлучэнні завушнікаў</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 40cde4a..4383293 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Червен</string>
   <string name="color_green_title">Зелен</string>
   <string name="color_blue_title">Син</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Гама за калибриране</string>
-  <string name="gamma_tuning_summary_head">Настрой гама стойности</string>
-  <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d </xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Контраст</string>
-  <string name="gamma_tuning_brightness">Яркост</string>
-  <string name="gamma_tuning_saturation">Насищане</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Стартиране на приложението за музика</string>
   <string name="headset_connect_player_summary">Стартира на приложението за музика, когато включите слушалките</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index bca10e7..86bc737 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -363,10 +363,6 @@
   <string name="color_red_title">লাল</string>
   <string name="color_green_title">সবুজ</string>
   <string name="color_blue_title">নীল</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">গামা শক্তির পরিমাপ</string>
-  <string name="gamma_tuning_summary_head">টুইক গামার মান</string>
-  <string name="gamma_tuning_control_set_header">গ্রুপ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 9db75e5..3929844 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Vermell</string>
   <string name="color_green_title">Verd</string>
   <string name="color_blue_title">Blau</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibració de gamma</string>
-  <string name="gamma_tuning_summary_head">Millora els valors gamma</string>
-  <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrast</string>
-  <string name="gamma_tuning_brightness">Lluminositat</string>
-  <string name="gamma_tuning_saturation">Saturació</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Llança l\'aplicació de música</string>
   <string name="headset_connect_player_summary">Inicia l\'aplicació de música predeterminada quan es connectin els auriculars</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 0169b98..d04aff5 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -541,14 +541,7 @@
   <string name="color_red_title">Červená</string>
   <string name="color_green_title">Zelená</string>
   <string name="color_blue_title">Modrá</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrace</string>
-  <string name="gamma_tuning_summary_head">Přizpůsobení hodnot gamma</string>
-  <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Jas</string>
-  <string name="gamma_tuning_saturation">Sytost</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Spustit aplikaci pro přehrávání hudby</string>
   <string name="headset_connect_player_summary">Pokud jsou připojena sluchátka, spustit výchozí aplikaci pro přehrávání hudby</string>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index b257150..9a4470f 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -535,14 +535,7 @@
   <string name="color_red_title">Rød</string>
   <string name="color_green_title">Grøn</string>
   <string name="color_blue_title">Blå</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma-kalibrering</string>
-  <string name="gamma_tuning_summary_head">Finindstil gammaværdier</string>
-  <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Lysstyrke</string>
-  <string name="gamma_tuning_saturation">Farvemætning</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Start musik-app</string>
   <string name="headset_connect_player_summary">Start standard-app til musik, når headset tilsluttes</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 34c787b..72d0d7d 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Rot</string>
   <string name="color_green_title">Grün</string>
   <string name="color_blue_title">Blau</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gammakorrektur</string>
-  <string name="gamma_tuning_summary_head">Gammawerte optimieren</string>
-  <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Helligkeit</string>
-  <string name="gamma_tuning_saturation">Sättigung</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musik-App starten</string>
   <string name="headset_connect_player_summary">Beim Anschließen eines Kopfhörers die Standard-Musik-App starten</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index aa46de4..2d53970 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Κόκκινο</string>
   <string name="color_green_title">Πράσινο</string>
   <string name="color_blue_title">Μπλε</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Βελτίωση γάμμα</string>
-  <string name="gamma_tuning_summary_head">Βελτίωση επιπέδων γάμμα της οθόνης</string>
-  <string name="gamma_tuning_control_set_header">Ομάδα <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Αντίθεση</string>
-  <string name="gamma_tuning_brightness">Φωτεινότητα</string>
-  <string name="gamma_tuning_saturation">Κορεσμός</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Εκκίνηση εφαρμογής μουσικής</string>
   <string name="headset_connect_player_summary">Εκκίνηση της προεπιλεγμένης εφαρμογής μουσικής κατά τη σύνδεση ακουστικών</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 27d46c2..20806b2 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -453,14 +453,7 @@
   <string name="color_red_title">Red</string>
   <string name="color_green_title">Green</string>
   <string name="color_blue_title">Blue</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma calibration</string>
-  <string name="gamma_tuning_summary_head">Tweak gamma values</string>
-  <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrast</string>
-  <string name="gamma_tuning_brightness">Brightness</string>
-  <string name="gamma_tuning_saturation">Saturation</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Launch music app</string>
   <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index c84da7d..9adcaea 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -482,14 +482,7 @@
   <string name="color_red_title">Red</string>
   <string name="color_green_title">Green</string>
   <string name="color_blue_title">Blue</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma calibration</string>
-  <string name="gamma_tuning_summary_head">Tweak gamma values</string>
-  <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrast</string>
-  <string name="gamma_tuning_brightness">Brightness</string>
-  <string name="gamma_tuning_saturation">Saturation</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Launch music app</string>
   <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 77f42ee..baf086a 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -465,14 +465,7 @@
   <string name="color_red_title">Ruĝo</string>
   <string name="color_green_title">Verdo</string>
   <string name="color_blue_title">Bluo</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gama kalibrado</string>
-  <string name="gamma_tuning_summary_head">Alĝustigi gamajn valorojn</string>
-  <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrasto</string>
-  <string name="gamma_tuning_brightness">Brileco</string>
-  <string name="gamma_tuning_saturation">Intenseco</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lanĉi la muzik-ludilon</string>
   <string name="headset_connect_player_summary">Lanĉi la defaŭltan muzik-ludilon, kiam la kapaŭskultilo estas kontektita</string>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 2ddbf25..0568f71 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -151,7 +151,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 9874cf8..a3b30cc 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">Rojo</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Corrección gamma</string>
-  <string name="gamma_tuning_summary_head">Ajustar la corrección gamma de la pantalla</string>
-  <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Brillo</string>
-  <string name="gamma_tuning_saturation">Saturación</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar el reproductor de música</string>
   <string name="headset_connect_player_summary">Iniciar el reproductor de música predeterminado al conectar los auriculares</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 5c4680e..033189a 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Rojo</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Corrección gamma</string>
-  <string name="gamma_tuning_summary_head">Ajustar la corrección gamma</string>
-  <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Brillo</string>
-  <string name="gamma_tuning_saturation">Saturación</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar reproductor de música</string>
   <string name="headset_connect_player_summary">Iniciar el reproductor de música por defecto al conectar los auriculares</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 53ae0fa..b7c3683 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -473,14 +473,7 @@
   <string name="color_red_title">Punane</string>
   <string name="color_green_title">Roheline</string>
   <string name="color_blue_title">Sinine</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Heleduse kalibreerimine</string>
-  <string name="gamma_tuning_summary_head">Kohenda heleduse väärtuseid</string>
-  <string name="gamma_tuning_control_set_header">Rühmita <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Heledus</string>
-  <string name="gamma_tuning_saturation">Küllastus</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Käivita muusika rakendus</string>
   <string name="headset_connect_player_summary">Käivita vaikimisi muusika rakendus peakomplekti ühendamisel</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 95ae2cf..71aa9ea 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Gorria</string>
   <string name="color_green_title">Berdea</string>
   <string name="color_blue_title">Urdina</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrazioa</string>
-  <string name="gamma_tuning_summary_head">Doitu gamma balioak</string>
-  <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g> taldea</string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrastea</string>
-  <string name="gamma_tuning_brightness">Distira</string>
-  <string name="gamma_tuning_saturation">Saturazioa</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Abiatu musika erreproduzigailua</string>
   <string name="headset_connect_player_summary">Abiatu musika erreproduzigailu lehenetsia aurikularrak konektatzean</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 01b1e06..74d7202 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -474,14 +474,7 @@
   <string name="color_red_title">قرمز</string>
   <string name="color_green_title">سبز</string>
   <string name="color_blue_title">آبی</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">تنظیم گاما</string>
-  <string name="gamma_tuning_summary_head">تغییر جزئی مقادیر گاما</string>
-  <string name="gamma_tuning_control_set_header">گروه <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">کنتراست</string>
-  <string name="gamma_tuning_brightness">روشنایی</string>
-  <string name="gamma_tuning_saturation">اشباع</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">اجرای برنامه موسیقی</string>
   <string name="headset_connect_player_summary">هنگام اتصال هدست برنامه پیش‌فرض موسیقی اجرا شود</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index cb7c335..9b0eaac 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Punainen</string>
   <string name="color_green_title">Vihreä</string>
   <string name="color_blue_title">Sininen</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gammakalibrointi</string>
-  <string name="gamma_tuning_summary_head">Muokkaa gamma-arvoja</string>
-  <string name="gamma_tuning_control_set_header">Ryhmä <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrasti</string>
-  <string name="gamma_tuning_brightness">Kirkkaus</string>
-  <string name="gamma_tuning_saturation">Kylläisyys</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Käynnistä musiikkisovellus</string>
   <string name="headset_connect_player_summary">Käynnistä musiikkisovellus kytkettäessä kuulokkeet</string>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index a3ebbe5..f8ba3e5 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -539,14 +539,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="color_red_title">Rouge</string>
   <string name="color_green_title">Vert</string>
   <string name="color_blue_title">Bleu</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibrage du gamma</string>
-  <string name="gamma_tuning_summary_head">Ajuster les valeurs du gamma</string>
-  <string name="gamma_tuning_control_set_header">Groupe <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Luminosité</string>
-  <string name="gamma_tuning_saturation">Saturation</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lancer le lecteur de musique</string>
   <string name="headset_connect_player_summary">Lancer le lecteur de musique par défaut au branchement du casque</string>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index bb3faa1..08b695e 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -92,7 +92,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 3073904..2cd2760 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -284,7 +284,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 63e8020..8c60e18 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">લાલ</string>
   <string name="color_green_title">લીલો</string>
   <string name="color_blue_title">વાદળી</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ગામા અનુમાપન</string>
-  <string name="gamma_tuning_summary_head">ગામા મૂલ્યો મરડો</string>
-  <string name="gamma_tuning_control_set_header">જૂથ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">વિપરીત</string>
-  <string name="gamma_tuning_brightness">તેજ</string>
-  <string name="gamma_tuning_saturation">સંતૃપ્તિ</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
   <string name="headset_connect_player_summary">જ્યારે હેડસેટ જોડાયેલ હોય ત્યારે ડિફૉલ્ટ મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 6ccfb34..ecb23ed 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -471,14 +471,7 @@
   <string name="color_red_title">लाल</string>
   <string name="color_green_title">हरा</string>
   <string name="color_blue_title">नीला</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">गामा अंशांकन</string>
-  <string name="gamma_tuning_summary_head">गामा मानों को समायोजित करें</string>
-  <string name="gamma_tuning_control_set_header">समूह <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">कोंट्रास्ट</string>
-  <string name="gamma_tuning_brightness">चमक</string>
-  <string name="gamma_tuning_saturation">संतृप्ति</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">संगीत ऐप को चालू करें</string>
   <string name="headset_connect_player_summary">जब हेटसेट कनेक्ट किया जाए, तो डिफ़ॉल्ट संगीत ऐप को चालू करें</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 7f157bd..14753e7 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Crvena</string>
   <string name="color_green_title">Zelena</string>
   <string name="color_blue_title">Plava</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gama kalibracije</string>
-  <string name="gamma_tuning_summary_head">Podesi gama vrijednosti</string>
-  <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Svjetlina</string>
-  <string name="gamma_tuning_saturation">Zasićenje</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Pokretanje aplikacije za glazbu</string>
   <string name="headset_connect_player_summary">Pokreni zadanu aplikaciju za glazbu kada su priključene slušalice</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index cb78ffa..950672a 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Vörös</string>
   <string name="color_green_title">Zöld</string>
   <string name="color_blue_title">Kék</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrálás</string>
-  <string name="gamma_tuning_summary_head">Gamma értékek finomhangolása</string>
-  <string name="gamma_tuning_control_set_header">Csoport <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontraszt</string>
-  <string name="gamma_tuning_brightness">Fényerő</string>
-  <string name="gamma_tuning_saturation">Telítettség</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Zenelejátszó indítása</string>
   <string name="headset_connect_player_summary">Alapértelmezett zenelejátszó elindítása fülhallgató csatlakoztatásakor</string>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 919d54a..a9f34a7 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Rosso</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Blu</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibrazione gamma</string>
-  <string name="gamma_tuning_summary_head">Modifica i valori gamma</string>
-  <string name="gamma_tuning_control_set_header">Gruppo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrasto</string>
-  <string name="gamma_tuning_brightness">Luminosità</string>
-  <string name="gamma_tuning_saturation">Saturazione</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Avvia lettore musicale</string>
   <string name="headset_connect_player_summary">Lancia il lettore musicale predefinito quando vengono connesse le cuffie</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 75a53e8..ca34560 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">אדום</string>
   <string name="color_green_title">ירוק</string>
   <string name="color_blue_title">כחול</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">כיול גאמא</string>
-  <string name="gamma_tuning_summary_head">שנה ערכי גאמא</string>
-  <string name="gamma_tuning_control_set_header">קבוצה <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">ניגודיות</string>
-  <string name="gamma_tuning_brightness">בהירות</string>
-  <string name="gamma_tuning_saturation">רוויה</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">הפעל נגן מוזיקה</string>
   <string name="headset_connect_player_summary">הפעל את נגן המוזיקה המוגדר כברירת המחדל בעת חיבור אוזניות</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 473fd90..129bdc5 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">赤</string>
   <string name="color_green_title">緑</string>
   <string name="color_blue_title">青</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ガンマ調整</string>
-  <string name="gamma_tuning_summary_head">ガンマ値を調整する</string>
-  <string name="gamma_tuning_control_set_header">グループ<xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">コントラスト</string>
-  <string name="gamma_tuning_brightness">輝度</string>
-  <string name="gamma_tuning_saturation">彩度</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">音楽アプリを起動</string>
   <string name="headset_connect_player_summary">ヘッドセット接続時にデフォルトの音楽アプリを起動する</string>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 4ed2a43..7fadff4 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">ಕೆಂಪು</string>
   <string name="color_green_title">ಹಸಿರು</string>
   <string name="color_blue_title">ನೀಲಿ</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ಗಾಮಾ ಮಾಪನಾಂಕ</string>
-  <string name="gamma_tuning_summary_head">ಗಾಮಾ ಮೌಲ್ಯಗಳನ್ನು ತಿರುಚಿ</string>
-  <string name="gamma_tuning_control_set_header">ಗುಂಪು <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">ಕಾಂಟ್ರಾಸ್ಟ್</string>
-  <string name="gamma_tuning_brightness">ಪ್ರಖರತೆ</string>
-  <string name="gamma_tuning_saturation">ಸ್ಯಾಚುರೇಶನ್</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">ಮ್ಯೂಸಿಕ್ ಆಪ್ ತೆರೆ</string>
   <string name="headset_connect_player_summary">ಹೆಡ್‍ಸೆಟ್ ಸಂಪರ್ಕಗೊಂಡಾಗ ಡೀಫಾಲ್ಟ್ ಮ್ಯೂಸಿಕ್ ಆಪ್ ಆರಂಭಿಸು</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index b46ac17..299c39c 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -537,14 +537,7 @@
   <string name="color_red_title">빨강</string>
   <string name="color_green_title">초록</string>
   <string name="color_blue_title">파랑</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">감마 보정</string>
-  <string name="gamma_tuning_summary_head">감마 값을 조정합니다</string>
-  <string name="gamma_tuning_control_set_header">그룹 <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">명암비</string>
-  <string name="gamma_tuning_brightness">밝기</string>
-  <string name="gamma_tuning_saturation">채도</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">음악 앱 실행</string>
   <string name="headset_connect_player_summary">헤드셋이 연결되면 기본 음악 앱 실행</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index bab94a6..8c5a989 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -453,14 +453,7 @@
   <string name="color_red_title">سور</string>
   <string name="color_green_title">سه‌وز</string>
   <string name="color_blue_title">شین</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">کالیبره‌یشنی سێیه‌م</string>
-  <string name="gamma_tuning_summary_head">به‌های تویک</string>
-  <string name="gamma_tuning_control_set_header">کۆمەڵ<xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">جیاوازی</string>
-  <string name="gamma_tuning_brightness">ڕوناکی</string>
-  <string name="gamma_tuning_saturation">تێرایی</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">کردنه‌وه‌ی به‌رنامه‌ی ده‌نگ</string>
   <string name="headset_connect_player_summary">کردنه‌وه‌ی به‌رنامه‌ی مۆسیقای بنه‌ڕه‌تی کاتێک بڵندگۆ په‌یوه‌ندکرا</string>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index dc23497..c3e5571 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -476,14 +476,7 @@
   <string name="color_red_title">Rout</string>
   <string name="color_green_title">Gréng</string>
   <string name="color_blue_title">Blo</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gammakorrektur</string>
-  <string name="gamma_tuning_summary_head">Gammawäerter astellen</string>
-  <string name="gamma_tuning_control_set_header">Grupp <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Hellegkeet</string>
-  <string name="gamma_tuning_saturation">Faarfsättegung</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musek-App starten</string>
   <string name="headset_connect_player_summary">Wa Kopfhörer verbonne ginn, gëtt Standard-Musek-App gestart</string>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 6a0f0cd..b5275f8 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -476,14 +476,7 @@
   <string name="color_red_title">Raudona</string>
   <string name="color_green_title">Žalia</string>
   <string name="color_blue_title">Mėlyna</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gama kalibravimas</string>
-  <string name="gamma_tuning_summary_head">Reguliuoti gama reikšmes</string>
-  <string name="gamma_tuning_control_set_header">Grupė <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrastas</string>
-  <string name="gamma_tuning_brightness">Šviesumas</string>
-  <string name="gamma_tuning_saturation">Saturacija</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Paleisti muzikos programą</string>
   <string name="headset_connect_player_summary">Paleisti numatytąją muzikos programą, kai prijungiama laisvų rankų įranga</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 2cd55a1..2af1dc6 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -355,10 +355,6 @@
   <string name="color_red_title">Sarkans</string>
   <string name="color_green_title">Zaļš</string>
   <string name="color_blue_title">Zils</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrēšana</string>
-  <string name="gamma_tuning_summary_head">Piedarīt gamma vērtības</string>
-  <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 74d69aa..c2750bc 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">ചുവപ്പ്</string>
   <string name="color_green_title">പച്ച</string>
   <string name="color_blue_title">നീല</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ഗാമാ കാലിബ്രേഷൻ</string>
-  <string name="gamma_tuning_summary_head">ഗാമാ മൂല്യങ്ങൾ വലിക്കുക</string>
-  <string name="gamma_tuning_control_set_header">ഗ്രൂപ്പ് <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">ദൃശ്യതീവ്രത</string>
-  <string name="gamma_tuning_brightness">തെളിച്ചം</string>
-  <string name="gamma_tuning_saturation">സാച്ചുറേഷൻ</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
   <string name="headset_connect_player_summary">ഹെഡ്സെറ്റ് ഘടിപ്പിച്ചിരിക്കുമ്പോള്‍ ഡിഫോള്‍ട്ട് സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index bab9c5e..0cea6cc 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">लाल</string>
   <string name="color_green_title">हिरवा</string>
   <string name="color_blue_title">निळा</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">गामा कॅलिब्रेशन</string>
-  <string name="gamma_tuning_summary_head">ट्वीक गामा मूल्ये</string>
-  <string name="gamma_tuning_control_set_header">समूह <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">तीव्रता</string>
-  <string name="gamma_tuning_brightness">चकाकी</string>
-  <string name="gamma_tuning_saturation">संपृक्तता</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">संगीत अनुप्रयोग सुरू करा</string>
   <string name="headset_connect_player_summary">जेव्हा हेडसेट कनेक्ट केलेला असेल तेव्हा डिफॉल्ट संगीत अनुप्रयोग सुरू करा</string>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index f2a1e52..313c61e 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -516,14 +516,7 @@
   <string name="color_red_title">Rød</string>
   <string name="color_green_title">Grønn</string>
   <string name="color_blue_title">Blå</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrering</string>
-  <string name="gamma_tuning_summary_head">Justere gammaverdiene</string>
-  <string name="gamma_tuning_control_set_header">Gruppe <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Lysstyrke</string>
-  <string name="gamma_tuning_saturation">Metning</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Start musikk app</string>
   <string name="headset_connect_player_summary">Start standard musikk app når hodesett er tilkoblet</string>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index d9cdbd0..7acfc41 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Rood</string>
   <string name="color_green_title">Groen</string>
   <string name="color_blue_title">Blauw</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gammakalibratie</string>
-  <string name="gamma_tuning_summary_head">Gammawaarden aanpassen</string>
-  <string name="gamma_tuning_control_set_header">Groep <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrast</string>
-  <string name="gamma_tuning_brightness">Helderheid</string>
-  <string name="gamma_tuning_saturation">Verzadiging</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Muziek-app openen</string>
   <string name="headset_connect_player_summary">Standaardmuziek-app openen bij aansluiten headset</string>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 34c74e8..41f85836 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">ଲାଲ୍</string>
   <string name="color_green_title">ସବୁଜ</string>
   <string name="color_blue_title">ନୀଳ</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ଗାମା କାଲିବ୍ରେସନ୍‍</string>
-  <string name="gamma_tuning_summary_head">ଗାମା ମୂଲ୍ୟ ଟ୍ୱିକ୍‍ କରନ୍ତୁ</string>
-  <string name="gamma_tuning_control_set_header">ଗୋ‍ଷ୍ଠୀ <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">କଣ୍ଟ୍ରାଷ୍ଟ</string>
-  <string name="gamma_tuning_brightness">ଔଜଲ୍ୟତା</string>
-  <string name="gamma_tuning_saturation">ସମ୍ପୃକ୍ତି</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଉନ୍ମୋଚନ କରନ୍ତୁ</string>
   <string name="headset_connect_player_summary">ହେଡ୍‍ସେଟ୍‍ ସଂଯୋଗ ହୋଇଥିବା ସମୟରେ ଡିଫଲ୍ଟ ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଲଞ୍ଚ କରନ୍ତୁ</string>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 6243e94..0b1d8c0 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -535,14 +535,7 @@
   <string name="color_red_title">Czerwony</string>
   <string name="color_green_title">Zielony</string>
   <string name="color_blue_title">Niebieski</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Kalibracja gamma</string>
-  <string name="gamma_tuning_summary_head">Tuning wartości gamma</string>
-  <string name="gamma_tuning_control_set_header">Grupa <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Jasność</string>
-  <string name="gamma_tuning_saturation">Nasycenie</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Uruchom aplikację muzyki</string>
   <string name="headset_connect_player_summary">Uruchom domyślną aplikację muzyki po podłączeniu słuchawek</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index a0ffd30..4611b4b 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -536,14 +536,7 @@
   <string name="color_red_title">Vermelho</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibrar gama</string>
-  <string name="gamma_tuning_summary_head">Ajustar valores de gama</string>
-  <string name="gamma_tuning_control_set_header">Grupo <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Brilho</string>
-  <string name="gamma_tuning_saturation">Saturação</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Abrir aplicativo de música</string>
   <string name="headset_connect_player_summary">Abrir o aplicativo de música padrão quando os fones de ouvido forem conectados</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 274ec5f..60cd964 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Vermelho</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibração gama</string>
-  <string name="gamma_tuning_summary_head">Ajustar valores gama</string>
-  <string name="gamma_tuning_control_set_header">Grupo <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contraste</string>
-  <string name="gamma_tuning_brightness">Brilho</string>
-  <string name="gamma_tuning_saturation">Saturação</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar a aplicação de música</string>
   <string name="headset_connect_player_summary">Iniciar a aplicação de música predefinida quando ligar os auscultadores</string>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e908d45..c04384b 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -510,14 +510,7 @@
   <string name="color_red_title">Roșu</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Albastru</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Calibrare gama</string>
-  <string name="gamma_tuning_summary_head">Modificare valori gama</string>
-  <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Contrast</string>
-  <string name="gamma_tuning_brightness">Luminozitate</string>
-  <string name="gamma_tuning_saturation">Saturație</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lansează aplicație muzică</string>
   <string name="headset_connect_player_summary">Lansează aplicația implicită de muzică când se conectează casca audio</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 38dd1ce..46be554 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -540,14 +540,7 @@
   <string name="color_red_title">Красный</string>
   <string name="color_green_title">Зеленый</string>
   <string name="color_blue_title">Синий</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Гамма</string>
-  <string name="gamma_tuning_summary_head">Настройка гамма-коррекции экрана</string>
-  <string name="gamma_tuning_control_set_header">Группа <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Контрастность</string>
-  <string name="gamma_tuning_brightness">Яркость</string>
-  <string name="gamma_tuning_saturation">Насыщенность</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Автозапуск плеера</string>
   <string name="headset_connect_player_summary">Запускать плеер при подключении наушников</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index cce1706..87c21e6 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -363,10 +363,6 @@
   <string name="color_red_title">රතු</string>
   <string name="color_green_title">කොළ</string>
   <string name="color_blue_title">නිල්</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">ගැමා ප්‍රමාණ ශෝධනය</string>
-  <string name="gamma_tuning_summary_head">ගැමා අගයන් සීරුමාරු කරන්න</string>
-  <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g> කණ්ඩායම</string>
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 0e3e1eb..4b94cc9 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -476,14 +476,7 @@
   <string name="color_red_title">Červená</string>
   <string name="color_green_title">Zelená</string>
   <string name="color_blue_title">Modrá</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Kalibrácia gamma</string>
-  <string name="gamma_tuning_summary_head">Vylepšiť hodnoty gamma</string>
-  <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Jas</string>
-  <string name="gamma_tuning_saturation">Sýtosť</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Spustiť aplikáciu na prehrávanie hudby</string>
   <string name="headset_connect_player_summary">Spustiť predvolenú aplikáciu na prehrávanie hudby po pripojení slúchadiel</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index f5ba62c..c3a7192 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -542,14 +542,7 @@
   <string name="color_red_title">Rdeča</string>
   <string name="color_green_title">Zelena</string>
   <string name="color_blue_title">Modra</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Umerjanje gama</string>
-  <string name="gamma_tuning_summary_head">Prilagodi vrednosti gama</string>
-  <string name="gamma_tuning_control_set_header">Skupina <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Svetlost</string>
-  <string name="gamma_tuning_saturation">Nasičenost</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Zaženi aplikacijo za glasbo</string>
   <string name="headset_connect_player_summary">Zaženi privzeto aplikacijo za glasbo, ko so priključene slušalke</string>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 0acfd95..1df7150 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -541,14 +541,7 @@
   <string name="color_red_title">Црвена</string>
   <string name="color_green_title">Зелена</string>
   <string name="color_blue_title">Плава</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Гама калибрација</string>
-  <string name="gamma_tuning_summary_head">Штипање гама вредности</string>
-  <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Контраст</string>
-  <string name="gamma_tuning_brightness">Осветљеност</string>
-  <string name="gamma_tuning_saturation">Засићење</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Покрени музичку апликацију</string>
   <string name="headset_connect_player_summary">Покрени подразумевану музичку апликацију када су слушалице повезане</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 9aef4f3..b18f763 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Röd</string>
   <string name="color_green_title">Grön</string>
   <string name="color_blue_title">Blå</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gammakalibrering</string>
-  <string name="gamma_tuning_summary_head">Justera gammavärden</string>
-  <string name="gamma_tuning_control_set_header">Grupp <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Kontrast</string>
-  <string name="gamma_tuning_brightness">Ljusstyrka</string>
-  <string name="gamma_tuning_saturation">Mättnad</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Öppna musikapp</string>
   <string name="headset_connect_player_summary">Öppna standardmusikapp när hörlurar kopplas in</string>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ed5838c..0bf68bd 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">சிவப்பு</string>
   <string name="color_green_title">பச்சை</string>
   <string name="color_blue_title">நீலம்</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">காமா அளவிடுதல்</string>
-  <string name="gamma_tuning_summary_head">டிவீக் காமா மதிப்புகள்</string>
-  <string name="gamma_tuning_control_set_header">குழு <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">மாறுபாடு</string>
-  <string name="gamma_tuning_brightness">ஒளிர்வு</string>
-  <string name="gamma_tuning_saturation">சாச்சுரேசன்</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">இசை ஆப்-ஐ தொடங்குக</string>
   <string name="headset_connect_player_summary">ஹெட்செட் இணைக்கப்பட்டு இருக்கும்போது இயல்நிலை இசை ஆப்-ஐ தொடங்குக</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 3222b6e..dd5bc2a 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">ఎరుపు రంగు</string>
   <string name="color_green_title">పచ్చ రంగు</string>
   <string name="color_blue_title">నీలి రంగు</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">గామా క్రమాంకనం</string>
-  <string name="gamma_tuning_summary_head">గామా విలువలు సర్దుబాటు చేయుము</string>
-  <string name="gamma_tuning_control_set_header">సమూహం <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">వ్యత్యాసం</string>
-  <string name="gamma_tuning_brightness">ప్రకాశం</string>
-  <string name="gamma_tuning_saturation">సంతృప్తత</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">సంగీతాన్ని ప్రారంభించు అనువర్తనం</string>
   <string name="headset_connect_player_summary">హెడ్ సెట్ అనుసంధానించబడి ఉన్నప్పుడు స్వయంసిద్ధ సంగీతం అనువర్తనాన్ని ప్రారంభించుము</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index c086067..feaf136 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">แดง</string>
   <string name="color_green_title">เขียว</string>
   <string name="color_blue_title">น้ำเงิน</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">การปรับเทียบแกมม่า</string>
-  <string name="gamma_tuning_summary_head">ปรับแต่งค่าแกมม่า</string>
-  <string name="gamma_tuning_control_set_header">กลุ่ม <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">สีตัด</string>
-  <string name="gamma_tuning_brightness">ความสว่าง</string>
-  <string name="gamma_tuning_saturation">ความอิ่มตัว</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">เปิดแอปเล่นเพลง</string>
   <string name="headset_connect_player_summary">เปิดแอปเล่นเพลงค่าเริ่มต้นเมื่อมีการเชื่อมต่อจากช่องหูฟัง</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index e12560a..e790c4d 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -539,14 +539,7 @@
   <string name="color_red_title">Kırmızı</string>
   <string name="color_green_title">Yeşil</string>
   <string name="color_blue_title">Mavi</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Gamma kalibrasyonu</string>
-  <string name="gamma_tuning_summary_head">Gamma değerlerini ayarlayın</string>
-  <string name="gamma_tuning_control_set_header">Grup <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Karşıtlık</string>
-  <string name="gamma_tuning_brightness">Parlaklık</string>
-  <string name="gamma_tuning_saturation">Doygunluk</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Müzik uygulamasını başlat</string>
   <string name="headset_connect_player_summary">Kulaklık bağlandığında müzik uygulamasını başlatır</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index c95a0a0..78fc9d3 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -538,14 +538,7 @@
   <string name="color_red_title">قىزىل</string>
   <string name="color_green_title">يېشىل</string>
   <string name="color_blue_title">كۆك</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">گامما توغرىلاش</string>
-  <string name="gamma_tuning_summary_head">گامما قىممىتىنى تەڭشەش</string>
-  <string name="gamma_tuning_control_set_header">گۇرۇپپا <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">ئاق-قارىلىقى</string>
-  <string name="gamma_tuning_brightness">يورۇقلۇق</string>
-  <string name="gamma_tuning_saturation">تويۇنۇش</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">نەغمە ئەپنى قوزغات</string>
   <string name="headset_connect_player_summary">تىڭشىغۇچ قىستۇرۇلغاندا كۆڭۈلدىكى نەغمە چالىدىغان ئەپنى قوزغىتىدۇ</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 5ab0966..6f2520b 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -524,14 +524,7 @@
   <string name="color_red_title">Червоний</string>
   <string name="color_green_title">Зелений</string>
   <string name="color_blue_title">Синій</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Калібрування гамми</string>
-  <string name="gamma_tuning_summary_head">Налаштуйте параметри гамми</string>
-  <string name="gamma_tuning_control_set_header">Група <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Контраст</string>
-  <string name="gamma_tuning_brightness">Яскравість</string>
-  <string name="gamma_tuning_saturation">Насиченість</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Запуск програвача</string>
   <string name="headset_connect_player_summary">Запускати програвач при під’єднанні навушників</string>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 864fc1a..88e3145 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -537,14 +537,7 @@
   <string name="color_red_title">Đỏ</string>
   <string name="color_green_title">Xanh lá</string>
   <string name="color_blue_title">Xanh dương</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">Hiệu chuẩn gamma</string>
-  <string name="gamma_tuning_summary_head">Tinh chỉnh giá trị gamma</string>
-  <string name="gamma_tuning_control_set_header">Nhóm <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">Độ tương phản</string>
-  <string name="gamma_tuning_brightness">Độ sáng</string>
-  <string name="gamma_tuning_saturation">Độ bão hòa</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Khởi động ứng dụng nghe nhạc</string>
   <string name="headset_connect_player_summary">Khởi động ứng dụng nghe nhạc mặc định khi cắm tai nghe</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 76fbc60..d25ad3e 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -536,14 +536,7 @@
   <string name="color_red_title">红</string>
   <string name="color_green_title">绿</string>
   <string name="color_blue_title">蓝</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">伽玛校准</string>
-  <string name="gamma_tuning_summary_head">调整伽玛值</string>
-  <string name="gamma_tuning_control_set_header">组 <xliff:g id="index">%d</xliff:g></string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">对比度</string>
-  <string name="gamma_tuning_brightness">亮度</string>
-  <string name="gamma_tuning_saturation">饱和度</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">启动音乐播放器</string>
   <string name="headset_connect_player_summary">插入耳机时启动默认音乐播放器</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 055dc9f..d765b05 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -445,14 +445,7 @@
   <string name="color_red_title">紅色</string>
   <string name="color_green_title">綠色</string>
   <string name="color_blue_title">藍色</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">伽瑪校準</string>
-  <string name="gamma_tuning_summary_head">調校伽瑪值</string>
-  <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g>群組</string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">對比度</string>
-  <string name="gamma_tuning_brightness">亮度</string>
-  <string name="gamma_tuning_saturation">飽和度</string>
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">自動優先順序</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 19b7fdc..6877eb2 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -481,14 +481,7 @@
   <string name="color_red_title">紅色</string>
   <string name="color_green_title">綠色</string>
   <string name="color_blue_title">藍色</string>
-  <!-- Hardware tunables - Gamma calibration -->
-  <string name="gamma_tuning_title_head">伽瑪校準</string>
-  <string name="gamma_tuning_summary_head">調校伽瑪值</string>
-  <string name="gamma_tuning_control_set_header"><xliff:g id="index">%d</xliff:g>群組</string>
   <!-- used if no name provided by overlay -->
-  <string name="gamma_tuning_contrast">對比度</string>
-  <string name="gamma_tuning_brightness">亮度</string>
-  <string name="gamma_tuning_saturation">飽和度</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">啟動音樂應用程式</string>
   <string name="headset_connect_player_summary">插入耳機時啟動預設音樂應用程式</string>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 82cf3b1..786c346 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -88,7 +88,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- Hardware tunables - Gamma calibration -->
   <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 830f74d..09fd23e 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -376,11 +376,6 @@
         <item>silent</item>
     </string-array>
 
-    <!-- Gamma calibration descriptors, deliberately empty as string values populated via
-         per-device overlay. Required to build on non-hardware tunable devices -->
-    <string-array name="gamma_descriptors" translatable="false">
-    </string-array>
-
     <!-- Values for screen color  -->
     <string-array name="screen_color_setting">
         <item>Standard</item>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 906f19d..ae97862 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -618,13 +618,6 @@
     <string name="color_green_title">Green</string>
     <string name="color_blue_title">Blue</string>
 
-    <!-- Hardware tunables - Gamma calibration -->
-    <string name="gamma_tuning_title_head">Gamma calibration</string>
-    <string name="gamma_tuning_summary_head">Tweak gamma values</string>
-    <string name="gamma_tuning_control_set_header">Group <xliff:g id="index">%d</xliff:g></string> <!-- used if no name provided by overlay -->
-    <string name="gamma_tuning_contrast">Contrast</string>
-    <string name="gamma_tuning_brightness">Brightness</string>
-    <string name="gamma_tuning_saturation">Saturation</string>
 
     <!-- Launch music player when headset is connected -->
     <string name="headset_connect_player_title">Launch music app</string>
diff --git a/res/xml/livedisplay.xml b/res/xml/livedisplay.xml
index 141fc68..ad63ebb 100644
--- a/res/xml/livedisplay.xml
+++ b/res/xml/livedisplay.xml
@@ -71,13 +71,6 @@
                 android:summary="@string/color_calibration_summary"
                 android:persistent="false"/>
 
-        <com.android.settings.livedisplay.DisplayGamma
-                android:key="gamma_tuning"
-                android:title="@string/gamma_tuning_title_head"
-                android:dialogTitle="@string/gamma_tuning_title_head"
-                android:summary="@string/gamma_tuning_summary_head"
-                android:persistent="false"/>
-
         <!-- Adaptive backlight -->
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="display_low_power"
diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java
index 19c2794..7bee75c 100644
--- a/src/com/android/settings/cyanogenmod/BootReceiver.java
+++ b/src/com/android/settings/cyanogenmod/BootReceiver.java
@@ -28,7 +28,6 @@ import com.android.settings.Utils;
 import com.android.settings.contributors.ContributorsCloudFragment;
 import com.android.settings.hardware.VibratorIntensity;
 import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
-import com.android.settings.livedisplay.DisplayGamma;
 import com.android.settings.location.LocationSettings;
 import com.android.settings.DevelopmentSettings;
 
@@ -42,7 +41,6 @@ public class BootReceiver extends BroadcastReceiver {
         if (!hasRestoredTunable(ctx)) {
             /* Restore the hardware tunable values */
             ButtonSettings.restoreKeyDisabler(ctx);
-            DisplayGamma.restore(ctx);
             VibratorIntensity.restore(ctx);
             InputMethodAndLanguageSettings.restore(ctx);
             setRestoredTunable(ctx);
diff --git a/src/com/android/settings/livedisplay/DisplayColor.java b/src/com/android/settings/livedisplay/DisplayColor.java
index 5db508f..f6fee82 100644
--- a/src/com/android/settings/livedisplay/DisplayColor.java
+++ b/src/com/android/settings/livedisplay/DisplayColor.java
@@ -16,17 +16,13 @@
 
 package com.android.settings.livedisplay;
 
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION;
-
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.UserHandle;
 import android.preference.DialogPreference;
-import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -36,8 +32,7 @@ import android.widget.TextView;
 import com.android.settings.IntervalSeekBar;
 import com.android.settings.R;
 
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
+import cyanogenmod.hardware.LiveDisplayManager;
 
 /**
  * Special preference type that allows configuration of Color settings
@@ -46,11 +41,7 @@ public class DisplayColor extends DialogPreference {
     private static final String TAG = "ColorCalibration";
 
     private final Context mContext;
-
-    private final int minRGB;
-    private final int maxRGB;
-    private final float defaultRGB;
-    private final boolean useCMHW;
+    private final LiveDisplayManager mLiveDisplay;
 
     // These arrays must all match in length and order
     private static final int[] SEEKBAR_ID = new int[] {
@@ -74,19 +65,7 @@ public class DisplayColor extends DialogPreference {
         super(context, attrs);
 
         mContext = context;
-
-        final CMHardwareManager mHardware = CMHardwareManager.getInstance(context);
-        useCMHW = mHardware.isSupported(FEATURE_DISPLAY_COLOR_CALIBRATION);
-        if (useCMHW) {
-            minRGB = mHardware.getDisplayColorCalibrationMin();
-            maxRGB = mHardware.getDisplayColorCalibrationMax();
-            defaultRGB = (float) mHardware.getDisplayColorCalibrationDefault() / maxRGB;
-        } else {
-            // Initialize these just to avoid compiler errors.
-            minRGB = 20;
-            maxRGB = 100;
-            defaultRGB = 1.0f;
-        }
+        mLiveDisplay = LiveDisplayManager.getInstance(mContext);
 
         setDialogLayoutResource(R.layout.display_color_calibration);
     }
@@ -105,38 +84,16 @@ public class DisplayColor extends DialogPreference {
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
-        String colorAdjustmentTemp = CMSettings.System.getStringForUser(
-                mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
-                UserHandle.USER_CURRENT);
-        String[] colorAdjustment = colorAdjustmentTemp == null ?
-                null : colorAdjustmentTemp.split(" ");
-        if (colorAdjustment == null || colorAdjustment.length != 3) {
-            colorAdjustment = new String[] { Float.toString(defaultRGB),
-                    Float.toString(defaultRGB), Float.toString(defaultRGB) };
-        }
-        try {
-            mOriginalColors[0] = Float.parseFloat(colorAdjustment[0]);
-            mOriginalColors[1] = Float.parseFloat(colorAdjustment[1]);
-            mOriginalColors[2] = Float.parseFloat(colorAdjustment[2]);
-        } catch (NumberFormatException e) {
-            mOriginalColors[0] = defaultRGB;
-            mOriginalColors[1] = defaultRGB;
-            mOriginalColors[2] = defaultRGB;
-        }
-
+        System.arraycopy(mLiveDisplay.getColorAdjustment(), 0, mOriginalColors, 0, 3);
         System.arraycopy(mOriginalColors, 0, mCurrentColors, 0, 3);
 
         for (int i = 0; i < SEEKBAR_ID.length; i++) {
             IntervalSeekBar seekBar = (IntervalSeekBar) view.findViewById(SEEKBAR_ID[i]);
             TextView value = (TextView) view.findViewById(SEEKBAR_VALUE_ID[i]);
             mSeekBars[i] = new ColorSeekBar(seekBar, value, i);
-            if (useCMHW) {
-                mSeekBars[i].mSeekBar.setMinimum((float) minRGB / maxRGB);
-                /* Maximum hasn't changed but it's relative to the minimum so it needs
-                   to be reset */
-                mSeekBars[i].mSeekBar.setMaximum(1.0f);
-            }
+            mSeekBars[i].mSeekBar.setMinimum(0.1f);
+            mSeekBars[i].mSeekBar.setMaximum(1.0f);
+
             mSeekBars[i].mSeekBar.setProgressFloat(mCurrentColors[i]);
             int percent = Math.round(100F * mCurrentColors[i]);
             value.setText(String.format("%d%%", percent));
@@ -155,8 +112,8 @@ public class DisplayColor extends DialogPreference {
             @Override
             public void onClick(View v) {
                 for (int i = 0; i < mSeekBars.length; i++) {
-                    mSeekBars[i].mSeekBar.setProgressFloat(defaultRGB);
-                    mCurrentColors[i] = defaultRGB;
+                    mSeekBars[i].mSeekBar.setProgressFloat(1.0f);
+                    mCurrentColors[i] = 1.0f;
                 }
                 updateColors(mCurrentColors);
             }
@@ -241,12 +198,7 @@ public class DisplayColor extends DialogPreference {
     }
 
     private void updateColors(float[] colors) {
-        CMSettings.System.putStringForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
-                new StringBuilder().append(colors[0]).append(" ")
-                                   .append(colors[1]).append(" ")
-                                   .append(colors[2]).toString(),
-                UserHandle.USER_CURRENT);
+        mLiveDisplay.setColorAdjustment(colors);
     }
 
     private class ColorSeekBar implements SeekBar.OnSeekBarChangeListener {
diff --git a/src/com/android/settings/livedisplay/DisplayGamma.java b/src/com/android/settings/livedisplay/DisplayGamma.java
deleted file mode 100644
index 2b44cea..0000000
--- a/src/com/android/settings/livedisplay/DisplayGamma.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (C) 2013-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.
- */
-
-package com.android.settings.livedisplay;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.content.res.Resources;
-import android.os.Bundle;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.preference.DialogPreference;
-import android.preference.PreferenceManager;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-import com.android.settings.R;
-
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-
-/**
- * Special preference type that allows configuration of Gamma settings
- */
-public class DisplayGamma extends DialogPreference {
-    private static final String TAG = "GammaCalibration";
-
-    private static final int[] BAR_COLORS = new int[] {
-        R.string.color_red_title,
-        R.string.color_green_title,
-        R.string.color_blue_title
-    };
-
-    private GammaSeekBar[][] mSeekBars;
-
-    private int[][] mCurrentColors;
-    private int[][] mOriginalColors;
-    private int mNumberOfControls;
-    private CMHardwareManager mHardware;
-
-    public DisplayGamma(Context context, AttributeSet attrs) {
-        super(context, attrs);
-
-        mHardware = CMHardwareManager.getInstance(context);
-        if (!mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-            return;
-        }
-
-        mNumberOfControls = mHardware.getNumGammaControls();
-        mSeekBars = new GammaSeekBar[mNumberOfControls][BAR_COLORS.length];
-
-        mOriginalColors = new int[mNumberOfControls][];
-        mCurrentColors = new int[mNumberOfControls][];
-
-        setDialogLayoutResource(R.layout.display_gamma_calibration);
-    }
-
-    @Override
-    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
-        builder.setNeutralButton(R.string.settings_reset_button,
-                new DialogInterface.OnClickListener() {
-            @Override
-            public void onClick(DialogInterface dialog, int which) {
-            }
-        });
-    }
-
-    @Override
-    protected void onBindDialogView(View view) {
-        super.onBindDialogView(view);
-
-        final ViewGroup container = (ViewGroup) view.findViewById(R.id.gamma_container);
-        final LayoutInflater inflater = LayoutInflater.from(getContext());
-        final SharedPreferences prefs = getSharedPreferences();
-        final Resources res = container.getResources();
-        final String[] gammaDescriptors = res.getStringArray(R.array.gamma_descriptors);
-
-        // Create multiple sets of seekbars, depending on the
-        // number of controls the device has
-        for (int index = 0; index < mNumberOfControls; index++) {
-            mOriginalColors[index] = mHardware.getDisplayGammaCalibration(index);
-            mCurrentColors[index] = Arrays.copyOf(mOriginalColors[index],
-                    mOriginalColors[index].length);
-
-            final String defaultKey = "display_gamma_default_" + index;
-            if (!prefs.contains(defaultKey)) {
-                prefs.edit()
-                        .putString(defaultKey, buildPreferenceValue(mOriginalColors[index]))
-                        .apply();
-            }
-
-            if (mNumberOfControls != 1) {
-                TextView header = (TextView) inflater.inflate(
-                        R.layout.display_gamma_calibration_header, container, false);
-
-                if (index < gammaDescriptors.length) {
-                    header.setText(gammaDescriptors[index]);
-                } else {
-                    header.setText(res.getString(
-                            R.string.gamma_tuning_control_set_header, index + 1));
-                }
-                container.addView(header);
-            }
-
-            int min = mHardware.getDisplayGammaCalibrationMin();
-            int max = mHardware.getDisplayGammaCalibrationMax();
-            for (int color = 0; color < BAR_COLORS.length; color++) {
-                ViewGroup item = (ViewGroup) inflater.inflate(
-                        R.layout.display_gamma_calibration_item, container, false);
-
-                mSeekBars[index][color] = new GammaSeekBar(index, color, item, min, max);
-                mSeekBars[index][color].setGamma(mCurrentColors[index][color]);
-                // make sure to add the seekbar group to the container _after_
-                // creating GammaSeekBar, so that GammaSeekBar has a chance to
-                // get the correct subviews without getting confused by duplicate IDs
-                container.addView(item);
-            }
-        }
-    }
-
-    @Override
-    protected void showDialog(Bundle state) {
-        super.showDialog(state);
-
-        // can't use onPrepareDialogBuilder for this as we want the dialog
-        // to be kept open on click
-        AlertDialog d = (AlertDialog) getDialog();
-        Button defaultsButton = d.getButton(DialogInterface.BUTTON_NEUTRAL);
-        defaultsButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                for (int index = 0; index < mSeekBars.length; index++) {
-                    final SharedPreferences prefs = getSharedPreferences();
-                    final String defaultKey = "display_gamma_default_" + index;
-                    // this key is guaranteed to be present, as we have
-                    // created it in onBindDialogView()
-                    final String value = prefs.getString(defaultKey, null);
-                    final String[] defaultColors = value.split(" ");
-
-                    for (int color = 0; color < BAR_COLORS.length; color++) {
-                        int val = Integer.valueOf(defaultColors[color]);
-                        mSeekBars[index][color].setGamma(val);
-                        mCurrentColors[index][color] = val;
-                    }
-                    writeDisplayGamma(getContext(), index, mCurrentColors[index]);
-                }
-            }
-       });
-    }
-
-    @Override
-    protected void onDialogClosed(boolean positiveResult) {
-        super.onDialogClosed(positiveResult);
-
-        if (positiveResult) {
-            Editor editor = getEditor();
-            for (int i = 0; i < mNumberOfControls; i++) {
-                editor.putString("display_gamma_" + i,
-                        buildPreferenceValue(mHardware.getDisplayGammaCalibration(i)));
-            }
-            editor.apply();
-        } else if (mOriginalColors != null) {
-            for (int i = 0; i < mNumberOfControls; i++) {
-                writeDisplayGamma(getContext(), i, mOriginalColors[i]);
-            }
-        }
-    }
-
-    @Override
-    protected Parcelable onSaveInstanceState() {
-        final Parcelable superState = super.onSaveInstanceState();
-        if (getDialog() == null || !getDialog().isShowing()) {
-            return superState;
-        }
-
-        // Save the dialog state
-        final SavedState myState = new SavedState(superState);
-        myState.controlCount = mNumberOfControls;
-        myState.currentColors = mCurrentColors;
-        myState.originalColors = mOriginalColors;
-
-        // Restore the old state when the activity or dialog is being paused
-        for (int i = 0; i < mNumberOfControls; i++) {
-            writeDisplayGamma(getContext(), i, mOriginalColors[i]);
-        }
-        mOriginalColors = null;
-
-        return myState;
-    }
-
-    @Override
-    protected void onRestoreInstanceState(Parcelable state) {
-        if (state == null || !state.getClass().equals(SavedState.class)) {
-            // Didn't save state for us in onSaveInstanceState
-            super.onRestoreInstanceState(state);
-            return;
-        }
-
-        SavedState myState = (SavedState) state;
-        super.onRestoreInstanceState(myState.getSuperState());
-        mNumberOfControls = myState.controlCount;
-        mOriginalColors = myState.originalColors;
-        mCurrentColors = myState.currentColors;
-
-        for (int index = 0; index < mNumberOfControls; index++) {
-            for (int color = 0; color < BAR_COLORS.length; color++) {
-                mSeekBars[index][color].setGamma(mCurrentColors[index][color]);
-            }
-            writeDisplayGamma(getContext(), index, mCurrentColors[index]);
-        }
-    }
-
-    private String buildPreferenceValue(int[] colorValues) {
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < colorValues.length; i++) {
-            if (i != 0) {
-                builder.append(" ");
-            }
-            builder.append(colorValues[i]);
-        }
-        return builder.toString();
-    }
-
-    public static void restore(Context context) {
-        final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
-        if (!hardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-            return;
-        }
-
-        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        int[] rgb = new int[3];
-        for (int i = 0; i < hardware.getNumGammaControls(); i++) {
-            final String value = prefs.getString("display_gamma_" + i, null);
-            if (value != null) {
-                final String[] values = value.split(" ");
-                rgb[0] = Integer.valueOf(values[0]);
-                rgb[1] = Integer.valueOf(values[1]);
-                rgb[2] = Integer.valueOf(values[2]);
-                writeDisplayGamma(context, i, rgb);
-            }
-        }
-    }
-
-    private static class SavedState extends BaseSavedState {
-        int controlCount;
-        int[][] originalColors;
-        int[][] currentColors;
-
-        public SavedState(Parcelable superState) {
-            super(superState);
-        }
-
-        public SavedState(Parcel source) {
-            super(source);
-            controlCount = source.readInt();
-            originalColors = new int[controlCount][];
-            currentColors = new int[controlCount][];
-            for (int i = 0; i < controlCount; i++) {
-                originalColors[i] = source.createIntArray();
-            }
-            for (int i = 0; i < controlCount; i++) {
-                currentColors[i] = source.createIntArray();
-            }
-        }
-
-        @Override
-        public void writeToParcel(Parcel dest, int flags) {
-            super.writeToParcel(dest, flags);
-            dest.writeInt(controlCount);
-            for (int i = 0; i < controlCount; i++) {
-                dest.writeIntArray(originalColors[i]);
-            }
-            for (int i = 0; i < controlCount; i++) {
-                dest.writeIntArray(currentColors[i]);
-            }
-        }
-
-        public static final Parcelable.Creator<SavedState> CREATOR =
-                new Parcelable.Creator<SavedState>() {
-
-            public SavedState createFromParcel(Parcel in) {
-                return new SavedState(in);
-            }
-
-            public SavedState[] newArray(int size) {
-                return new SavedState[size];
-            }
-        };
-    }
-
-    private static void writeDisplayGamma(Context context, int index, int[] entries) {
-        StringBuilder builder = new StringBuilder();
-        for (int i = 0; i < entries.length; i++) {
-            builder.append(i);
-            if (i != entries.length - 1) {
-                builder.append("|");
-            }
-        }
-        CMSettings.Secure.putString(context.getContentResolver(),
-                CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + index,
-                builder.toString());
-    }
-
-    private class GammaSeekBar implements SeekBar.OnSeekBarChangeListener {
-        private int mControlIndex;
-        private int mColorIndex;
-        private int mOriginal;
-        private int mMin;
-        private int mMax;
-        private SeekBar mSeekBar;
-        private TextView mValue;
-
-        public GammaSeekBar(int controlIndex, int colorIndex, ViewGroup container,
-                int min, int max) {
-            mControlIndex = controlIndex;
-            mColorIndex = colorIndex;
-
-            mMin = min;
-            mMax = max;
-
-            mValue = (TextView) container.findViewById(R.id.color_value);
-            mSeekBar = (SeekBar) container.findViewById(R.id.color_seekbar);
-
-            TextView label = (TextView) container.findViewById(R.id.color_text);
-            label.setText(container.getContext().getString(BAR_COLORS[colorIndex]));
-
-            mSeekBar.setMax(mMax - mMin);
-            mSeekBar.setProgress(0);
-            mValue.setText(String.valueOf(mSeekBar.getProgress() + mMin));
-
-            // this must be done last, we don't want to apply our initial value to the hardware
-            mSeekBar.setOnSeekBarChangeListener(this);
-        }
-
-        public void setGamma(int gamma) {
-            mSeekBar.setProgress(gamma - mMin);
-        }
-
-        @Override
-        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-            if (fromUser) {
-                mCurrentColors[mControlIndex][mColorIndex] = progress + mMin;
-                writeDisplayGamma(getContext(), mControlIndex, mCurrentColors[mControlIndex]);
-            }
-            mValue.setText(String.valueOf(progress + mMin));
-        }
-
-        @Override
-        public void onStartTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-
-        @Override
-        public void onStopTrackingTouch(SeekBar seekBar) {
-            // Do nothing
-        }
-    }
-}
diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java
index 24ca747..f63204b 100644
--- a/src/com/android/settings/livedisplay/DisplayTemperature.java
+++ b/src/com/android/settings/livedisplay/DisplayTemperature.java
@@ -22,9 +22,7 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.os.UserHandle;
 import android.preference.DialogPreference;
-import android.provider.Settings;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Button;
@@ -32,7 +30,9 @@ import android.widget.SeekBar;
 import android.widget.TextView;
 
 import com.android.settings.R;
-import cyanogenmod.providers.CMSettings;
+
+import cyanogenmod.hardware.LiveDisplayConfig;
+import cyanogenmod.hardware.LiveDisplayManager;
 
 /**
  * Preference for selection of color temperature range for LiveDisplay
@@ -48,17 +48,14 @@ public class DisplayTemperature extends DialogPreference {
     private int mOriginalDayTemperature;
     private int mOriginalNightTemperature;
 
-    private final int mDefaultDayTemperature;
-    private final int mDefaultNightTemperature;
+    private final LiveDisplayManager mLiveDisplay;
+    private final LiveDisplayConfig mConfig;
 
     public DisplayTemperature(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
-
-        mDefaultDayTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
-        mDefaultNightTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
+        mLiveDisplay = LiveDisplayManager.getInstance(mContext);
+        mConfig = mLiveDisplay.getConfig();
 
         setDialogLayoutResource(R.layout.display_temperature);
     }
@@ -77,14 +74,8 @@ public class DisplayTemperature extends DialogPreference {
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
-        mOriginalDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
-        mOriginalNightTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
-                mDefaultNightTemperature,
-                UserHandle.USER_CURRENT);
+        mOriginalDayTemperature = mLiveDisplay.getDayColorTemperature();
+        mOriginalNightTemperature = mLiveDisplay.getNightColorTemperature();
 
         SeekBar day = (SeekBar) view.findViewById(R.id.day_temperature_seekbar);
         TextView dayText = (TextView) view.findViewById(R.id.day_temperature_value);
@@ -109,8 +100,8 @@ public class DisplayTemperature extends DialogPreference {
         defaultsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mDayTemperature.setProgress(mDefaultDayTemperature);
-                mNightTemperature.setProgress(mDefaultNightTemperature);
+                mDayTemperature.setProgress(mConfig.getDefaultDayTemperature());
+                mNightTemperature.setProgress(mConfig.getDefaultNightTemperature());
                 updateTemperature(true);
             }
         });
@@ -206,13 +197,8 @@ public class DisplayTemperature extends DialogPreference {
         int night = accept ? mNightTemperature.getProgress() : mOriginalNightTemperature;
         callChangeListener(new Integer[] { day, night });
 
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY, day,
-                UserHandle.USER_CURRENT);
-
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT, night,
-                UserHandle.USER_CURRENT);
+        mLiveDisplay.setDayColorTemperature(day);
+        mLiveDisplay.setNightColorTemperature(night);
     }
 
     private class ColorTemperatureSeekBar implements SeekBar.OnSeekBarChangeListener {
diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index 7000cc8..5cb7aff 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -15,20 +15,17 @@
  */
 package com.android.settings.livedisplay;
 
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT;
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_COLOR_ENHANCEMENT;
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_MODES;
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION;
-import static cyanogenmod.hardware.CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT;
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_CABC;
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_COLOR_ENHANCEMENT;
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_DISPLAY_MODES;
+import static cyanogenmod.hardware.LiveDisplayManager.MODE_OFF;
+import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR;
 
-import android.app.Activity;
-import android.database.ContentObserver;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.net.Uri;
-import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
@@ -38,7 +35,6 @@ import android.preference.PreferenceCategory;
 import android.preference.PreferenceScreen;
 import android.preference.SwitchPreference;
 import android.provider.SearchIndexableResource;
-import android.provider.Settings;
 import android.util.Log;
 
 import com.android.internal.util.ArrayUtils;
@@ -48,14 +44,17 @@ import com.android.settings.Utils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.hardware.DisplayMode;
-import cyanogenmod.providers.CMSettings;
 import org.cyanogenmod.internal.logging.CMMetricsLogger;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import cyanogenmod.hardware.CMHardwareManager;
+import cyanogenmod.hardware.DisplayMode;
+import cyanogenmod.hardware.LiveDisplayConfig;
+import cyanogenmod.hardware.LiveDisplayManager;
+import cyanogenmod.providers.CMSettings;
+
 public class LiveDisplay extends SettingsPreferenceFragment implements
         Preference.OnPreferenceChangeListener, Indexable {
 
@@ -72,17 +71,10 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     private static final String KEY_LIVE_DISPLAY_TEMPERATURE = "live_display_color_temperature";
 
     private static final String KEY_DISPLAY_COLOR = "color_calibration";
-    private static final String KEY_DISPLAY_GAMMA = "gamma_tuning";
     private static final String KEY_SCREEN_COLOR_SETTINGS = "screencolor_settings";
 
     private static final String KEY_LIVE_DISPLAY_COLOR_PROFILE = "live_display_color_profile";
 
-    public static final int MODE_OFF = 0;
-    public static final int MODE_NIGHT = 1;
-    public static final int MODE_AUTO = 2;
-    public static final int MODE_OUTDOOR = 3;
-    public static final int MODE_DAY = 4;
-
     private final Handler mHandler = new Handler();
     private final SettingsObserver mObserver = new SettingsObserver();
 
@@ -102,26 +94,21 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     private String[] mModeValues;
     private String[] mModeSummaries;
 
-    private int mDefaultDayTemperature;
-    private int mDefaultNightTemperature;
-
     private boolean mHasDisplayModes = false;
 
+    private LiveDisplayManager mLiveDisplayManager;
+    private LiveDisplayConfig mConfig;
+
     private CMHardwareManager mHardware;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        final Activity activity = getActivity();
-        final ContentResolver resolver = activity.getContentResolver();
         final Resources res = getResources();
 
-        mDefaultDayTemperature = res.getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
-        mDefaultNightTemperature = res.getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
-
-        mHardware = CMHardwareManager.getInstance(activity);
+        mHardware = CMHardwareManager.getInstance(getActivity());
+        mLiveDisplayManager = LiveDisplayManager.getInstance(getActivity());
+        mConfig = mLiveDisplayManager.getConfig();
 
         addPreferencesFromResource(R.xml.livedisplay);
 
@@ -130,9 +117,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         PreferenceCategory advancedPrefs = (PreferenceCategory)
                 findPreference(KEY_CATEGORY_ADVANCED);
 
-        int adaptiveMode = CMSettings.System.getIntForUser(resolver,
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                0, UserHandle.USER_CURRENT);
+        int adaptiveMode = mLiveDisplayManager.getMode();
+
         mLiveDisplay = (ListPreference) findPreference(KEY_LIVE_DISPLAY);
         mLiveDisplay.setValue(String.valueOf(adaptiveMode));
 
@@ -144,7 +130,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
                 org.cyanogenmod.platform.internal.R.array.live_display_summaries);
 
         // Remove outdoor mode from lists if there is no support
-        if (!mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+        if (!mConfig.hasFeature(LiveDisplayManager.MODE_OUTDOOR)) {
             int idx = ArrayUtils.indexOf(mModeValues, String.valueOf(MODE_OUTDOOR));
             String[] entriesTemp = new String[mModeEntries.length - 1];
             String[] valuesTemp = new String[mModeValues.length - 1];
@@ -172,7 +158,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
         mColorProfile = (ListPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_PROFILE);
         if (liveDisplayPrefs != null && mColorProfile != null
-                && (!mHardware.isSupported(FEATURE_DISPLAY_MODES) || !updateDisplayModes())) {
+                && (!mConfig.hasFeature(FEATURE_DISPLAY_MODES) || !updateDisplayModes())) {
             liveDisplayPrefs.removePreference(mColorProfile);
         } else {
             mHasDisplayModes = true;
@@ -181,33 +167,25 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
         mOutdoorMode = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
         if (liveDisplayPrefs != null && mOutdoorMode != null
-                && !mHardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+                && !mConfig.hasFeature(MODE_OUTDOOR)) {
             liveDisplayPrefs.removePreference(mOutdoorMode);
             mOutdoorMode = null;
         }
 
         mLowPower = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_LOW_POWER);
         if (advancedPrefs != null && mLowPower != null
-                && !mHardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
+                && !mConfig.hasFeature(FEATURE_CABC)) {
             advancedPrefs.removePreference(mLowPower);
             mLowPower = null;
         }
 
         mColorEnhancement = (SwitchPreference) findPreference(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
         if (advancedPrefs != null && mColorEnhancement != null
-                && !mHardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
+                && !mConfig.hasFeature(FEATURE_COLOR_ENHANCEMENT)) {
             advancedPrefs.removePreference(mColorEnhancement);
             mColorEnhancement = null;
         }
 
-        if (advancedPrefs != null
-                && !mHardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-            Preference gammaPref = findPreference(KEY_DISPLAY_GAMMA);
-            if (gammaPref != null) {
-                advancedPrefs.removePreference(gammaPref);
-            }
-        }
-
         mScreenColorSettings = (PreferenceScreen) findPreference(KEY_SCREEN_COLOR_SETTINGS);
         if (advancedPrefs != null) {
             if (mScreenColorSettings != null &&
@@ -310,9 +288,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     }
 
     private void updateModeSummary() {
-        int mode = CMSettings.System.getIntForUser(getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                MODE_OFF, UserHandle.USER_CURRENT);
+        int mode = mLiveDisplayManager.getMode();
 
         int index = ArrayUtils.indexOf(mModeValues, String.valueOf(mode));
         if (index < 0) {
@@ -331,14 +307,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     }
 
     private void updateTemperatureSummary() {
-        int day = CMSettings.System.getIntForUser(getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
-        int night = CMSettings.System.getIntForUser(getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
-                mDefaultNightTemperature,
-                UserHandle.USER_CURRENT);
+        int day = mLiveDisplayManager.getDayColorTemperature();
+        int night = mLiveDisplayManager.getNightColorTemperature();
 
         mDisplayTemperature.setSummary(getResources().getString(
                 R.string.live_display_color_temperature_summary, day, night));
@@ -347,9 +317,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     @Override
     public boolean onPreferenceChange(Preference preference, Object objValue) {
         if (preference == mLiveDisplay) {
-            CMSettings.System.putIntForUser(getContentResolver(),
-                    CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                    Integer.valueOf((String)objValue), UserHandle.USER_CURRENT);
+            mLiveDisplayManager.setMode(Integer.valueOf((String)objValue));
         } else if (preference == mColorProfile) {
             int id = Integer.valueOf((String)objValue);
             Log.i("LiveDisplay", "Setting mode: " + id);
@@ -401,8 +369,6 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
-        private boolean mHasSunlightEnhancement, mHasColorEnhancement, mHasLowPower;
-        private boolean mHasDisplayGamma;
 
         @Override
         public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
@@ -419,19 +385,20 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
 
         @Override
         public List<String> getNonIndexableKeys(Context context) {
-             CMHardwareManager hardware = CMHardwareManager.getInstance(context);
+            final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
+            final LiveDisplayConfig config = LiveDisplayManager.getInstance(context).getConfig();
 
             ArrayList<String> result = new ArrayList<String>();
             if (!hardware.isSupported(FEATURE_DISPLAY_MODES)) {
                 result.add(KEY_LIVE_DISPLAY_COLOR_PROFILE);
             }
-            if (!hardware.isSupported(FEATURE_SUNLIGHT_ENHANCEMENT)) {
+            if (!config.hasFeature(MODE_OUTDOOR)) {
                 result.add(KEY_LIVE_DISPLAY_AUTO_OUTDOOR_MODE);
             }
-            if (!hardware.isSupported(FEATURE_COLOR_ENHANCEMENT)) {
+            if (!config.hasFeature(FEATURE_COLOR_ENHANCEMENT)) {
                 result.add(KEY_LIVE_DISPLAY_COLOR_ENHANCE);
             }
-            if (!hardware.isSupported(FEATURE_ADAPTIVE_BACKLIGHT)) {
+            if (!config.hasFeature(FEATURE_CABC)) {
                 result.add(KEY_LIVE_DISPLAY_LOW_POWER);
             }
             if (!isPostProcessingSupported(context)) {
@@ -439,9 +406,6 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             } else {
                 result.add(KEY_DISPLAY_COLOR);
             }
-            if (!hardware.isSupported(FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-                result.add(KEY_DISPLAY_GAMMA);
-            }
             return result;
         }
     };
-- 
cgit v1.1


From 5eff3e8d8ff1f8a23b40717872d5f055b45ebf2e Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sat, 9 Apr 2016 12:16:34 +0200
Subject: SpamList: Set correct color & remove text from notifications menu
 item

Change-Id: I3b938becf2cabe7c58129b78d4d0d2fd2c9d9e04
---
 res/drawable/ic_filter_notifications.xml           | 5 ++---
 src/com/android/settings/cyanogenmod/SpamList.java | 3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/res/drawable/ic_filter_notifications.xml b/res/drawable/ic_filter_notifications.xml
index 0d0873b..6ff5660 100644
--- a/res/drawable/ic_filter_notifications.xml
+++ b/res/drawable/ic_filter_notifications.xml
@@ -18,11 +18,10 @@
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?android:attr/colorAccent">
+    android:viewportHeight="24">
 
     <path
-        android:fillColor="#000000"
+        android:fillColor="@android:color/white"
         android:pathData="M3.5,19v-1l2-2v-5.5c0-3.1,2.1-5.6,5-6.3V3.5C10.5,2.7,11.2,2,12,2s1.5,0.7,1.5,1.5v0.7c2.9,0.7,5,3.2,5,6.3V16l2,2v1H3.5z
 M12,22c-1.1,0-2-0.9-2-2h4C14,21.1,13.1,22,12,22z" />
 </vector>
\ No newline at end of file
diff --git a/src/com/android/settings/cyanogenmod/SpamList.java b/src/com/android/settings/cyanogenmod/SpamList.java
index 184ca6c..b1a24a8 100644
--- a/src/com/android/settings/cyanogenmod/SpamList.java
+++ b/src/com/android/settings/cyanogenmod/SpamList.java
@@ -121,8 +121,7 @@ public class SpamList extends ListFragment {
         menu.add(0, MENU_NOTIFICATIONS, 0, R.string.volume_notification_description)
                 .setIcon(R.drawable.ic_filter_notifications)
                 .setAlphabeticShortcut('n')
-                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
-                MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
     }
 
     @Override
-- 
cgit v1.1


From ef3407cce005b646f3edd22e6e8cf97ec7204cff Mon Sep 17 00:00:00 2001
From: "tao.pei" <tao.pei@ck-telecom.com>
Date: Wed, 23 Mar 2016 10:06:21 +0800
Subject: Setting: Disable WPS Push Button/Pin Entry when WiFi is disabled

Change-Id: Ia03c81dd3a6abf01680e2e2e2ba87f15c2f33b97
---
 .../android/settings/wifi/AdvancedWifiSettings.java  | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index f764dd4..7aaaa90 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -71,6 +71,9 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
     private NetworkScoreManager mNetworkScoreManager;
     private AppListSwitchPreference mWifiAssistantPreference;
 
+    private Preference mWpsPushPref;
+    private Preference mWpsPinPref;
+
     private IntentFilter mFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -79,6 +82,11 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
             if (action.equals(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION) ||
                 action.equals(WifiManager.NETWORK_STATE_CHANGED_ACTION)) {
                 refreshWifiInfo();
+            } else if (action.equals(WifiManager.WIFI_STATE_CHANGED_ACTION)) {
+                int state = intent.getIntExtra(WifiManager.EXTRA_WIFI_STATE,
+                        WifiManager.WIFI_STATE_UNKNOWN);
+                mWpsPushPref.setEnabled(WifiManager.WIFI_STATE_ENABLED == state);
+                mWpsPinPref.setEnabled(WifiManager.WIFI_STATE_ENABLED == state);
             }
         }
     };
@@ -101,6 +109,7 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.LINK_CONFIGURATION_CHANGED_ACTION);
         mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+        mFilter.addAction(WifiManager.WIFI_STATE_CHANGED_ACTION);
         mNetworkScoreManager =
                 (NetworkScoreManager) getSystemService(Context.NETWORK_SCORE_SERVICE);
     }
@@ -162,25 +171,28 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
         Preference wifiDirectPref = findPreference(KEY_WIFI_DIRECT);
         wifiDirectPref.setIntent(wifiDirectIntent);
 
+        final int wifiState = mWifiManager.getWifiState();
         // WpsDialog: Create the dialog like WifiSettings does.
-        Preference wpsPushPref = findPreference(KEY_WPS_PUSH);
-        wpsPushPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+        mWpsPushPref = findPreference(KEY_WPS_PUSH);
+        mWpsPushPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                 public boolean onPreferenceClick(Preference arg0) {
                     WpsFragment wpsFragment = new WpsFragment(WpsInfo.PBC);
                     wpsFragment.show(getFragmentManager(), KEY_WPS_PUSH);
                     return true;
                 }
         });
+        mWpsPushPref.setEnabled(WifiManager.WIFI_STATE_ENABLED == wifiState);
 
         // WpsDialog: Create the dialog like WifiSettings does.
-        Preference wpsPinPref = findPreference(KEY_WPS_PIN);
-        wpsPinPref.setOnPreferenceClickListener(new OnPreferenceClickListener(){
+        mWpsPinPref = findPreference(KEY_WPS_PIN);
+        mWpsPinPref.setOnPreferenceClickListener(new OnPreferenceClickListener(){
                 public boolean onPreferenceClick(Preference arg0) {
                     WpsFragment wpsFragment = new WpsFragment(WpsInfo.DISPLAY);
                     wpsFragment.show(getFragmentManager(), KEY_WPS_PIN);
                     return true;
                 }
         });
+        mWpsPinPref.setEnabled(WifiManager.WIFI_STATE_ENABLED == wifiState);
 
         ListPreference frequencyPref = (ListPreference) findPreference(KEY_FREQUENCY_BAND);
 
-- 
cgit v1.1


From fd7727422fdce8517ce3b2d236c4c27125d99a30 Mon Sep 17 00:00:00 2001
From: Scott Mertz <scott@cyngn.com>
Date: Wed, 13 Apr 2016 19:49:38 -0700
Subject: Settings: use the actual user id to set pattern size

Ticket: CYNGNOS-2462
Change-Id: I1af2b69dabdc0aa010edb354c6274af57b442618
---
 src/com/android/settings/ChooseLockPattern.java  | 2 +-
 src/com/android/settings/ConfirmLockPattern.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/ChooseLockPattern.java b/src/com/android/settings/ChooseLockPattern.java
index c85e604..5dd6b9c 100644
--- a/src/com/android/settings/ChooseLockPattern.java
+++ b/src/com/android/settings/ChooseLockPattern.java
@@ -703,7 +703,7 @@ public class ChooseLockPattern extends SettingsActivity {
         protected Intent saveAndVerifyInBackground() {
             Intent result = null;
             final int userId = UserHandle.myUserId();
-            mUtils.setLockPatternSize(mPatternSize);
+            mUtils.setLockPatternSize(mPatternSize, userId);
             mUtils.saveLockPattern(mChosenPattern, mCurrentPattern, userId);
 
             if (mHasChallenge) {
diff --git a/src/com/android/settings/ConfirmLockPattern.java b/src/com/android/settings/ConfirmLockPattern.java
index a402b4b..2e74691 100644
--- a/src/com/android/settings/ConfirmLockPattern.java
+++ b/src/com/android/settings/ConfirmLockPattern.java
@@ -146,7 +146,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                     mLockPatternUtils.isTactileFeedbackEnabled());
             mLockPatternView.setInStealthMode(!mLockPatternUtils.isVisiblePatternEnabled(
                     mEffectiveUserId));
-            mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize());
+            mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize(mEffectiveUserId));
             mLockPatternView.setOnPatternListener(mConfirmExistingLockPatternListener);
             updateStage(Stage.NeedToUnlock);
 
@@ -459,7 +459,7 @@ public class ConfirmLockPattern extends ConfirmDeviceCredentialBaseActivity {
                                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_TYPE,
                                                     StorageManager.CRYPT_TYPE_PATTERN);
                                     intent.putExtra(ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD,
-                                                    mLockPatternUtils.patternToString(pattern));
+                                                    mLockPatternUtils.patternToString(pattern, localEffectiveUserId));
                                 }
                                 mCredentialCheckResultTracker.setResult(matched, intent, timeoutMs,
                                         localEffectiveUserId);
-- 
cgit v1.1


From cf8e3dffaecb7cdb5a684727805fc05bb6c2575c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Fri, 15 Apr 2016 02:45:15 +0300
Subject: Fix unavailable wifi icon in wifi priorities

Change-Id: I5a36909d1f99e4ba6986421266d8b91a59fd2b8e
---
 res/drawable/wifi_no_signal.xml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/res/drawable/wifi_no_signal.xml b/res/drawable/wifi_no_signal.xml
index 7a86de3..4bbc99e 100644
--- a/res/drawable/wifi_no_signal.xml
+++ b/res/drawable/wifi_no_signal.xml
@@ -1,17 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The CyanogenMod Project
+<!-- Copyright (C) 2016 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.
 -->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-    <item settings:state_encrypted="true" android:drawable="@drawable/ic_wifi_lock_signal_1_dark" />
-    <item settings:state_encrypted="false" android:drawable="@drawable/ic_wifi_signal_1_dark" />
-</selector>
\ No newline at end of file
+    <item settings:state_encrypted="true">
+        <layer-list>
+            <item android:drawable="@drawable/ic_wifi_signal_0" />
+            <item android:drawable="@drawable/ic_wifi_signal_lock" />
+        </layer-list>
+    </item>
+    <item settings:state_encrypted="false" android:drawable="@drawable/ic_wifi_signal_0" />
+</selector>
-- 
cgit v1.1


From 52a2fb4413c4b636d07a2d667143d8749211a147 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Fri, 15 Apr 2016 08:37:18 +0200
Subject: Restore double tap to wake string from CM 12.1.

The AOSP strings/translations of that feature are inconsistent to those
of the double tap to sleep feature, so replace the string to keep the
translations consistent.
As the same string exists in cm-12.1, all translations are already
present and will automatically be added in the next translation sync.

Change-Id: I613941b586fe60ea6b29e2695120359295289615
---
 res/values/cm_strings.xml | 4 ++++
 res/xml/display.xml       | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index ae97862..337c31c 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -588,6 +588,10 @@
     <string name="disable_navkeys_title">Enable on-screen nav bar</string>
     <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string>
 
+    <!-- tap-to-wake -->
+    <string name="double_tap_to_wake_title">Double-tap to wake</string>
+    <string name="double_tap_to_wake_summary">Double-tap on the screen to turn on the display</string>
+
     <!-- tap-to-sleep -->
     <string name="double_tap_to_sleep_title">Double-tap to sleep</string>
     <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
diff --git a/res/xml/display.xml b/res/xml/display.xml
index 2b63ee5..e0dae5a 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -67,8 +67,8 @@
         <!-- Double tap to wake -->
         <SwitchPreference
                 android:key="tap_to_wake"
-                android:title="@string/tap_to_wake"
-                android:summary="@string/tap_to_wake_summary"
+                android:title="@string/double_tap_to_wake_title"
+                android:summary="@string/double_tap_to_wake_summary"
                 android:persistent="false" />
 
         <!-- Double tap to sleep -->
-- 
cgit v1.1


From 791434fdc31f09821e703e89cd071000807bdf32 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Fri, 8 Apr 2016 16:22:03 -0700
Subject: Settings: check current ringtone for non-default sub ids

Otherwise the default phone sub's selection would always be pre-selected
regardless of the actual selection.

Ticket: CYNGNOS-2396

Change-Id: Ia33df47228eb2a49d48c80535876756b4ba1abf1
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/DefaultRingtonePreference.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/DefaultRingtonePreference.java b/src/com/android/settings/DefaultRingtonePreference.java
index d3cbe5a..4bf2cfa 100644
--- a/src/com/android/settings/DefaultRingtonePreference.java
+++ b/src/com/android/settings/DefaultRingtonePreference.java
@@ -55,7 +55,11 @@ public class DefaultRingtonePreference extends RingtonePreference {
 
     @Override
     protected Uri onRestoreRingtone() {
-        return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        if (getRingtoneType() == RingtoneManager.TYPE_RINGTONE) {
+            return RingtoneManager.getActualRingtoneUriBySubId(getContext(), getSubId());
+        } else {
+            return RingtoneManager.getActualDefaultRingtoneUri(getContext(), getRingtoneType());
+        }
     }
-    
+
 }
-- 
cgit v1.1


From f1e42d8741c760433876b17a151b8b0cc2502b8b Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Fri, 15 Apr 2016 10:11:36 -0700
Subject: Prevent crash if weather settings activity can't be found

Each weather provider service may define a settings activity which
will be automatically launched when the user selects the provider.
If such activity can't be found, an ActivityNotFoundException is
thrown. This patch adds a try/catch block to avoid crashing the
settings app if the activity can't be found

A toast will be displayed to notify the user. Otherwise, the user
would never know why the settings gear is doing nothing

Change-Id: I3c3d54ce8f9131353077c34a2f821ec6b0fc0268
TICKET: CYNGNOS-2478
---
 res/values/cm_strings.xml                          |  1 +
 .../cyanogenmod/WeatherServiceSettings.java        | 24 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 337c31c..128660e 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1166,6 +1166,7 @@
     <string name="weather_settings_title">Weather</string>
     <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
     <string name="weather_settings_button">Provider settings</string>
+    <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
 
     <string name="background_data_access">Background data access</string>
     <string name="allow_background_both">Over cellular data &amp; Wi\u2011Fi</string>
diff --git a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
index 424f7de..0fae5fd 100644
--- a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
+++ b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
@@ -17,6 +17,7 @@
 package com.android.settings.cyanogenmod;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -32,6 +33,7 @@ import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -41,6 +43,7 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.RadioButton;
 import android.widget.TextView;
+import android.widget.Toast;
 import com.android.internal.content.PackageMonitor;
 import com.android.internal.os.BackgroundThread;
 import com.android.settings.R;
@@ -295,7 +298,22 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
 
         private void launchSettingsActivity(WeatherProviderServiceInfo info) {
             if (info != null && info.settingsComponentName != null) {
-                mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
+                try {
+                    mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
+                } catch (ActivityNotFoundException e) {
+                    mHandler.post(new Runnable() {
+                        @Override
+                        public void run() {
+                            Toast t = Toast.makeText(mContext,
+                                    R.string.weather_settings_activity_not_found,
+                                        Toast.LENGTH_LONG);
+                            TextView v = (TextView) t.getView().findViewById(android.R.id.message);
+                            if (v != null) v.setGravity(Gravity.CENTER);
+                            t.show();
+                        }
+                    });
+                    Log.w(TAG, info.settingsComponentName + " not found");
+                }
             }
         }
 
@@ -324,9 +342,7 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
             CMSettings.Secure.putString(mContext.getContentResolver(),
                     CMSettings.Secure.WEATHER_PROVIDER_SERVICE,
                         info.componentName.flattenToString());
-            if (info.settingsComponentName != null) {
-                mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
-            }
+            launchSettingsActivity(info);
             notifyDataSetChanged();
         }
 
-- 
cgit v1.1


From cb154eb5f01edea4a50e8f02230648f3585b5367 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Sat, 16 Apr 2016 17:47:37 +0300
Subject: Automatic translation import

Change-Id: I5c7350a9323a8d526fcffcd72be0b53a80f10282
---
 res/values-af/cm_strings.xml      |    5 +-
 res/values-am/cm_strings.xml      |    3 +-
 res/values-ar/cm_strings.xml      |    5 +-
 res/values-as-rIN/cm_strings.xml  |    5 +-
 res/values-ast-rES/cm_strings.xml |    4 +-
 res/values-az-rAZ/cm_strings.xml  |    5 +-
 res/values-be/cm_strings.xml      |    5 +-
 res/values-bg/cm_strings.xml      |    7 +-
 res/values-bn-rBD/cm_strings.xml  |    4 +-
 res/values-br-rFR/cm_strings.xml  |    3 +-
 res/values-ca/cm_strings.xml      |   19 +-
 res/values-cs/cm_strings.xml      |    6 +-
 res/values-csb-rPL/arrays.xml     |  156 ++
 res/values-csb-rPL/cm_strings.xml |  183 +++
 res/values-csb-rPL/strings.xml    | 3100 +++++++++++++++++++++++++++++++++++++
 res/values-cy/cm_strings.xml      |    3 +-
 res/values-da/cm_strings.xml      |    5 +-
 res/values-de/cm_strings.xml      |   12 +-
 res/values-el/cm_strings.xml      |    8 +-
 res/values-en-rAU/cm_strings.xml  |    5 +-
 res/values-en-rGB/cm_strings.xml  |    3 +-
 res/values-en-rIN/cm_strings.xml  |    5 +-
 res/values-en-rPT/cm_strings.xml  |    3 +-
 res/values-eo/cm_strings.xml      |    5 +-
 res/values-es-rMX/cm_strings.xml  |    3 +-
 res/values-es-rUS/cm_strings.xml  |    5 +-
 res/values-es/cm_strings.xml      |    5 +-
 res/values-et-rEE/cm_strings.xml  |    5 +-
 res/values-eu-rES/cm_strings.xml  |   24 +-
 res/values-fa/cm_strings.xml      |    5 +-
 res/values-fi/cm_strings.xml      |    8 +-
 res/values-fil-rPH/cm_strings.xml |    3 +-
 res/values-fr-rCA/cm_strings.xml  |    3 +-
 res/values-fr/cm_strings.xml      |    5 +-
 res/values-frp-rIT/cm_strings.xml |    3 +-
 res/values-fy-rNL/cm_strings.xml  |    3 +-
 res/values-gd-rGB/cm_strings.xml  |    3 +-
 res/values-gl-rES/cm_strings.xml  |    3 +-
 res/values-gu-rIN/cm_strings.xml  |    5 +-
 res/values-hi/cm_strings.xml      |    5 +-
 res/values-hr/cm_strings.xml      |   25 +-
 res/values-hu/cm_strings.xml      |    5 +-
 res/values-hy-rAM/cm_strings.xml  |    3 +-
 res/values-in/cm_plurals.xml      |   25 +
 res/values-in/cm_strings.xml      |  837 +++++++++-
 res/values-is-rIS/cm_strings.xml  |    3 +-
 res/values-it/cm_strings.xml      |    8 +-
 res/values-iw/cm_strings.xml      |    6 +-
 res/values-ja/cm_strings.xml      |    5 +-
 res/values-ka-rGE/cm_strings.xml  |    3 +-
 res/values-kk-rKZ/cm_strings.xml  |    3 +-
 res/values-km-rKH/cm_strings.xml  |    3 +-
 res/values-kn-rIN/cm_strings.xml  |    5 +-
 res/values-ko/cm_strings.xml      |    5 +-
 res/values-ku/cm_strings.xml      |    5 +-
 res/values-ky-rKG/cm_strings.xml  |    3 +-
 res/values-lb/cm_strings.xml      |    5 +-
 res/values-lo-rLA/cm_strings.xml  |    3 +-
 res/values-lt/cm_strings.xml      |    5 +-
 res/values-lv/cm_strings.xml      |    4 +-
 res/values-mk-rMK/cm_strings.xml  |    3 +-
 res/values-ml-rIN/cm_strings.xml  |    5 +-
 res/values-mn-rMN/cm_strings.xml  |    3 +-
 res/values-mr-rIN/cm_strings.xml  |    5 +-
 res/values-ms-rMY/cm_strings.xml  |    3 +-
 res/values-my-rMM/cm_strings.xml  |    3 +-
 res/values-nb/cm_strings.xml      |    5 +-
 res/values-ne-rNP/cm_strings.xml  |    3 +-
 res/values-nl/cm_strings.xml      |    5 +-
 res/values-oc-rFR/cm_strings.xml  |    3 +-
 res/values-or-rIN/cm_strings.xml  |    5 +-
 res/values-pa-rIN/cm_strings.xml  |    3 +-
 res/values-pl/cm_strings.xml      |    7 +-
 res/values-pt-rBR/cm_strings.xml  |   38 +-
 res/values-pt-rPT/cm_strings.xml  |   10 +-
 res/values-rm/cm_strings.xml      |    3 +-
 res/values-ro/cm_strings.xml      |    5 +-
 res/values-ru/cm_strings.xml      |    6 +-
 res/values-si-rLK/cm_strings.xml  |    4 +-
 res/values-sk/cm_strings.xml      |    5 +-
 res/values-sl/cm_strings.xml      |    8 +-
 res/values-sq-rAL/cm_strings.xml  |    3 +-
 res/values-sr/cm_strings.xml      |    5 +-
 res/values-sv/cm_strings.xml      |    9 +-
 res/values-sw/cm_strings.xml      |    3 +-
 res/values-ta-rIN/cm_strings.xml  |    5 +-
 res/values-te-rIN/cm_strings.xml  |    5 +-
 res/values-th/cm_strings.xml      |   25 +-
 res/values-tr/cm_strings.xml      |    5 +-
 res/values-ug/cm_strings.xml      |    8 +-
 res/values-uk/cm_strings.xml      |    5 +-
 res/values-ur-rPK/cm_strings.xml  |    3 +-
 res/values-uz-rUZ/cm_strings.xml  |    3 +-
 res/values-vi/cm_strings.xml      |    5 +-
 res/values-zh-rCN/cm_strings.xml  |    7 +-
 res/values-zh-rHK/cm_strings.xml  |    5 +-
 res/values-zh-rTW/cm_strings.xml  |    5 +-
 res/values-zu/cm_strings.xml      |    3 +-
 98 files changed, 4733 insertions(+), 111 deletions(-)
 create mode 100644 res/values-csb-rPL/arrays.xml
 create mode 100644 res/values-csb-rPL/cm_strings.xml
 create mode 100644 res/values-csb-rPL/strings.xml
 create mode 100644 res/values-in/cm_plurals.xml

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index d47185e..d4fe7b1 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Aktiveer op skerm nav balk</string>
   <string name="disable_navkeys_summary">Aktiveer op skerm navigasie balk en skakel hardeware knoppies af</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Klop-Klop wakker instelling</string>
+  <string name="double_tap_to_wake_summary">Dubbel klop op die skerm om dit aan te skakel</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Klop-Klop om te slaap</string>
   <string name="double_tap_to_sleep_summary">Dubbel klop op die statusbalk om skerm af te skakel</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Rooi</string>
   <string name="color_green_title">Groen</string>
   <string name="color_blue_title">Blou</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Begin musiek program</string>
   <string name="headset_connect_player_summary">Begin die standaard musiek program wanneer oorfone gekoppel word</string>
@@ -993,4 +995,5 @@
   <string name="restrict_app_cellular_summary">Voorkom toep om sellulêre data konneksie te gebruik</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 6872e24..7b64d1d 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -520,6 +520,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">تمكين شريط التنقل على الشاشة</string>
   <string name="disable_navkeys_summary">تمكين شريط التنقل على الشاشة وتعطيل أزرار الجهاز</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">الضغط المزدوج لتنبيه</string>
+  <string name="double_tap_to_wake_summary">المس الشاشة مرتين لتشغيل العرض</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">المس مرتين لبدء وضع السكون</string>
   <string name="double_tap_to_sleep_summary">الضغط مرتين فوق شريط الحالة لإطفاء الشاشة</string>
@@ -543,7 +546,6 @@
   <string name="color_red_title">أحمر</string>
   <string name="color_green_title">أخضر</string>
   <string name="color_blue_title">أزرق</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">بدء تشغيل تطبيق الموسيقى</string>
   <string name="headset_connect_player_summary">بدء تشغيل تطبيق الموسيقى المبدئيّ عند توصيل سماعات الرأس</string>
@@ -999,4 +1001,5 @@
   <string name="restrict_app_cellular_summary">منع التطبيق من استخدام اتصال البيانات الخلوي</string>
   <string name="privacy_guard_internet_category">الإنترنت</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 422e3b0..856583a 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">অন-স্ক্ৰীণ নেভ বাৰ সক্ষম কৰক</string>
   <string name="disable_navkeys_summary">অন-স্ক্ৰীণ নেভিগেশ্যন বাৰ সক্ষম কৰক আৰু হাৰ্ডৱেৰ বুটামবোৰ অক্ষম কৰক</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ৱেক কৰিবলৈ দুবাৰ টেপ কৰক</string>
+  <string name="double_tap_to_wake_summary">প্রদর্শন অন কৰিবলৈ স্ক্ৰীণত দুবাৰ টেপ কৰক</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">সুপ্ত কৰিবলৈ দুবাৰ টেপ কৰক</string>
   <string name="double_tap_to_sleep_summary">প্রদর্শন অফ কৰিবলৈ ষ্টেটাছ বাৰত দুবাৰ ক্লিক কৰক</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">ৰঙা</string>
   <string name="color_green_title">সেউজীয়া</string>
   <string name="color_blue_title">নীলা</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">সংগীত এপ্প্ লান্চ্চ কৰক</string>
   <string name="headset_connect_player_summary">হেডছেট সংযোগ কৰিলে ডিফ\'ল্ট সংগীত এপ্প লান্চ্চ কৰক</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ডক USB ত চাৰ্জিং কৰি আছে</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 2594c18..cfce6e2 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -424,6 +424,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Habilitar barra de navegación</string>
   <string name="disable_navkeys_summary">Habilitar la barra de navegación en pantalla y deshabilitar los botones físicos</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Doble toque pa esconsoñar</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Doble toque pa bloquiar</string>
   <!-- Proximity wake -->
@@ -446,7 +448,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="color_red_title">Bermeyu</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioridá automática</string>
@@ -755,4 +756,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 29877b6..e0d0639 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -418,6 +418,9 @@
   <string name="power_menu_bug_report_disabled">Xəta hesabatı tərtibatçı tənzimləmələrində ləğv edildi</string>
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_summary">Ekran üstü hərəkət zolağını fəallaşdır və avadanlıq düymələri ləğv et</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Oyanmaq üçün iki dəfə toxun</string>
+  <string name="double_tap_to_wake_summary">Ekranı açmaq üçün ekrana iki dəfə toxunun</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Yuxuya keçmək üçün iki dəfə toxun</string>
   <string name="double_tap_to_sleep_summary">Ekranı bağlamaq üçün durum sətrinə iki dəfə toxunun</string>
@@ -440,7 +443,6 @@
   <string name="color_red_title">Qırmızı</string>
   <string name="color_green_title">Yaşıl</string>
   <string name="color_blue_title">Mavi</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musiqi tətbiqini başlat</string>
   <string name="headset_connect_player_summary">Qulaqcıq taxılanda musiqi tətbiqetməsini başladar</string>
@@ -689,4 +691,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index f34ba05..3ce9e17 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -512,6 +512,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Экранныя кнопкі</string>
   <string name="disable_navkeys_summary">Уключыць панэль навігацыі і адключыць апаратныя сэнсорныя кнопкі</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Улучэнне пры падвойным націсканні</string>
+  <string name="double_tap_to_wake_summary">Двойчы дакраніцеся экрана, каб вывесці прыладу са спячага рэжыму</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Вымыкаць экран пры падвойным націсканні</string>
   <string name="double_tap_to_sleep_summary">Двойчы дакраніцеся радка стану, каб перавесці прыладу ў спячы рэжым</string>
@@ -535,7 +538,6 @@
   <string name="color_red_title">Чырвоны</string>
   <string name="color_green_title">Зялёны</string>
   <string name="color_blue_title">Сіні</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Аўтазапуск плэера</string>
   <string name="headset_connect_player_summary">Запускаць плэер пры падлучэнні завушнікаў</string>
@@ -971,4 +973,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зарадка праз USB дак-станцыю</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 4383293..fb403c6 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Настройки на светлината</string>
   <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
+  <string name="notification_light_no_apps_summary">За да добавите отделен контрол за приложение, активирайте \'%1$s\' и натиснете \'\u002b\' в лентата на менюто</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Режим за отстраняване на грешки</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Разреши екранната лента за навигация</string>
   <string name="disable_navkeys_summary">Разреши екранна навигационна лента и забрани хардуерните бутони</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Двукратно почукване за събуждане</string>
+  <string name="double_tap_to_wake_summary">Двукратно почукване върху екрана го включва</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Двукратно почукване за заспиване</string>
   <string name="double_tap_to_sleep_summary">Двукратно почукване върху лентата на състоянието изключва на дисплея</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Червен</string>
   <string name="color_green_title">Зелен</string>
   <string name="color_blue_title">Син</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Стартиране на приложението за музика</string>
   <string name="headset_connect_player_summary">Стартира на приложението за музика, когато включите слушалките</string>
@@ -1012,4 +1015,6 @@
   <string name="restrict_cellular_access_summary">Забрани достъпа до данни на клетъчни мрежи</string>
   <string name="restrict_cellular_access_dialog_title">Да бъде ли ограничен достъпа до мобилни данни?</string>
   <string name="restrict_cellular_access_dialog_summary">Тази функция може да спре работата на приложение което зависи от достъп до интернет когато са налични само мобилни данни\n\n Може да намерите по-подходящи настройки в настройките на приложението.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Мрежови оператори</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 86bc737..cff9ed2 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -342,6 +342,8 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">অন-স্ক্রীন নেভ বার সক্রিয় করুন</string>
   <string name="disable_navkeys_summary">অন-স্ক্রীন নেভিগেশন বার সক্রিয় করুন এবং হার্ডওয়্যার বোতাম নিষ্ক্রিয় করুন</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">দুইবার টোকা দিয়ে জাগ্রত করুন</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">দুই টোকা দিয়ে নিদ্রা</string>
   <!-- Proximity wake -->
@@ -363,7 +365,6 @@
   <string name="color_red_title">লাল</string>
   <string name="color_green_title">সবুজ</string>
   <string name="color_blue_title">নীল</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="auto_brightness_reset_button">পুনরায় ধার্য করুন</string>
@@ -555,4 +556,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 3929844..463d972 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -134,8 +134,8 @@
   <string name="ringer_mode">Mode de trucada</string>
   <string name="lights_mode">Mode dels llums</string>
   <string name="vibrate_mode">Mode de la vibració</string>
-  <string name="choose_soundtone">Escull el to de les notificacions</string>
-  <string name="choose_ringtone">Escull un to de trucada</string>
+  <string name="choose_soundtone">Tria el to de les notificacions</string>
+  <string name="choose_ringtone">Tria un to de trucada</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">To de les notificacions</string>
   <!-- Title for application group setting screen -->
@@ -146,7 +146,7 @@
   <string name="profile_appgroup_name_prompt">Introdueix el nom del grup d\'aplicacions</string>
   <string name="profile_appgroup_name_title">Nom</string>
   <!-- Add application dialog box title -->
-  <string name="profile_choose_app">Escull aplicació</string>
+  <string name="profile_choose_app">Tria una aplicació</string>
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">Configuració del sistema</string>
   <string name="profile_lockmode_title">Mode del bloqueig de pantalla</string>
@@ -177,7 +177,7 @@
   <string name="profile_menu_delete_title">Esborra</string>
   <string name="profile_action_none">Deixa sense canvis</string>
   <string name="profile_action_system">Per defecte del sistema</string>
-  <string name="profile_action_disable">Apagar</string>
+  <string name="profile_action_disable">Apaga</string>
   <string name="profile_action_enable">Encén</string>
   <string name="profile_trigger_a2dp_connect">En connectar l\'A2DP</string>
   <string name="profile_trigger_a2dp_disconnect">En desconnectar l\'A2DP</string>
@@ -257,10 +257,11 @@
   <string name="notification_light_zen_mode">Llums en el mode No molestis</string>
   <string name="notification_light_use_multiple_leds">LEDs múltiples</string>
   <string name="keywords_lights_brightness_level">atenua la lluminositat dels leds</string>
-  <string name="notification_light_automagic">Escull els colors automàticament</string>
+  <string name="notification_light_automagic">Tria els colors automàticament</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustaments de llums</string>
   <string name="led_notification_text">Llum LED habilitat per ajustos</string>
+  <string name="notification_light_no_apps_summary">Per afegir control específic per aplicació, activa \'%1$s\' i prem \"\u002b\" a la barra de menú</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuració Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Habilita bar nav en pantalla</string>
   <string name="disable_navkeys_summary">Habilita la barra de navegació en pantalla y deshabilitar els botons físics</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Pica doblement per encendre</string>
+  <string name="double_tap_to_wake_summary">Pica dues vegades a la pantalla per encendre la pantalla</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Pica dues vegades per posar en repòs</string>
   <string name="double_tap_to_sleep_summary">Pica dues vegades a la barra d\'estat per apagar la pantalla</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Vermell</string>
   <string name="color_green_title">Verd</string>
   <string name="color_blue_title">Blau</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Llança l\'aplicació de música</string>
   <string name="headset_connect_player_summary">Inicia l\'aplicació de música predeterminada quan es connectin els auriculars</string>
@@ -774,7 +777,7 @@
   <string name="expanded_nothing_to_show">Per afegir una configuració personalitzada per a cada aplicació en l\'estat extès, estableix com a deshabilitada l\'opció \"Habilitat per a tots\"</string>
   <string name="expanded_enabled_for_all">Habilitat per a tots</string>
   <string name="expanded_desktop_style">Estil d\'escriptori extès</string>
-  <string name="expanded_desktop_style_description">Escull un estil d\'escriptori extès per defecte</string>
+  <string name="expanded_desktop_style_description">Tria un estil d\'escriptori extès per defecte</string>
   <string name="expanded_desktop_title">Opcions d\'escriptori extès</string>
   <!-- Kill app long-press back -->
   <string name="kill_app_longpress_back">Mata l\'aplicació amb la tecla enrera</string>
@@ -1012,4 +1015,6 @@
   <string name="restrict_cellular_access_summary">Deshabilita l\'accés a les dades en xarxes mòbils</string>
   <string name="restrict_cellular_access_dialog_title">Vols restringir l\'accés a les dades mòbils?</string>
   <string name="restrict_cellular_access_dialog_summary">Aquesta característica podria provocar que una aplicació que depèn de l\'accés a la xarxa deixi de funcionar quan només les xarxes mòbils estiguin disponibles.\n\nPots trobar els controls d\'ús de dades més adequats a la configuració disponible dins de l\'aplicació.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadors de xarxa</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index d04aff5..d2d87c0 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -262,6 +262,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Nastavení světelné signalizace</string>
   <string name="led_notification_text">LED světlo povolené v nastavení</string>
+  <string name="notification_light_no_apps_summary">Chcete-li přidat řízení jednotlivých aplikací, aktivujte „%1$s“ a použijte tlačítko „\u002b“ v panelu nabídky</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Ladění systému Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -518,6 +519,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Povolit navigační lištu na obrazovce</string>
   <string name="disable_navkeys_summary">Povolit navigační lištu na obrazovce a zakázat hardwarová tlačítka</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Probuzení dvojím dotykem</string>
+  <string name="double_tap_to_wake_summary">Dvojitým poklepáním zapnout obrazovku</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dvojím klepnutím uspat</string>
   <string name="double_tap_to_sleep_summary">Dvojitým poklepáním na stavovou lištu vypnout obrazovku</string>
@@ -541,7 +545,6 @@
   <string name="color_red_title">Červená</string>
   <string name="color_green_title">Zelená</string>
   <string name="color_blue_title">Modrá</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Spustit aplikaci pro přehrávání hudby</string>
   <string name="headset_connect_player_summary">Pokud jsou připojena sluchátka, spustit výchozí aplikaci pro přehrávání hudby</string>
@@ -1012,4 +1015,5 @@
   <string name="restrict_cellular_access_summary">Zakázat přístup k datům na mobilních sítích</string>
   <string name="restrict_cellular_access_dialog_title">Omezit přístup k mobilním datům?</string>
   <string name="restrict_cellular_access_dialog_summary">Tato vlastnost může způsobit zastavení funkčnosti některých aplikací, které jsou závislé na přístupu k datům a zařízení je právě připojeno pouze k mobilní datové síti.\n\nVhodnějsí omezení využití dat je možné nalézt v ovládání používání datových sítí v nastavení aplikace.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-csb-rPL/arrays.xml b/res/values-csb-rPL/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-csb-rPL/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 0000000..262bd43
--- /dev/null
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2016 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">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Launch Dev Tools -->
+  <!-- Development shortcut -->
+  <!-- Setting checkbox title for root access -->
+  <!-- NFC PreferenceCategory title -->
+  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, Device model -->
+  <!-- About phone screen, Device name -->
+  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, build date -->
+  <!-- CM Updater -->
+  <!-- Settings switch for updating Cyanogen recovery -->
+  <!-- Themes Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Sound settings screen -->
+  <!-- Profiles settings  -->
+  <!-- Profile mode options. -->
+  <!-- Add Profile -->
+  <!-- Rename Dialog  -->
+  <!-- Reset Profiles -->
+  <!-- Delete confimation messages -->
+  <!-- Profile network mode -->
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <!-- Menu item for managing profiles -->
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <!-- Profile Settings sound modes labels -->
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <!-- Title for application group setting screen -->
+  <!-- Add application dialog box title -->
+  <!-- Profiles - system settings -->
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <!-- Wi-Fi region code -->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Profiles -->
+  <!-- Title for application group setting screen -->
+  <!-- Navigation Bar -->
+  <!-- Notification light dialogs -->
+  <!-- Values for the notification light pulse spinners -->
+  <!-- Battery light settings -->
+  <!-- Lights settings screen, notification light settings -->
+  <!-- Lights settings, LED notification -->
+  <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- App ops permissions -->
+  <!-- App ops detail -->
+  <!-- App ops menu options -->
+  <!-- Hostname setting -->
+  <!-- Backlight brightness settings screen -->
+  <!-- Sunlight readability enhancement screen -->
+  <!-- Color enhancement settings screen -->
+  <!-- Key backlight -->
+  <!-- Gesture Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Power menu -->
+  <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
+  <!-- tap-to-sleep -->
+  <!-- Proximity wake -->
+  <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <!-- Font size sample text. This needs to be a very short string, as it is shown in
+    multiple font sizes in a limited amount of space. -->
+  <!-- Volume settings - Volume adjustment sound -->
+  <!-- Hardware tunables - Vibrator intensity -->
+  <!-- Hardware tunables - Color calibration -->
+  <!-- Launch music player when headset is connected -->
+  <!-- WiFi auto-configure priorities -->
+  <!-- Display : Rotation  -->
+  <!-- Display settings.  Screen color. -->
+  <!-- LiveDisplay -->
+  <!-- Whether to display IME switcher notifcation -->
+  <!-- Heads up -->
+  <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <!-- High touch sensitivity -->
+  <!-- Display & Lights screen, setting options for LCD density -->
+  <!-- Stylus Icon -->
+  <!-- Stylus Gestures -->
+  <!-- Gestures Options -->
+  <!-- Stylus gestures -->
+  <!-- Touchscreen hovering -->
+  <!-- Increasing ring tone volume -->
+  <!-- LTO download data over wi-fi only -->
+  <!-- Category title for Charging sounds (Power state change) specific Settings.
+         [CHAR LIMIT=40] -->
+  <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <!-- Sound settings, charging sounds label for ringtone == none -->
+  <!-- Status bar -->
+  <!-- Status bar - Clock -->
+  <!-- Status bar - Battery -->
+  <!-- Status bar - Battery percentage -->
+  <!-- Status bar - icon blacklist -->
+  <!-- EdgeGesture service -->
+  <!-- Keep screen on strings -->
+  <!-- Privacy Settings Header item -->
+  <!-- Privacy Guard -->
+  <!-- Sizes for pattern lockscreen -->
+  <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <!-- Whether the keyguard will directly pass to password entry -->
+  <!-- Whether the keyguard will directly pass to pattern view -->
+  <!-- Whether the keyguard will directly pass to PIN entry -->
+  <!-- lock screen visualizer -->
+  <!-- lock screen disabled by QS tile warning -->
+  <!-- Battery saver -->
+  <!-- Battery : Automatic performance profiles -->
+  <!-- Memory -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Advanced reboot options -->
+  <!-- Expanded desktop -->
+  <!-- Kill app long-press back -->
+  <!-- Show/Hide Search Bar -->
+  <!-- Voice Wakeup -->
+  <!-- Blacklist preferences -->
+  <!-- Blacklist management -->
+  <!-- Sms security limit -->
+  <!-- Notification spamfilter -->
+  <!-- Anonymous Statistics #CM -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <!-- Anonymous Statistics - Preview -->
+  <!-- Protected apps lockpattern reset button -->
+  <!-- Protected Apps -->
+  <!-- Contributors cloud activity -->
+  <!-- Edit access point labels: PPP number -->
+  <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <!-- MSIM SIM status -->
+  <!-- Zen mode allowed event setting summary items -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
+  <!-- SAR information -->
+  <!-- IC Codes -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- Factory reset strings -->
+  <!-- Tethering & portable hotspot other category -->
+  <!-- Wi-Fi tethering inactivity timeout -->
+  <!-- Live lock screen -->
+  <!-- Live lock screen title -->
+  <!-- Live lock screen summary -->
+  <!-- Live lock screen settings content description -->
+  <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
+</resources>
diff --git a/res/values-csb-rPL/strings.xml b/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-csb-rPL/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 9a4470f..dfd08d4 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -512,6 +512,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Aktivér navigationslinje</string>
   <string name="disable_navkeys_summary">Aktivér navigationslinje på skærmen og deaktivér hardwareknapper</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dobbelttryk for at vække</string>
+  <string name="double_tap_to_wake_summary">Dobbelttryk på skærmen for at tænde den</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dobbelttryk for dvale</string>
   <string name="double_tap_to_sleep_summary">Dobbelttryk på statuslinjen for at slukke skærmen</string>
@@ -535,7 +538,6 @@
   <string name="color_red_title">Rød</string>
   <string name="color_green_title">Grøn</string>
   <string name="color_blue_title">Blå</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Start musik-app</string>
   <string name="headset_connect_player_summary">Start standard-app til musik, når headset tilsluttes</string>
@@ -987,4 +989,5 @@
   <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
   <string name="reset_stats_confirm">Bekræft</string>
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 72d0d7d..0a480fe 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">LED-Einstellungen</string>
   <string name="led_notification_text">Benachrichtigungs-LED durch Einstellungen aktiviert</string>
+  <string name="notification_light_no_apps_summary">Um App-spezifische Einstellungen hinzuzufügen \"%1$s\" aktivieren und \"\u002b\" in der Menüleiste berühren.</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-Debugging</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -430,6 +431,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> erlaubt</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> verweigert</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> erlaubt, <xliff:g id="count">%2$s</xliff:g> verweigert</string>
+  <string name="app_ops_disabled_by_optimization">Durch Akkuoptimierung deaktiviert</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Benutzer-Apps anzeigen</string>
   <string name="app_ops_show_system_apps">System-Apps anzeigen</string>
@@ -516,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Navigationsleiste aktivieren</string>
   <string name="disable_navkeys_summary">Navigationstasten deaktivieren und stattdessen eine Navigationsleiste auf dem Bildschirm anzeigen</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Aufwecken durch doppeltes Tippen</string>
+  <string name="double_tap_to_wake_summary">Doppelt auf den Bildschirm tippen, um das Display einzuschalten</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Standby durch doppeltes Tippen</string>
   <string name="double_tap_to_sleep_summary">Doppelt auf die Statusleiste tippen, um das Display auszuschalten</string>
@@ -539,7 +544,6 @@
   <string name="color_red_title">Rot</string>
   <string name="color_green_title">Grün</string>
   <string name="color_blue_title">Blau</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musik-App starten</string>
   <string name="headset_connect_player_summary">Beim Anschließen eines Kopfhörers die Standard-Musik-App starten</string>
@@ -996,6 +1000,12 @@
   <string name="weather_settings_title">Wetter</string>
   <string name="weather_settings_no_services_prompt">Keine Wetteranbieterdienste installiert</string>
   <string name="weather_settings_button">Anbieter-Einstellungen</string>
+  <string name="background_data_access">Hintergrunddaten-Zugriff</string>
+  <string name="allow_background_both">Über Mobilfunk &amp; WLAN</string>
   <string name="allow_background_wlan">Nur über WLAN</string>
+  <string name="allow_background_none">Kein Zugriff</string>
+  <string name="mobile_data_alert_summary">Benachrichtigen, wenn die Anwendung eine erhebliche Menge an Daten verbraucht</string>
+  <string name="reset_data_stats_msg">Diese Aktion löscht alle vergangenen und die aktuellen Datenverbrauchs-Statistiken.</string>
   <string name="reset_stats_confirm">Bestätigen</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 2d53970..2d436b9 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ρυθμίσεις LED</string>
   <string name="led_notification_text">Το LED ενεργοποιήθηκε από τις ρυθμίσεις</string>
+  <string name="notification_light_no_apps_summary">Για προσαρμογή ένδειξης ανά εφαρμογή, ενεργοποιήστε το \'%1$s\' και πιέστε \'\u002b\' στη γραμμή μενού</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Εντοπισμός σφαλμάτων Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ενεργοποίηση γραμμής πλοήγησης</string>
   <string name="disable_navkeys_summary">Ενεργοποίηση της γραμμής πλοήγησης στην οθόνη και απενεργοποίηση των φυσικών πλήκτρων</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Διπλό χτύπημα για αφύπνιση</string>
+  <string name="double_tap_to_wake_summary">Διπλό χτύπημα στην οθόνη για αφύπνιση της συσκευής</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Διπλό χτύπημα για αναστολή</string>
   <string name="double_tap_to_sleep_summary">Διπλό χτύπημα στη γραμμή κατάστασης για αναστολή της συσκευής</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Κόκκινο</string>
   <string name="color_green_title">Πράσινο</string>
   <string name="color_blue_title">Μπλε</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Εκκίνηση εφαρμογής μουσικής</string>
   <string name="headset_connect_player_summary">Εκκίνηση της προεπιλεγμένης εφαρμογής μουσικής κατά τη σύνδεση ακουστικών</string>
@@ -1001,6 +1004,7 @@
   <string name="weather_settings_title">Καιρός</string>
   <string name="weather_settings_no_services_prompt">Δεν υπάρχουν εγκατεστημένοι πάροχοι καιρού</string>
   <string name="weather_settings_button">Ρυθμίσεις παρόχου</string>
+  <string name="weather_settings_activity_not_found">Δεν είναι δυνατό το άνοιγμα του μενού ρυθμίσεων αυτού του παρόχου</string>
   <string name="background_data_access">Πρόσβαση δεδομένων στο παρασκήνιο</string>
   <string name="allow_background_both">Μέσω δεδομένων κινητής τηλεφωνίας &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Μόνο μέσω Wi\u2011Fi</string>
@@ -1016,4 +1020,6 @@
   <string name="restrict_cellular_access_summary">Απενεργοποίηση της πρόσβασης δεδομένων σε δίκτυα κινητής τηλεφωνίας</string>
   <string name="restrict_cellular_access_dialog_title">Περιορισμός πρόσβασης δεδομένων;</string>
   <string name="restrict_cellular_access_dialog_summary">Αυτή η δυνατότητα μπορεί να προκαλέσει μια εφαρμογή που εξαρτάται από την πρόσβαση στο δίκτυο να σταματήσει να λειτουργεί όταν υπάρχουν μόνο δίκτυα κινητής τηλεφωνίας διαθέσιμα.\n\nΜπορείτε να βρείτε πιο κατάλληλους ελέγχους της χρήσης δεδομένων στις ρυθμίσεις που είναι διαθέσιμες μέσα από την εφαρμογή.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Εταιρίες δικτύου</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 20806b2..2eac542 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -430,6 +430,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Enable on-screen nav bar</string>
   <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Double-tap to wake</string>
+  <string name="double_tap_to_wake_summary">Double-tap on the screen to turn on the display</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Double-tap to sleep</string>
   <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
@@ -453,7 +456,6 @@
   <string name="color_red_title">Red</string>
   <string name="color_green_title">Green</string>
   <string name="color_blue_title">Blue</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Launch music app</string>
   <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string>
@@ -759,4 +761,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 9adcaea..6d1253d 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -459,6 +459,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Enable on-screen nav bar</string>
   <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Double-tap to wake</string>
+  <string name="double_tap_to_wake_summary">Double-tap on the screen to turn on the display</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Double-tap to sleep</string>
   <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
@@ -482,7 +485,6 @@
   <string name="color_red_title">Red</string>
   <string name="color_green_title">Green</string>
   <string name="color_blue_title">Blue</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Launch music app</string>
   <string name="headset_connect_player_summary">Launch the default music app when headset is connected</string>
@@ -891,4 +893,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index baf086a..bb5c19f 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -442,6 +442,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ŝalti surekranan navigilon</string>
   <string name="disable_navkeys_summary">Ŝalti surekranan navigilon kaj malŝalti aparatajn butonojn</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Duoble-tuŝeti por veki</string>
+  <string name="double_tap_to_wake_summary">Duoble-tuŝetu la ekranon por ŝalti ĝin</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Duoble-tuŝetu por dormi</string>
   <string name="double_tap_to_sleep_summary">Duoble-tuŝeti la statan breton por malŝalti la ekranon</string>
@@ -465,7 +468,6 @@
   <string name="color_red_title">Ruĝo</string>
   <string name="color_green_title">Verdo</string>
   <string name="color_blue_title">Bluo</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lanĉi la muzik-ludilon</string>
   <string name="headset_connect_player_summary">Lanĉi la defaŭltan muzik-ludilon, kiam la kapaŭskultilo estas kontektita</string>
@@ -826,4 +828,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 0568f71..f81c262 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -143,6 +143,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -151,7 +152,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -294,4 +294,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index a3b30cc..f1c0ee8 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Habilitar barra de navegación en pantalla</string>
   <string name="disable_navkeys_summary">Habilitar barra de navegación en pantalla y deshabilitar los botones de hardware</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Doble toque para activar</string>
+  <string name="double_tap_to_wake_summary">Encender la pantalla mediante un doble toque sobre ella</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Doble toque para suspender</string>
   <string name="double_tap_to_sleep_summary">Apagar la pantalla mediante un doble toque sobre la barra de estado</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">Rojo</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar el reproductor de música</string>
   <string name="headset_connect_player_summary">Iniciar el reproductor de música predeterminado al conectar los auriculares</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 033189a..d0e4f31 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Activar la barra de navegación</string>
   <string name="disable_navkeys_summary">Activar la barra de navegación en pantalla y desactivar los botones físicos</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Doble toque para despertar</string>
+  <string name="double_tap_to_wake_summary">Toca dos veces la pantalla para encenderla</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Doble toque para apagar automáticamente</string>
   <string name="double_tap_to_sleep_summary">Apagar la pantalla realizando un doble toque sobre la barra de estado</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Rojo</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar reproductor de música</string>
   <string name="headset_connect_player_summary">Iniciar el reproductor de música por defecto al conectar los auriculares</string>
@@ -993,4 +995,5 @@
   <string name="restrict_app_cellular_summary">Prevenir que la aplicación utilice conexión de datos</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index b7c3683..ac65f93 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -450,6 +450,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Luba ekraani navigeerimisriba</string>
   <string name="disable_navkeys_summary">Luba ekraani navigeerimisriba ja keela riistvaralised nupud</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Topeltkoputa ärkamiseks</string>
+  <string name="double_tap_to_wake_summary">Topeltkoputa ekraanil selle sisselülitamiseks</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Topelt koputus ekraani väljalülitamiseks</string>
   <string name="double_tap_to_sleep_summary">Topeltpuudutage olekuriba ekraani väljalülitamiseks</string>
@@ -473,7 +476,6 @@
   <string name="color_red_title">Punane</string>
   <string name="color_green_title">Roheline</string>
   <string name="color_blue_title">Sinine</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Käivita muusika rakendus</string>
   <string name="headset_connect_player_summary">Käivita vaikimisi muusika rakendus peakomplekti ühendamisel</string>
@@ -866,4 +868,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laen üle doki USB</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 71aa9ea..d72e7c2 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Argi ezarpenak</string>
   <string name="led_notification_text">LED argia ezarpenetan gaituta</string>
+  <string name="notification_light_no_apps_summary">Aplikazioz aplikazioko kontrola gehitzeko, aktibatu \'%1$s\' eta sakatu\'\u002b\' menu-barran</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android arazketa</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Gaitu pantailako nabigazio barra</string>
   <string name="disable_navkeys_summary">Gaitu pantailako nabigazio-barra eta ezgaitu botoi fisikoak</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Esnatzeko birritan sakatu</string>
+  <string name="double_tap_to_wake_summary">Birritan sakatu pantailan berau pizteko</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Birritan sakatu lokartzeko</string>
   <string name="double_tap_to_sleep_summary">Birritan sakatu egoera barran pantaila itzaltzeko</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Gorria</string>
   <string name="color_green_title">Berdea</string>
   <string name="color_blue_title">Urdina</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Abiatu musika erreproduzigailua</string>
   <string name="headset_connect_player_summary">Abiatu musika erreproduzigailu lehenetsia aurikularrak konektatzean</string>
@@ -860,7 +863,7 @@
   <string name="saving_protected_components">Osagaiaren egoera gordetzen\u2026</string>
   <string name="pa_login_username_hint">Erabiltzaile izena (eposta)</string>
   <string name="pa_login_password_hint">Pasahitza</string>
-  <string name="pa_login_submit_button">Sartu</string>
+  <string name="pa_login_submit_button">Hasi saioa</string>
   <string name="pa_login_checking_password">Kontua berresten\u2026</string>
   <string name="pa_login_incorrect_login">Saio haste okerra</string>
   <string name="pa_pattern_or_fingerprint_header">Eredua marraztu edo hatz-marka erabili behar da desblokeatzeko</string>
@@ -997,4 +1000,21 @@
   <string name="weather_settings_title">Eguraldia</string>
   <string name="weather_settings_no_services_prompt">Ez da eguraldi hornitzailerik instalatu</string>
   <string name="weather_settings_button">Hornitzailearen ezarpenak</string>
+  <string name="background_data_access">Bigarren planoko datuetara sarbidea</string>
+  <string name="allow_background_both">Datu mugikorrak eta Wi\u2011Fi bidez</string>
+  <string name="allow_background_wlan">Wi\u2011Fi bidez besterik ez</string>
+  <string name="allow_background_none">Sarbiderik ez</string>
+  <string name="mobile_data_alert">Datu mugikorren alerta</string>
+  <string name="mobile_data_alert_summary">Jakinarazi aplikazioak datu erabilera nabarmen bat egiten duenean</string>
+  <string name="data_usage_menu_enable_data_alerts">Gaitu datu erabileraren alertak</string>
+  <string name="data_usage_menu_disable_data_alerts">Desgaitu datu erabileraren alertak</string>
+  <string name="data_usage_menu_reset_stats">Ezabatu datu estatistikak</string>
+  <string name="reset_data_stats_msg">Honek iraganeko eta uneko jarraipen informazio guztia ezabatuko du</string>
+  <string name="reset_stats_confirm">Berretsi</string>
+  <string name="restrict_cellular_access_title">Murriztu datu mugikorretara sarbidea</string>
+  <string name="restrict_cellular_access_summary">Desgaitu datuak atzitzea sare mugikorretan</string>
+  <string name="restrict_cellular_access_dialog_title">Murriztu datu mugikorretara sarbidea?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ezaugarri honek sareko datuak behar dituen aplikazio batek ez funtzionatzea eragin dezake sare mugikorrak besterik ez daudenean eskuragarri.\n\nAplikazioaren aukeretan datu erabileraren kontrol egokiagoak aurkitu ditzakezu.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Sare operadoreak</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 74d7202..adb8d02 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -451,6 +451,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">فعال کردن نوار پیمایش روی صفحه</string>
   <string name="disable_navkeys_summary">فعال کردن نوار پیمایش روی صفحه و غیرفعال کردن دکمه‌های سخت‌افزاری</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">دو بار ضربه برای بیدار شدن</string>
+  <string name="double_tap_to_wake_summary">روشن شدن صفحه با دوبار ضربه زدن روی آن</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">دو بار ضربه برای به خواب رفتن</string>
   <string name="double_tap_to_sleep_summary">خاموش شدن صفحه با دوبار ضربه زدن روی نوار وضعیت</string>
@@ -474,7 +477,6 @@
   <string name="color_red_title">قرمز</string>
   <string name="color_green_title">سبز</string>
   <string name="color_blue_title">آبی</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">اجرای برنامه موسیقی</string>
   <string name="headset_connect_player_summary">هنگام اتصال هدست برنامه پیش‌فرض موسیقی اجرا شود</string>
@@ -874,4 +876,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">در حال شارژ در داک یواس‌بی</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 9b0eaac..22b0622 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Valoasetukset</string>
   <string name="led_notification_text">LED-valo otettu käyttöön asetuksissa</string>
+  <string name="notification_light_no_apps_summary">Lisätäksesi sovelluskohtaisen hallinnan, ota \'%1$s\' käyttöön ja paina \'\u002b\' valikkopalkista</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-vianetsintä</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Näytön navigointipalkki</string>
   <string name="disable_navkeys_summary">Ota näytön navigointipalkki käyttöön ja poista fyysiset näppäimet käytöstä</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Herätys kaksoisnapautuksella</string>
+  <string name="double_tap_to_wake_summary">Herätä laitteen näyttö kaksoisnapautuksella</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Lepotila kaksoisnapautuksella</string>
   <string name="double_tap_to_sleep_summary">Sulje laitteen näyttö tuplanapauttamalla tilapalkkia</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Punainen</string>
   <string name="color_green_title">Vihreä</string>
   <string name="color_blue_title">Sininen</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Käynnistä musiikkisovellus</string>
   <string name="headset_connect_player_summary">Käynnistä musiikkisovellus kytkettäessä kuulokkeet</string>
@@ -997,6 +1000,7 @@
   <string name="weather_settings_title">Sää</string>
   <string name="weather_settings_no_services_prompt">Säätarjoajapalveluita ei asennettu</string>
   <string name="weather_settings_button">Tarjoajan asetukset</string>
+  <string name="weather_settings_activity_not_found">Tämän palveluntarjoajan asetusvalikon avaaminen ei onnistu</string>
   <string name="background_data_access">Taustatiedonsiirron käyttö</string>
   <string name="allow_background_both">Mobiiliverkon &amp; Wi\u2011Fin yli</string>
   <string name="allow_background_wlan">Vain Wi\u2011Fin yli</string>
@@ -1012,4 +1016,6 @@
   <string name="restrict_cellular_access_summary">Poista datan käyttö mobiiliverkoissa</string>
   <string name="restrict_cellular_access_dialog_title">Rajoita mobiilidatan käyttöä?</string>
   <string name="restrict_cellular_access_dialog_summary">Tämä ominaisuus voi aiheuttaa verkkoyhteydestä riippuvaisen sovelluksen toiminnan lakkaamisen kun vain mobiilidataverkko on käytettävissä.\n\nLöydät lisää tiedonsiirron hallintaominaisuuksia sovelluksesta.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Verkko-operaattorit</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index f8ba3e5..6ba04ba 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -516,6 +516,9 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Activer la barre de navigation à l\'écran</string>
   <string name="disable_navkeys_summary">Activer la barre de navigation à l\'écran et désactiver les touches physiques</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Appui double pour réveiller</string>
+  <string name="double_tap_to_wake_summary">Appui double sur l\'écran pour l\'allumer</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Appui double pour mettre en veille</string>
   <string name="double_tap_to_sleep_summary">Appui double sur la barre d\'état pour éteindre l\'écran</string>
@@ -539,7 +542,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="color_red_title">Rouge</string>
   <string name="color_green_title">Vert</string>
   <string name="color_blue_title">Bleu</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lancer le lecteur de musique</string>
   <string name="headset_connect_player_summary">Lancer le lecteur de musique par défaut au branchement du casque</string>
@@ -987,4 +989,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Chargement par l\'USB du dock</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 08b695e..cc81f36 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -84,6 +84,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -92,7 +93,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -188,4 +188,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 2cd2760..394114f 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -276,6 +276,7 @@
   <string name="power_menu_title">Menú de apagado</string>
   <string name="power_menu_reboot_title">Menú de reinicio</string>
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -284,7 +285,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="auto_brightness_reset_button">Restabelecer</string>
@@ -434,4 +434,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 8c60e18..2b13c6e 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ઑન સ્ક્રીન નૅવ બાર સક્ષમ કરો</string>
   <string name="disable_navkeys_summary">ઑન સ્ક્રીન નેવિગેશન પટ્ટી સક્ષમ કરો અને હાર્ડવેર બટન્સ અક્ષમ કરો</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">જગાવવા માટે ડબલ-ટૅપ કરો</string>
+  <string name="double_tap_to_wake_summary">પ્રદર્શન ચાલુ કરવા સ્ક્રીન પર ડબલ-ટૅપ કરો</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">સ્લીપ માટે ડબલ-ટૅપ કરો</string>
   <string name="double_tap_to_sleep_summary">પ્રદર્શન બંધ કરવા સ્ટેટસ બાર પર ડબલ-ટૅપ કરો</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">લાલ</string>
   <string name="color_green_title">લીલો</string>
   <string name="color_blue_title">વાદળી</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
   <string name="headset_connect_player_summary">જ્યારે હેડસેટ જોડાયેલ હોય ત્યારે ડિફૉલ્ટ મ્યુઝિક એપ્લિકેશન લૉન્ચ કરો</string>
@@ -988,4 +990,5 @@
   <string name="battery_info_status_charging_dock_usb">ડૉક USB પર ચાર્જિંગ થાય છે</string>
   <string name="privacy_guard_internet_category">ઈન્ટરનેટ</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index ecb23ed..004d43d 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -448,6 +448,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ऑन-स्क्रीन नेविगेशन पट्टी को सक्षम करें</string>
   <string name="disable_navkeys_summary">ऑ-स्क्रीन नेविगेशन पट्टी को सक्षम करें और हार्डवेयर बटनों को अक्षम करें</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">जगाने के लिए दो बार टैप करें</string>
+  <string name="double_tap_to_wake_summary">डिस्प्ले को चालू करने के लिए स्क्रीन पर दो बार टैप करें</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">निद्रा के लिए दो बार टैप करें</string>
   <string name="double_tap_to_sleep_summary">डिस्प्ले को बंद करने के लिए स्थिति पट्टी पर दो बार टैप करें</string>
@@ -471,7 +474,6 @@
   <string name="color_red_title">लाल</string>
   <string name="color_green_title">हरा</string>
   <string name="color_blue_title">नीला</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">संगीत ऐप को चालू करें</string>
   <string name="headset_connect_player_summary">जब हेटसेट कनेक्ट किया जाए, तो डिफ़ॉल्ट संगीत ऐप को चालू करें</string>
@@ -839,4 +841,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक यूएसबी पर चार्ज हो रहा है</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 14753e7..02b80a8 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -262,6 +262,7 @@
   <!-- 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="notification_light_no_apps_summary">Da biste dodali kontrolu za pojedine aplikacije, omogućite \'%1$s\' i pritisnite \'\u002b\' u traci izbornika</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android ispravljanje grešaka</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -431,6 +432,7 @@
   <string name="app_ops_allowed_count">Dozvoljeno <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_ignored_count">Odbijeno <xliff:g id="count" example="2 times">%s </xliff:g></string>
   <string name="app_ops_both_count">Dopušteno <xliff:g id="count">%1$s</xliff:g>, odbijeno <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Onemogućeno od strane optimizacije baterije</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Pokaži korisničke aplikacije</string>
   <string name="app_ops_show_system_apps">Pokaži ugrađene aplikacije</string>
@@ -517,6 +519,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Omogući zaslonsku navigacijsku traku</string>
   <string name="disable_navkeys_summary">Omogući zaslonsku navigacijsku traku i onemogući hardverske tipke</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dvaput dodirnite za buđenje</string>
+  <string name="double_tap_to_wake_summary">Dvaput dodirnite zaslon da biste uključili uređaj</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dvostruki dodir za spavanje</string>
   <string name="double_tap_to_sleep_summary">Dvaput dodirnite statusnu traku za isključivanje zaslona</string>
@@ -540,7 +545,6 @@
   <string name="color_red_title">Crvena</string>
   <string name="color_green_title">Zelena</string>
   <string name="color_blue_title">Plava</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Pokretanje aplikacije za glazbu</string>
   <string name="headset_connect_player_summary">Pokreni zadanu aplikaciju za glazbu kada su priključene slušalice</string>
@@ -994,4 +998,23 @@
   <string name="restrict_app_cellular_summary">Spriječi aplikaciju da koristi mobilnu podatkovnu vezu</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Vrijeme</string>
+  <string name="weather_settings_no_services_prompt">Nema instaliranih usluga davatelja vremenske prognoze</string>
+  <string name="weather_settings_button">Postavke davatelja</string>
+  <string name="background_data_access">Pristup pozadinskim podacima</string>
+  <string name="allow_background_both">Preko mobilnih mreža i Wi-Fi-ja</string>
+  <string name="allow_background_wlan">Samo preko Wi-Fi-ja</string>
+  <string name="allow_background_none">Nema pristupa</string>
+  <string name="mobile_data_alert">Podatkovna upozorenja</string>
+  <string name="mobile_data_alert_summary">Obavijesti kada aplikacija koristi značajne količine podataka</string>
+  <string name="data_usage_menu_enable_data_alerts">Omogući upozorenja upotrebe podataka</string>
+  <string name="data_usage_menu_disable_data_alerts">Onemogući upozorenja upotrebe podataka</string>
+  <string name="data_usage_menu_reset_stats">Resetiraj statistike podataka</string>
+  <string name="reset_data_stats_msg">Ovo će izbrisati sve prethodne i tekuće praćenje podataka</string>
+  <string name="reset_stats_confirm">Potvrdi</string>
+  <string name="restrict_cellular_access_title">Ograničenje pristupa mobilnim podacima</string>
+  <string name="restrict_cellular_access_summary">Onemogući pristup podacima na mobilnoj mreži</string>
+  <string name="restrict_cellular_access_dialog_title">Ograničiti pristup mobilnim podacima?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ova značajka može uzrokovati da aplikacija koja je ovisna o pristupu mreži prestane raditi kada je samo mobilna veza dostupna.\n\nPrimjerenije postavke kontrole potrošnje podataka možete naći u aplikaciji.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 950672a..18c44b9 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Navigációs sáv engedélyezése</string>
   <string name="disable_navkeys_summary">Navigációs sáv engedélyezése és a hardveres gombok letiltása</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dupla érintésre felébresztés</string>
+  <string name="double_tap_to_wake_summary">Érintse meg kétszer a képernyőt a kijelző bekapcsolásához</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dupla érintésre alvó mód</string>
   <string name="double_tap_to_sleep_summary">Érintse meg kétszer az állapotsávot a kijelző kikapcsolásához</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Vörös</string>
   <string name="color_green_title">Zöld</string>
   <string name="color_blue_title">Kék</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Zenelejátszó indítása</string>
   <string name="headset_connect_player_summary">Alapértelmezett zenelejátszó elindítása fülhallgató csatlakoztatásakor</string>
@@ -988,4 +990,5 @@
   <string name="battery_info_status_charging_dock_usb">Töltés dokkolón (USB)</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-in/cm_plurals.xml b/res/values-in/cm_plurals.xml
new file mode 100644
index 0000000..1d6d76a
--- /dev/null
+++ b/res/values-in/cm_plurals.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2013-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">
+  <plurals name="backlight_timeout_time">
+    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> detik</item>
+  </plurals>
+  <plurals name="app_ops_count">
+    <item quantity="other">%d kali</item>
+  </plurals>
+</resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 786c346..fb08980 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -17,166 +17,1001 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="other">Anda sekarang <xliff:g id="step_count">%1$d</xliff:g> beberapa langkah dari mengaktifkan opsi pengembang.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <string name="show_dev_on_cm">Anda telah mengaktifkan opsi pengembang!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan mengaktifkan opsi pengembang.</string>
   <!-- Launch Dev Tools -->
+  <string name="development_tools_title">Alat pengembangan</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">Pintasan pengembangan</string>
+  <string name="development_shortcut_summary">Aktifkan pintasan manajemen aplikasi dalam daftar aplikasi terakhir</string>
   <!-- Setting checkbox title for root access -->
+  <string name="root_access">Akses punca (root)</string>
+  <string name="root_access_warning_title">Izinkan akses punca (root)?</string>
+  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses punca (root) sangat berbahaya dan dapat membahayakan keamanan sistem Anda!</string>
+  <string name="root_access_none">Dinonaktifkan</string>
+  <string name="root_access_apps">Aplikasi saja</string>
+  <string name="root_access_adb">ADB saja</string>
+  <string name="root_access_all">Aplikasi dan ADB</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">Komunikasi jarak dekat</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">Versi CyanogenMod</string>
+  <string name="mod_version_default">Tidak diketahui</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">Modusl perangkat</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">Nama perangkat</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">Tingkat API CyanogenMod</string>
+  <string name="mod_api_level_default">Tidak diketahui</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">Tanggal pembuatan</string>
   <!-- CM Updater -->
+  <string name="cmupdate_settings_title">Pembaruan CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
+  <string name="update_recovery_title">Perbarui pemulihan Cyanogen</string>
+  <string name="update_recovery_summary">Perbarui pemulihan dengan pembaruan sistem</string>
+  <string name="update_recovery_on_warning">PERHATIAN: Jika fitur ini diaktifkan, pemulihan yang terinstal akan digantikan oleh salah satu yang disertakan dengan versi terbaru dari OS yang berjalan.\n\nPemulihan akan diperbarui bersama dengan peningkatan sistem agar pemulihan tetap kompatibel dengan versi mendatang.\n\nApakah Anda ingin mengaktifkan fitur ini?</string>
+  <string name="update_recovery_off_warning">PERINGATAN: Jika fitur ini dinonaktifkan, pemulihan yang terinstal tidak akan diperbarui dengan peningkatan OS.\n\nPembaruan OS mendatang mungkin tidak dapat diinstal dengan versi pemulihan khusus atau versi pemulihan yang sudah usang.\n\nApakah Anda benar-benar ingin menonaktifkan fitur ini?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">Tema</string>
   <!-- Sound settings screen -->
+  <string name="ring_mode_title">Modus dering</string>
+  <string name="ring_mode_normal">Normal</string>
+  <string name="ring_mode_vibrate">Getar</string>
+  <string name="ring_mode_mute">Bungkam</string>
+  <string name="settings_reset_button">Atur kembali</string>
   <!-- Profiles settings  -->
+  <string name="profiles_settings_title">Profil sistem</string>
+  <string name="profiles_add">Tambah</string>
+  <string name="profile_menu_delete">Hapus</string>
+  <string name="profile_settings_title">Profil</string>
+  <string name="profile_empty_list_profiles_off">Untuk mengkonfigurasi dan menggunakan sistem profil, Aktifkan profil.</string>
+  <string name="profile_trigger_configure">Mengkonfigurasi trigger</string>
+  <string name="profile_write_nfc_tag">Tulis ke tag NFC</string>
+  <string name="profile_write_touch_tag">Sentuh tag untuk menulis</string>
+  <string name="profile_write_success">Tag berhasil ditulis</string>
+  <string name="profile_write_failed">Tag gagal ditulis!</string>
+  <string name="profile_selected">Profil dipilih: %1$s</string>
+  <string name="profile_nfc_text">Menulis sebuah profil untuk NFC tag memungkinkan untuk men-tap tag untuk memilih profil. Ketuk kedua kalinya akan memilih profil yang dipilih sebelumnya.</string>
+  <string name="profile_unknown_nfc_tag">Profil tidak diketahui</string>
+  <string name="profile_add_nfc_text">Tag NFC ini mengacu pada profil yang tidak diketahui. Melampirkan tag NFC ini ke profil yang ada akan memungkinkan untuk memilih profil di masa depan.</string>
+  <string name="profile_select">Pilih profil</string>
+  <string name="profile_remove_dialog_message">Hapus profil %1$s?</string>
+  <string name="profile_populate_profile_from_state">Konfigurasi profil menggunakan pengaturan perangkat saat ini?</string>
+  <string name="profile_menu_fill_from_state">Impor pengaturan perangkat saat ini</string>
+  <string name="profile_remove_current_profile">Tidak dapat menghapus profil saat ini!</string>
+  <string name="profile_app_group_category_title">Menimpa pemberitahuan</string>
+  <string name="profile_app_group_item_instructions">Tambah atau hapus grup</string>
+  <string name="profile_app_group_item_instructions_summary">Tambah atau hapus penimpa pemberitahuan grup aplikasi ke profil ini</string>
   <!-- Profile mode options. -->
+  <string name="profile_entries_on">Aktif</string>
+  <string name="profile_entries_off">Nonaktif</string>
+  <string name="profile_entries_no_override">Tidak menimpa</string>
   <!-- Add Profile -->
+  <string name="profile_name_title">Nama</string>
+  <string name="new_profile_name">&lt;profil baru&gt;</string>
   <!-- Rename Dialog  -->
+  <string name="rename_dialog_title">Ganti nama</string>
+  <string name="rename_dialog_message">Masukkan nama baru</string>
+  <string name="duplicate_appgroup_name">Nama grup aplikasi ada yang sama!</string>
+  <string name="rename_dialog_hint">Masukkan nama profil</string>
   <!-- Reset Profiles -->
+  <string name="profile_reset_title">Set ulang</string>
+  <string name="profile_reset_message">Hapus semua profil yang dibuat oleh pengguna dan kelompok-kelompok aplikasi dan mengembalikan mereka ke standar?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">Hapus aplikasi ini?</string>
   <!-- Profile network mode -->
+  <string name="profile_networkmode_2g">2G</string>
+  <string name="profile_networkmode_3g">3G</string>
+  <string name="profile_networkmode_4g">LTE</string>
+  <string name="profile_networkmode_2g3g">2G/3G</string>
+  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
+  <string name="profile_volumeoverrides_title">Menimpa volume</string>
+  <string name="connection_state_enabled">Aktifkan</string>
+  <string name="volume_override_summary">Set ke %1$s/%2$s</string>
+  <string name="profile_volume_override_checkbox_label">Timpa volume</string>
   <!-- Menu item for managing profiles -->
+  <string name="profile_profiles_manage">Profil</string>
+  <string name="profile_profile_manage">Kelola profil</string>
+  <string name="profile_appgroups_manage">Grup aplikasi</string>
+  <string name="profile_appgroup_manage">Kelola grup aplikasi</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <string name="profile_settings">Pengaturan profil</string>
+  <string name="profile_trigger_connect">Saat terhubung</string>
+  <string name="profile_trigger_disconnect">Saat diputuskan</string>
+  <string name="profile_trigger_notrigger">Tidak ada pemicu</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">Modus pemberitahuan</string>
+  <string name="ringer_mode">Modus dering</string>
+  <string name="lights_mode">Modus lampu</string>
+  <string name="vibrate_mode">Modus getar</string>
+  <string name="choose_soundtone">Pilih nada pemberitahuan</string>
+  <string name="choose_ringtone">Pilih nada dering</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">Nada pemberitahuan</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grup aplikasi</string>
+  <string name="profile_applist_title">Aplikasi</string>
+  <string name="profile_new_appgroup">Grup aplikasi baru</string>
+  <string name="profile_delete_appgroup">Hapus grup aplikasi ini?</string>
+  <string name="profile_appgroup_name_prompt">Masukkan nama untuk grup aplikasi baru</string>
+  <string name="profile_appgroup_name_title">Nama</string>
   <!-- Add application dialog box title -->
+  <string name="profile_choose_app">Pilih aplikasi</string>
   <!-- Profiles - system settings -->
+  <string name="profile_system_settings_title">Pengaturan aplikasi</string>
+  <string name="profile_lockmode_title">Modus layar kunci</string>
+  <string name="profile_lockmode_policy_disabled_summary">Opsi profil ini dinonaktifkan oleh kebijakan pengelola perangkat</string>
+  <string name="profile_lockmode_insecure_summary">Jangan meminta PIN atau kata sandi</string>
+  <string name="profile_lockmode_disabled_summary">Nonaktifkan layar kunci</string>
+  <string name="profile_airplanemode_title">Modus pesawat</string>
+  <string name="profile_brightness_title">Kecerahan layar</string>
+  <string name="profile_brightness_override_summary">Setel ke %1$d%%</string>
+  <string name="profile_brightness_override_checkbox_label">Ganti kecerahan</string>
   <!-- Connection override toggles (not all are used at this time ) -->
+  <string name="toggleWifi">Wi\u2011Fi</string>
+  <string name="toggleWifiAp">Area bersinyal Wi\u2011Fi portabel</string>
+  <string name="toggleBluetooth">Bluetooth</string>
+  <string name="toggleGPS">GPS</string>
+  <string name="toggleData">Sambungan data</string>
+  <string name="toggleSync">Otomatis sinkronkan data</string>
+  <string name="toggle2g3g4g">Jenis jaringan pilihan</string>
+  <string name="toggle2g3g4g_msim">Jenis jaringan yang dipilih (%1$s)</string>
+  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Kode wilayah Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Tentukan kode wilayah untuk Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">Ada masalah saat mengatur kode wilayah.</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">Hapus</string>
+  <string name="profile_action_none">Tinggalkan tanpa perubahan</string>
+  <string name="profile_action_system">Sistem baku</string>
+  <string name="profile_action_disable">Matikan</string>
+  <string name="profile_action_enable">Hidupkan</string>
+  <string name="profile_trigger_a2dp_connect">Pada saat A2DP terhubung</string>
+  <string name="profile_trigger_a2dp_disconnect">Pada saat A2DP diputuskan</string>
+  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
+  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">Pemicu yang akan mengaktifkan profil ini</string>
+  <string name="profile_setup_setup_triggers_title">Langkah 1: Tambahkan pemicu</string>
+  <string name="profile_setup_setup_triggers_title_config">Modifikasi pemicu: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">Langkah 2: Tindakan penyiapan</string>
+  <string name="profile_setup_actions_title_config">Konfigurasikan kembali tindakan</string>
+  <string name="profile_appgroups_manage">Grup aplikasi</string>
+  <string name="profile_appgroup_manage">Kelola grup aplikasi</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grup aplikasi</string>
+  <string name="profile_new_appgroup">Grup aplikasi baru</string>
+  <string name="profile_delete_appgroup">Hapus grup aplikasi ini?</string>
+  <string name="profile_appgroup_name_prompt">Masukkan nama untuk grup aplikasi baru</string>
+  <string name="profile_appgroup_name_title">Nama</string>
+  <string name="duplicate_appgroup_name">Nama grup aplikasi ada yang sama!</string>
+  <string name="profile_app_delete_confirm">Hapus aplikasi ini?</string>
+  <string name="no_bluetooth_triggers">Tidak ada perangkat Bluetooth yang disandingkan.\nKetuk untuk menyandingkan perangkat Bluetooth sebelum mengonfigurasi pemicu.</string>
+  <string name="no_wifi_triggers">Tidak ada akses poin Wi\u2011Fi yang dikonfigurasikan.\nKetuk untuk menghubungkan Wi\u2011Fi sebelum mengkonfigurasi pemicu.</string>
+  <string name="no_triggers_configured">Tidak ada pemicu yang dikonfigurasikan. Ketuk untuk menambahkan lebih banyak.</string>
+  <string name="no_triggers_configured_nfc">Ketuk untuk memicu penyiapan NFC baru.</string>
+  <string name="profile_setup_setup_triggers_description">Silakan pilih pemicu yang akan mengaktifkan profil ini</string>
+  <string name="profile_setup_actions_description">Sekarang konfigurasi apa yang terjadi saat profil tersebut diaktifkan</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">Bilah navigasi</string>
+  <string name="navigation_bar_left_title">Modus tangan kiri</string>
+  <string name="navigation_bar_left_summary">Tempatkan bilah navigasi di sebelah kiri layar dalam modus lanskap</string>
+  <string name="navigation_bar_title">Tombol dan tata letak</string>
+  <string name="navigation_bar_help_text">Untuk memulai ketuk ikon ubah untuk membuka bilah navigasi untuk diubah.\n\nAnda dapat mengetuk sebuah ikon untuk mengubah pintasan, atau tekan lama sebuah ikon untuk menata kembali tata letaknya.\n\nKetuk \'Simpan\' untuk melakukan perubahan, atau \'Kembalikan ke semula\' untuk mengatur tata letak ke pengaturan baku.</string>
+  <string name="navigation_restore_button_text">Kembalikan\nke pengaturan baku</string>
+  <string name="navigation_edit_button_text">Edit</string>
+  <string name="navigation_save_button_text">Simpan</string>
+  <string name="navigation_bar_reset_message">Hapus pengaturan saat ini dan kembalikan tata letak baku?</string>
+  <string name="navigation_bar_arrow_keys_title">Tampilkan tombol panah saat mengetik</string>
+  <string name="navigation_bar_arrow_keys_summary">Tampilkan tombol kursor kiri dan kanan saat mengetik. Menggantikan pengubah IME.</string>
+  <string name="navigation_bar_recents_title">Tindakan untuk menekan lama terbaru</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">Edit pengaturan lampu</string>
+  <string name="pulse_speed_title">Lama dan kecepatan kedipan</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Khusus</string>
+  <string name="dialog_delete_title">Hapus</string>
+  <string name="dialog_delete_message">Hapus item yang dipilih?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">Selalu aktif</string>
+  <string name="pulse_length_very_short">Sangat singkat</string>
+  <string name="pulse_length_short">Singkat</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Lama</string>
+  <string name="pulse_length_very_long">Sangat panjang</string>
+  <string name="pulse_speed_very_fast">Sangat cepat</string>
+  <string name="pulse_speed_fast">Cepat</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lambat</string>
+  <string name="pulse_speed_very_slow">Sangat lambat</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">Lampu baterai</string>
+  <string name="battery_low_pulse_title">Kedip jika baterai lemah</string>
+  <string name="battery_light_list_title">Warna</string>
+  <string name="battery_light_low_color_title">Baterai lemah</string>
+  <string name="battery_light_medium_color_title">Pengisian Daya</string>
+  <string name="battery_light_full_color_title">Terisi penuh</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">Lampu pemberitahuan</string>
+  <string name="notification_light_general_title">Umum</string>
+  <string name="notification_light_applist_title">Aplikasi</string>
+  <string name="notification_light_phonelist_title">Telepon</string>
+  <string name="notification_light_use_custom">Gunakan nilai khusus</string>
+  <string name="notification_light_default_value">Baku</string>
+  <string name="notification_light_missed_call_title">Panggilan yang tidak terjawab</string>
+  <string name="notification_light_voicemail_title">Pesan suara</string>
+  <string name="notification_light_screen_on">Lampu dengan layar yang menyala</string>
+  <string name="notification_light_zen_mode">Lampu dalam modus Do Not Disturb</string>
+  <string name="notification_light_use_multiple_leds">Diode Pancaran Cahaya Ganda</string>
+  <string name="keywords_lights_brightness_level">redupkan kecemerlangan diode pancaran cahaya</string>
+  <string name="notification_light_automagic">Memilih warna secara otomatis</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Pengaturan cahaya</string>
+  <string name="led_notification_text">Lampu LED yang diaktifkan oleh pengaturan</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Perbaikan galat fungsi Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">Aktifkan antarmuka Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB melalui jaringan</string>
+  <string name="adb_over_network_summary">Aktifkan perbaikan galat fungsi TCP/IP melalui antarmuka jaringan (Wi\u2011Fi, jaringan USB). Pengaturan ini diatur ulang pada saat dibut kembali</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">PERINGATAN: Ketika ADB melalui jaringan diaktifkan, ponsel Anda terbuka terhadap intrusi pada semua jaringan yang terhubung!\n\nHanya gunakan fitur ini ketika Anda terhubung pada jaringan tepercaya\n\nApakah Anda benar-benar ingin mengaktifkan fungsi ini?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">Pemberitahuan perbaikan galat fungsi</string>
+  <string name="adb_notify_summary">Tampilkan pemberitahuan apabila perbaikan galat fungsi USB atau jaringan diaktifkan</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">Lokasi</string>
+  <string name="app_ops_categories_personal">Pribadi</string>
+  <string name="app_ops_categories_messaging">Pesan</string>
+  <string name="app_ops_categories_media">Media</string>
+  <string name="app_ops_categories_device">Perangkat</string>
+  <string name="app_ops_categories_bootup">Lakukan but</string>
+  <string name="app_ops_categories_su">Akses punca (root)</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">lokasi yang kasar</string>
+  <string name="app_ops_summaries_fine_location">lokasi yang baik</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">getar</string>
+  <string name="app_ops_summaries_read_contacts">membaca kontak</string>
+  <string name="app_ops_summaries_modify_contacts">ubah kontak</string>
+  <string name="app_ops_summaries_read_call_log">baca log panggilan</string>
+  <string name="app_ops_summaries_modify_call_log">ubah log panggilan</string>
+  <string name="app_ops_summaries_read_calendar">membaca kalendar</string>
+  <string name="app_ops_summaries_modify_calendar">ubah kalendar</string>
+  <string name="app_ops_summaries_wifi_scan">Tinjau Wi-Fi</string>
+  <string name="app_ops_summaries_notification">pemberitahuan</string>
+  <string name="app_ops_summaries_cell_scan">pindai sel</string>
+  <string name="app_ops_summaries_call_phone">panggilan telepon</string>
+  <string name="app_ops_summaries_read_sms">baca SMS</string>
+  <string name="app_ops_summaries_write_sms">tulis SMS</string>
+  <string name="app_ops_summaries_receive_sms">terima SMS</string>
+  <string name="app_ops_summaries_receive_emergency_sms">menerima SMS darurat</string>
+  <string name="app_ops_summaries_receive_mms">menerima MMS</string>
+  <string name="app_ops_summaries_receive_wap_push">menerima WAP push</string>
+  <string name="app_ops_summaries_send_sms">mengirim SMS</string>
+  <string name="app_ops_summaries_read_icc_sms">membaca ICC SMS</string>
+  <string name="app_ops_summaries_write_icc_sms">menulis ICC SMS</string>
+  <string name="app_ops_summaries_modify_settings">mengubah pengaturan</string>
+  <string name="app_ops_summaries_draw_on_top">gambar di atas</string>
+  <string name="app_ops_summaries_access_notifications">akses pemberitahuan</string>
+  <string name="app_ops_summaries_camera">kamera</string>
+  <string name="app_ops_summaries_record_audio">merekam audio</string>
+  <string name="app_ops_summaries_play_audio">putar audio</string>
+  <string name="app_ops_summaries_read_clipboard">baca clipboard</string>
+  <string name="app_ops_summaries_modify_clipboard">ubah clipboard</string>
+  <string name="app_ops_summaries_media_buttons">tombol media</string>
+  <string name="app_ops_summaries_audio_focus">fokus audio</string>
+  <string name="app_ops_summaries_master_volume">volume master</string>
+  <string name="app_ops_summaries_voice_volume">volume suara</string>
+  <string name="app_ops_summaries_ring_volume">volume dering</string>
+  <string name="app_ops_summaries_media_volume">volume media</string>
+  <string name="app_ops_summaries_alarm_volume">volume alarm</string>
+  <string name="app_ops_summaries_notification_volume">volume pemberitahuan</string>
+  <string name="app_ops_summaries_bluetooth_volume">volume bluetooth</string>
+  <string name="app_ops_summaries_keep_awake">tetap terjaga</string>
+  <string name="app_ops_summaries_monitor_location">memantau lokasi</string>
+  <string name="app_ops_summaries_monitor_high_power_location">memantau lokasi daya tinggi</string>
+  <string name="app_ops_summaries_get_usage_stats">dapakan statistik penguunaan</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">bungkam/bunyikan mikrofon</string>
+  <string name="app_ops_summaries_toast_window">tampilkan toast</string>
+  <string name="app_ops_summaries_project_media">proyek media</string>
+  <string name="app_ops_summaries_activate_vpn">aktifkan VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">menulis gambar latar</string>
+  <string name="app_ops_summaries_assist_structure">bantu struktur</string>
+  <string name="app_ops_summaries_assist_screenshot">bantu cuplikan layar</string>
+  <string name="app_ops_summaries_read_phone_state">membaca kondisi ponsel</string>
+  <string name="app_ops_summaries_add_voicemail">menambahkan pesan suara</string>
+  <string name="app_ops_summaries_use_sip">menggunakan SIP</string>
+  <string name="app_ops_summaries_make_call">membuat panggilan</string>
+  <string name="app_ops_summaries_use_fingerprint">gunakan sidik jari</string>
+  <string name="app_ops_summaries_use_body_sensors">menggunakan sensor tubuh</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">membaca siaran seluler</string>
+  <string name="app_ops_summaries_mock_location">memalsukan lokasi</string>
+  <string name="app_ops_summaries_read_external_storage">membaca penyimpanan luar</string>
+  <string name="app_ops_summaries_write_external_storage">tulis untuk penyimpanan luar</string>
+  <string name="app_ops_summaries_turn_screen_on">menyalakan layar</string>
+  <string name="app_ops_summaries_get_accounts">mendapatkan laporan</string>
+  <string name="app_ops_summaries_toggle_wifi">beralih ke Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">beralih ke bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">mulai saat boot</string>
+  <string name="app_ops_summaries_toggle_nfc">beralih ke NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">mengalihkan data seluler</string>
+  <string name="app_ops_summaries_superuser">akses punca (root)</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Lokasi gersang</string>
+  <string name="app_ops_labels_fine_location">Lokasi yang baik</string>
+  <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">Getar</string>
+  <string name="app_ops_labels_read_contacts">Baca kontak</string>
+  <string name="app_ops_labels_modify_contacts">Mengubah kontak</string>
+  <string name="app_ops_labels_read_call_log">Baca log panggilan</string>
+  <string name="app_ops_labels_modify_call_log">Ubah log panggilan</string>
+  <string name="app_ops_labels_read_calendar">Baca kalendar</string>
+  <string name="app_ops_labels_modify_calendar">Ubah kalendar</string>
+  <string name="app_ops_labels_wifi_scan">Tinjau Wi-Fi</string>
+  <string name="app_ops_labels_notification">Pemberitahuan/Toast</string>
+  <string name="app_ops_labels_cell_scan">Tinjau jaringan</string>
+  <string name="app_ops_labels_call_phone">Panggilan Telepon</string>
+  <string name="app_ops_labels_read_sms">Membaca SMS</string>
+  <string name="app_ops_labels_write_sms">Menulis SMS</string>
+  <string name="app_ops_labels_receive_sms">Menerima SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Menerima SMS darurat</string>
+  <string name="app_ops_labels_receive_mms">Menerima MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Menerima Wireless Application Protocol push</string>
+  <string name="app_ops_labels_send_sms">Kirim SMS</string>
+  <string name="app_ops_labels_read_icc_sms">Membaca ICC SMS</string>
+  <string name="app_ops_labels_write_icc_sms">Menulis ICC SMS</string>
+  <string name="app_ops_labels_modify_settings">Ubah pengaturan</string>
+  <string name="app_ops_labels_draw_on_top">Gambar di atas</string>
+  <string name="app_ops_labels_access_notifications">Akses pemberitahuan</string>
+  <string name="app_ops_labels_camera">Kamera</string>
+  <string name="app_ops_labels_record_audio">Rekam audio</string>
+  <string name="app_ops_labels_play_audio">Putar audio</string>
+  <string name="app_ops_labels_read_clipboard">Baca clipboard</string>
+  <string name="app_ops_labels_modify_clipboard">Ubah clipboard</string>
+  <string name="app_ops_labels_media_buttons">Tombol media</string>
+  <string name="app_ops_labels_audio_focus">Fokus audio</string>
+  <string name="app_ops_labels_master_volume">Volume utama</string>
+  <string name="app_ops_labels_voice_volume">Volume suara</string>
+  <string name="app_ops_labels_ring_volume">Volume dering</string>
+  <string name="app_ops_labels_media_volume">Volume media</string>
+  <string name="app_ops_labels_alarm_volume">Volume Alarm</string>
+  <string name="app_ops_labels_notification_volume">Volume pemberitahuan</string>
+  <string name="app_ops_labels_bluetooth_volume">Volume bluetooth</string>
+  <string name="app_ops_labels_keep_awake">Tetap terjaga</string>
+  <string name="app_ops_labels_monitor_location">Memantau lokasi</string>
+  <string name="app_ops_labels_monitor_high_power_location">Memantau lokasi daya tinggi</string>
+  <string name="app_ops_labels_get_usage_stats">Dapakan statistik penggunaan</string>
+  <string name="app_ops_labels_mute_unmute_microphone">Bungkam/bunyikan mikrofon</string>
+  <string name="app_ops_labels_toast_window">Tampilkan toast</string>
+  <string name="app_ops_labels_project_media">Proyek media</string>
+  <string name="app_ops_labels_activate_vpn">Aktifkan VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Menulis gambar latar</string>
+  <string name="app_ops_labels_assist_structure">Membantu struktur</string>
+  <string name="app_ops_labels_assist_screenshot">Bantu cuplikan layar</string>
+  <string name="app_ops_labels_read_phone_state">Membaca kondisi ponsel</string>
+  <string name="app_ops_labels_add_voicemail">Menambahkan pesan suara</string>
+  <string name="app_ops_labels_use_sip">Menggunakan SIP</string>
+  <string name="app_ops_labels_make_call">Buat panggilan</string>
+  <string name="app_ops_labels_use_fingerprint">Gunakan sidik jari</string>
+  <string name="app_ops_labels_use_body_sensors">Gunakan sensor tubuh</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Baca siaran seluler</string>
+  <string name="app_ops_labels_mock_location">Palsukan lokasi</string>
+  <string name="app_ops_labels_read_external_storage">Baca penyimpanan eksternal</string>
+  <string name="app_ops_labels_write_external_storage">Tulis untuk penyimpanan eksternal</string>
+  <string name="app_ops_labels_turn_screen_on">Aktifkan layar</string>
+  <string name="app_ops_labels_get_accounts">Dapatkan akun</string>
+  <string name="app_ops_labels_toggle_wifi">Beralih ke Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Beralih ke bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Mulai saat but</string>
+  <string name="app_ops_labels_toggle_nfc">Beralih ke NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Mengalihkan data seluler</string>
+  <string name="app_ops_labels_superuser">Akses punca (root)</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">Diperbolehkan</string>
+  <string name="app_ops_permissions_ignored">Diabaikan</string>
+  <string name="app_ops_permissions_always_ask">Selalu tanya</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (digunakan <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">Diizinkan: <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">Ditolak: <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">Diizinkan: <xliff:g id="count">%1$s</xliff:g>; ditolak: <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Dinonaktifkan oleh pengoptimuman baterai</string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">Tampilkan aplikasi pengguna</string>
+  <string name="app_ops_show_system_apps">Tampilkan aplikasi bawaan</string>
+  <string name="app_ops_reset_counters">Atur ulang gerai izinkan/tolak</string>
+  <string name="app_ops_reset_confirm_title">Pastikan untuk mengatur kembali gerai</string>
+  <string name="app_ops_reset_confirm_mesg">Apakah Anda yakin ingin mengatur ulang penghitung?</string>
+  <string name="ok">Oke</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">Nama hos perangkat</string>
+  <string name="unlock_scramble_pin_layout_title">Tata letak acak</string>
+  <string name="unlock_scramble_pin_layout_summary">Acak tata letak PIN saat membuka perangkat</string>
+  <string name="button_pref_title">Tombol</string>
+  <string name="hardware_keys_power_key_title">Tombol power</string>
+  <string name="hardware_keys_home_key_title">Tombol beranda</string>
+  <string name="hardware_keys_back_key_title">Tombol Back</string>
+  <string name="hardware_keys_menu_key_title">Tombol Menu</string>
+  <string name="hardware_keys_assist_key_title">Tombol penelusuran</string>
+  <string name="hardware_keys_appswitch_key_title">Tombol terbaru</string>
+  <string name="hardware_keys_camera_key_title">Tombol kamera</string>
+  <string name="hardware_keys_volume_keys_title">Tombol Volume</string>
+  <string name="hardware_keys_short_press_title">Tindakan tekan pendek tombol</string>
+  <string name="hardware_keys_long_press_title">Tindakan tekan lama tombol</string>
+  <string name="hardware_keys_double_tap_title">Tindakan dua kali ketuk tombol</string>
+  <string name="hardware_keys_action_nothing">Tidak ada tindakan</string>
+  <string name="hardware_keys_action_menu">Buka/Tutup menu</string>
+  <string name="hardware_keys_action_app_switch">Pengalih aplikasi terbaru</string>
+  <string name="hardware_keys_action_search">Asisten penelusuran</string>
+  <string name="hardware_keys_action_voice_search">Penelusuran suara</string>
+  <string name="hardware_keys_action_in_app_search">Penelusuran di dalam aplikasi</string>
+  <string name="hardware_keys_action_launch_camera">Luncurkan Kamera</string>
+  <string name="hardware_keys_action_sleep">Matikan layar</string>
+  <string name="hardware_keys_action_last_app">Aplikasi terakhir</string>
+  <string name="camera_sleep_on_release_title">Intip layar</string>
+  <string name="camera_sleep_on_release_summary">Tekan setengah akan menyalakan layar hanya saat tombol tertekan</string>
+  <string name="camera_launch_title">Luncurkan Kamera</string>
+  <string name="camera_launch_summary">Tekan lama dan lepas akan meluncurkan kamera</string>
+  <string name="volbtn_music_controls_title">Kendalikan pemutaran</string>
+  <string name="volbtn_music_controls_summary">Ketika layar dimatikan, menekan dan menahan tombol volume akan menelusuri trek musik</string>
+  <string name="volbtn_cursor_control_title">Kendali kursor papan ketik</string>
+  <string name="volbtn_cursor_control_off">Dinonaktifkan</string>
+  <string name="volbtn_cursor_control_on">Volume atas/bawah menggerakkan kursor kiri/kanan</string>
+  <string name="volbtn_cursor_control_on_reverse">Volume atas/bawah menggerakkan kursor kanan/kiri</string>
+  <string name="power_end_call_title">Akhiri panggilan</string>
+  <string name="power_end_call_summary">Menekan tombol power akan mengakhiri panggilan aktif</string>
+  <string name="swap_volume_buttons_title">Reorientasi</string>
+  <string name="swap_volume_buttons_summary">Swap tombol volume ketika layar diputar</string>
+  <string name="button_wake_title">Bangunkan perangkat</string>
+  <string name="home_answer_call_title">Jawab panggilan</string>
+  <string name="home_answer_call_summary">Menekan tombol beranda akan menjawab panggilan masuk saat ini</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">Lampu latar adaptif</string>
+  <string name="adaptive_backlight_summary">Sesuaikan dengan dinamis kecerahan lampu latar layar untuk memaksimalkan baterai sambil mempertahankan kegunaan</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">Peningkatan sinar matahari</string>
+  <string name="sunlight_enhancement_summary">Tingkatkan kecerahan tampilan dan keterbacaan di bawah sinar matahari cerah</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">Peningkatan warna</string>
+  <string name="color_enhancement_summary">Tingkatkan warna tampilan secara dinamis</string>
   <!-- Key backlight -->
+  <string name="button_backlight_title">Lampu latar</string>
+  <string name="button_backlight_enabled">Cahaya tombol</string>
+  <string name="keyboard_backlight_enabled">Terangi papan ketik</string>
+  <string name="button_backlight_seekbar_title">Tombol kecerahan</string>
+  <string name="keyboard_backlight_seekbar_title">Kecerahan papan ketik</string>
+  <string name="backlight_timeout_title">Waktu habis iluminasi</string>
+  <string name="backlight_timeout_unlimited">Jangan Matikan</string>
+  <string name="backlight_summary_disabled">Dinonaktifkan</string>
+  <string name="backlight_summary_enabled_with_timeout">Diaktifkan untuk <xliff:g id="timeout">%s</xliff:g></string>
+  <string name="backlight_summary_enabled">Diaktifkan</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">Gerakan</string>
   <!-- Power menu -->
+  <string name="power_menu_title">Menu power</string>
+  <string name="power_menu_reboot_title">Menu but ulang</string>
+  <string name="power_menu_screenshot_title">Cuplikan layar</string>
+  <string name="power_menu_airplane_title">Modus pesawat</string>
+  <string name="power_menu_users_title">Pengalih pengguna</string>
+  <string name="power_menu_settings_title">Pintasan pengaturan</string>
+  <string name="power_menu_lockdown_title">Penguncian perangkat</string>
+  <string name="power_menu_bug_report_title">Laporan galat fungsi</string>
+  <string name="power_menu_sound_title">Panel suara</string>
+  <string name="power_menu_bug_report_disabled">Pelaporan galat fungsi dinonaktifkan dalam opsi pengembang</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">Aktifkan bilah navigasi pada layar</string>
+  <string name="disable_navkeys_summary">Aktifkan layar navigasi bar dan menonaktifkan tombol pada perangkat keras</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Ketuk dua kali untuk bangun</string>
+  <string name="double_tap_to_wake_summary">Ketuk dua kali pada layar untuk menyalakan tampilan</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">Ketuk dua kali untuk tidur</string>
+  <string name="double_tap_to_sleep_summary">Ketuk dua kali pada status bar untuk mematikan tampilan</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">Mencegah bangun yang tidak disengaja</string>
+  <string name="proximity_wake_summary">Periksa sensor kedekatan sebelum membangunkan layar</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">Bangun saat pengisi daya di pasang</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Aktifkan layar ketika menghubungkan atau melepaskan sumber daya</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">Contoh</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">Penyesuaian volume suara</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">Intensitas penggetar</string>
+  <string name="vibrator_warning">Nilai-nilai yang lebih tinggi daripada %1$d tidak direkomendasikan</string>
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
+  <string name="color_calibration_title">Kalibrasi warna</string>
+  <string name="color_calibration_summary">Menyesuaikan layar warna</string>
+  <string name="color_red_title">Merah</string>
+  <string name="color_green_title">Hijau</string>
+  <string name="color_blue_title">Biru</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">Buka aplikasi musik</string>
+  <string name="headset_connect_player_summary">Jalankan aplikasi musik baku saat set kepala tersambung</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">Prioritas otomatis</string>
+  <string name="auto_brightness_reset_button">Set ulang</string>
   <!-- Display : Rotation  -->
+  <string name="display_rotation_title">Rotasi</string>
+  <string name="display_rotation_disabled">Dinonaktifkan</string>
+  <string name="display_rotation_unit">derajat</string>
+  <string name="display_lockscreen_rotation_title">Putar layar kunci</string>
+  <string name="display_rotation_category_title">Modus rotasi</string>
+  <string name="display_rotation_0_title">0 derajat</string>
+  <string name="display_rotation_90_title">90 derajat</string>
+  <string name="display_rotation_180_title">180 derajat</string>
+  <string name="display_rotation_270_title">270 derajat</string>
   <!-- Display settings.  Screen color. -->
+  <string name="screencolor">Warna layar</string>
+  <string name="screencolor_summary">Menyetel warna layar, saturasi, kontras atau intensitas</string>
+  <string name="custom_screencolor">Warna layar khusus</string>
+  <string name="screencolor_save">Simpan</string>
+  <string name="screencolor_cancel">Batalkan</string>
+  <string name="restore_preview">Lihat gambar semula</string>
+  <string name="selectnewfile_menu">Lihat gambar baru dari Galeri</string>
+  <string name="selectfile_menu">Lihat gambar dari Galeri</string>
+  <string name="restore_default_str">Atur kembali</string>
+  <string name="hue_str">Rona: <xliff:g id="hue_value">%1$s</xliff:g></string>
+  <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
+  <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
+  <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ruangan untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
+  <string name="live_display_mode">Modus tampilan</string>
+  <string name="live_display_color_temperature_title">Suhu warna</string>
+  <string name="live_display_color_temperature_summary">Pagi: <xliff:g id="day_temperature">%1$d</xliff:g>K;  Malam: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">Pagi</string>
+  <string name="live_display_night">Malam</string>
+  <string name="live_display_outdoor_mode_title">Modus luar ruangan otomatis</string>
+  <string name="live_display_outdoor_mode_summary">Meningkatkan kecerahan dan saturasi otomatis saat dibawah sinar matahari</string>
+  <string name="live_display_low_power_title">Mengurangi konsumsi daya</string>
+  <string name="live_display_low_power_summary">Menyesuaikan ampilan untuk konsumsi daya terendah tanpa degradasi</string>
+  <string name="live_display_enhance_color_title">Tingkatkan warna</string>
+  <string name="live_display_enhance_color_summary">Meningkatkan vibran warna dari corak terang, pemandangan dan gambar lain</string>
+  <string name="live_display_color_profile_title">Profil warna</string>
+  <string name="live_display_color_profile_standard_title">Standar</string>
+  <string name="live_display_color_profile_standard_summary">Warna yang tepat dan putih terang</string>
+  <string name="live_display_color_profile_natural_title">Alami</string>
+  <string name="live_display_color_profile_natural_summary">Warna realistis dan nada daging</string>
+  <string name="live_display_color_profile_dynamic_title">Dinamis</string>
+  <string name="live_display_color_profile_dynamic_summary">Warna yang ditingkatkan dan putih terang</string>
+  <string name="live_display_color_profile_cinema_title">Bioskop</string>
+  <string name="live_display_color_profile_cinema_summary">Reproduksi warna yang sempurna untuk video</string>
+  <string name="live_display_color_profile_astronomy_title">Ilmu perbintangan</string>
+  <string name="live_display_color_profile_astronomy_summary">Merah gelap untuk mempertahankan penglihatan malam</string>
+  <string name="live_display_color_profile_photography_title">Fotografi</string>
+  <string name="live_display_color_profile_photography_summary">Reproduksi warna yang sempurna untuk foto</string>
+  <string name="live_display_color_profile_basic_title">Dasar</string>
+  <string name="live_display_color_profile_basic_summary">Gunakan tampilan yang belum disesuaikan</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">Ikon pemilih</string>
+  <string name="ime_switcher_notify_summary">Tampilkan ikon metode pemilih masukan</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">Notifikasi mengambang</string>
+  <string name="summary_heads_up_enabled">Pemberitahuan munculan diaktifkan</string>
+  <string name="summary_heads_up_disabled">Pemberitahuan munculan dinonaktifkan</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">Terima semua jenis berkas</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">Kepekaan sentuh tinggi</string>
+  <string name="high_touch_sensitivity_summary">Tingkatkan kepekaan layar sentuh sehingga dapat digunakan saat mengenakan sarung tangan</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">Kerapatan LCD</string>
+  <string name="dialog_title_lcd_density">Kerapatan LCD</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (baku)</string>
+  <string name="restarting_ui">Memulai kembali UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">Tampilkan ikon saat menggunakan stilus</string>
+  <string name="stylus_icon_enabled_summary">Tampilkan ikon penunjuk ketika mengambang jari atau menggambar dengan stilus</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">Gerakan stilus</string>
+  <string name="category_spen_title">Gerakan stilus</string>
+  <string name="enable_subcat_title">Stilus</string>
+  <string name="enable_spen_title_head">Aktifkan gerakan</string>
+  <string name="enable_spen_summary_head">Gunakan gerakan usap dengan menekan tombol stilus</string>
+  <string name="gestures_subcat_title">Gerakan</string>
+  <string name="gestures_left_spen_title_head">Usap ke kiri</string>
+  <string name="gestures_right_spen_title_head">Usap ke kanan</string>
+  <string name="gestures_up_spen_title_head">Usap ke atas</string>
+  <string name="gestures_down_spen_title_head">Usap ke bawah</string>
+  <string name="gestures_long_spen_title_head">Tekan agak lama</string>
+  <string name="gestures_double_spen_title_head">Ketuk dua kali</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">Tidak ada tindakan</string>
+  <string name="gestures_action_home">Beranda</string>
+  <string name="gestures_action_back">Kembali</string>
+  <string name="gestures_action_menu">Menu</string>
+  <string name="gestures_action_search">Menjalankan Penelusuran</string>
+  <string name="gestures_action_recent">Daftar aplikasi terakhir</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s tidak terinstal</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">Ambang jari di layar sentuh</string>
+  <string name="touchscreen_hovering_summary">Mengizinkan Anda mengambang jari di atas layar seperti menggunakan tetikus dalam peramban web, destop jarak jauh, dll</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">Meningkatkan volume dering</string>
+  <string name="increasing_ring_min_volume_title">Volume awal</string>
+  <string name="increasing_ring_ramp_up_time_title">Waktu penguatan</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">GPS membantu pengunduhan data</string>
+  <string name="lto_download_data_wifi_only_on">Melalui jaringan apa pun</string>
+  <string name="lto_download_data_wifi_only_off">Hanya melalui jaringan Wi\u2011Fi</string>
+  <string name="volume_keys_control_ring_stream_title">Kontrol volume nada dering</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Tombol volume mengatur volume nada dering</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Tombol volume mengatur volume media</string>
+  <string name="category_calibration">Kalibrasi</string>
+  <string name="display_and_lights">Tampilan &amp; lampu</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">Suara pengisian daya</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">Aktifkan</string>
+  <string name="power_notifications_enable_summary">Putar suara ketika menghubungkan atau melepaskan sumber daya</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">Getar</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">Suara pemberitahuan</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">Senyap</string>
   <!-- Status bar -->
+  <string name="status_bar_title">Bilah status</string>
+  <string name="status_bar_toggle_brightness">Kontrol kecerahan</string>
+  <string name="status_bar_toggle_brightness_summary">Sesuaikan kecerahan dengan menggeser di bilah status</string>
+  <string name="status_bar_notif_count_title">Tampilkan hitungan pemberitahuan</string>
+  <string name="status_bar_notif_count_summary">Tampilkan jumlah pemberitahuan yang tertunda</string>
+  <string name="status_bar_quick_qs_pulldown_title">Keruntuhan cepat</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s tepi dari bar status dapat ditarik ke bawah untuk Pengaturan Cepat</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Kiri</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Kanan</string>
+  <string name="status_bar_quick_qs_pulldown_off">Nonaktif</string>
+  <string name="status_bar_quick_qs_pulldown_left">Kiri</string>
+  <string name="status_bar_quick_qs_pulldown_right">Kanan</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">Gaya jam</string>
+  <string name="status_bar_clock_style_right">Kanan</string>
+  <string name="status_bar_clock_style_left">Kiri</string>
+  <string name="status_bar_clock_style_center">Tengah</string>
+  <string name="status_bar_clock_style_hidden">Tersembunyi</string>
+  <string name="status_bar_am_pm_title">Gaya AM/PM</string>
+  <string name="status_bar_am_pm_info">24-jam diaktifkan</string>
+  <string name="status_bar_am_pm_normal">Normal</string>
+  <string name="status_bar_am_pm_small">Kecil</string>
+  <string name="status_bar_am_pm_hidden">Tersembunyi</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">Gaya status baterai</string>
+  <string name="status_bar_battery_style_icon_portrait">Ikon potret</string>
+  <string name="status_bar_battery_style_icon_landscape">Ikon lanskap</string>
+  <string name="status_bar_battery_style_circle">Lingkaran</string>
+  <string name="status_bar_battery_style_text">Teks</string>
+  <string name="status_bar_battery_style_hidden">Tersembunyi</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">Persentase baterai</string>
+  <string name="status_bar_battery_percentage_default">Tersembunyi</string>
+  <string name="status_bar_battery_percentage_text_inside">Di dalam ikon</string>
+  <string name="status_bar_battery_percentage_text_next">Di samping ikon</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Baris Ikon status</string>
+  <string name="status_bar_icons_summary">Atur baris Ikon yang ditampilkan</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">Blokir isyarat sentuhan peristiwa</string>
+  <string name="edge_gesture_service_summary">Jangan kirim acara sentuhan untuk navigasi dan gerakan bar status untuk aplikasi</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">Tidak pernah</string>
+  <string name="keep_screen_on_debugging">Saat perbaikan galat fungsi USB</string>
+  <string name="keep_screen_on_charging">Saat mengisi daya</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">Privasi</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">Diaktifkan secara baku</string>
+  <string name="privacy_guard_default_summary">Mengaktifkan secara baku untuk aplikasi yang baru diinstal</string>
+  <string name="privacy_guard_manager_title">Penjaga Privasi</string>
+  <string name="privacy_guard_manager_summary">Kelola aplikasi yang memiliki akses ke data pribadi Anda</string>
+  <string name="privacy_guard_no_user_apps">Tidak ada aplikasi yang terinstal</string>
+  <string name="privacy_guard_help_title">Bantuan</string>
+  <string name="privacy_guard_reset_title">Atur kembali</string>
+  <string name="privacy_guard_reset_text">Atur ulang izin?</string>
+  <string name="privacy_guard_help_text">Di layar ini Anda dapat memilih aplikasi Privacy Guard yang harus aktif dengan mengetuk aplikasinya secara sederhana. Aplikasi yang terpilih tidak akan dapat mengakses ke data personal Anda seperti kontak, pesan, atau log telepon. Tekan dan tahan entri aplikasi dapat membuka detail app tersebut.\n\nAplikasi bawaan tidak ditampilkan secara baku tapi dapat di tampilkan dengan memilih pilihan respektif.</string>
+  <string name="privacy_guard_manager_show_system_apps">Tampilkan aplikasi bawaan</string>
+  <string name="privacy_guard_advanced_settings_title">Lanjutan</string>
+  <string name="privacy_guard_notification_title">Tampilkan pemberitahuan</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">Tunjukkan galat pola</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">Tunjukkan titik-titik pola</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Secara langsung tampilkan entri kata sandi</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Secara langsung tampilkan gambaran pola</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Langsung tampilkan entri nomor identifikasi pribadi</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">Tampilkan visualisasi musik</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Dinonaktifkan oleh kotak penyetelan cepat</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Ketuk untuk mengaktifkan layar kunci</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Layar kunci diaktifkan!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">Ambang batas penghemat baterai</string>
+  <string name="battery_saver_summary">Menurunkan kinerja dan membatasi data latar belakang</string>
+  <string name="battery_saver_summary_unavailable">Tidak tersedia saat pengisian</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">Aktifkan profil per-aplikasi</string>
+  <string name="autoperf_summary">Secara otomatis pilih modus baterai yang sesuai untuk berbagai aplikasi</string>
+  <string name="perf_profile_title">Modus baterai</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplikasi yang dimulai saat but</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">Nada pemberitahuan</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">But ulang lanjutan</string>
+  <string name="advanced_reboot_summary">Ketika dibuka, sertakan opsi dalam menu daya untuk but ulang ke pemulihan, pengelola but, atau melakukan but ulang tanpa mati daya</string>
+  <string name="category_interface">Antarmuka</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">Destop yang diperluas</string>
+  <string name="expanded_hide_nothing">Tidak menyembunyikan apapun</string>
+  <string name="expanded_hide_status">Sembunyikan bar status</string>
+  <string name="expanded_hide_navigation">Sembunyikan bar navigasi</string>
+  <string name="expanded_hide_both">Sembunyikan keduanya</string>
+  <string name="expanded_nothing_to_show">Untuk menambahkan konfigurasi khusus pada setiap aplikasi untuk kondisi diperluas, atur \"Diaktifkan untuk semua\" ke posisi tidak aktif</string>
+  <string name="expanded_enabled_for_all">Diaktifkan untuk semua</string>
+  <string name="expanded_desktop_style">Gaya destop yang diperluas</string>
+  <string name="expanded_desktop_style_description">Pilih gaya baku destop yang diperluas</string>
+  <string name="expanded_desktop_title">Pilihan destop yang diperluas</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">Matikan aplikasi dengan tombol kembali</string>
+  <string name="kill_app_longpress_back_summary">Matikan aplikasi latar dengan menahan tombol kembali</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">Tampilkan bilah penelusuran di menu terbaru</string>
+  <string name="keywords_recents_show_searchbar">terbaru nonaktifkan aktifkan tampilkan sembunyikan bilah penelusuran</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">Beker Bersuara</string>
+  <string name="voice_wakeup_retrain_title">Melatih suara Anda</string>
+  <string name="voice_wakeup_activity_title">Kegiatan untuk memulai</string>
+  <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Beker Bersuara perlu izin bertelepon untuk memilih kontak Sambung Langsung.</string>
+  <string name="picker_activities">Aktivitas</string>
+  <string name="select_custom_app_title">Pilih aplikasi khusus</string>
+  <string name="select_custom_activity_title">Pilih aktivitas khusus</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">Daftar penelepon yang diblokir</string>
+  <string name="blacklist_edit_dialog_title">Edit nomor telepon yang diblokir</string>
+  <string name="blacklist_prefs">Pengaturan</string>
+  <string name="blacklist_button_delete">Hapus</string>
+  <string name="blacklist_empty_text">Anda tidak memiliki nomor yang diblokir. Tambahkan entri dengan menyentuh tombol Tambah (+).</string>
+  <string name="blacklist_disabled_empty_text">Untuk mencegah nomor telepon membuat panggilan atau pesan ke Anda, aktifkan daftar penelepon yang diblokir.</string>
+  <string name="blacklist_summary_disabled">Dinonaktifkan</string>
+  <string name="blacklist_summary">Anda tidak akan menerima panggilan atau pesan dari nomor telepon yang ada di daftar penelepon yang diblokir</string>
+  <string name="blacklist_notify">Tampilkan pemberitahuan</string>
+  <string name="blacklist_private_numbers_title">Nomor pribadi</string>
+  <string name="blacklist_private_numbers_summary_disabled">Tidak memblokir panggilan dari nomor pribadi</string>
+  <string name="blacklist_private_numbers_summary">Blokir panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor pribadi</string>
+  <string name="blacklist_unknown_numbers_title">Nomor tidak diketahui</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">Tidak memblokir panggilan atau pesan dari angka-angka yang tidak ada dalam daftar kontak</string>
+  <string name="blacklist_unknown_numbers_summary">Blok panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor-nomor yang tidak ada dalam daftar kontak</string>
+  <string name="blacklist_summary_type_calls_only">panggilan</string>
+  <string name="blacklist_summary_type_messages_only">pesan</string>
+  <string name="blacklist_summary_type_calls_and_messages">panggilan dan pesan</string>
+  <string name="blacklist_regex_title">Gunakan wildcard</string>
+  <string name="blacklist_regex_summary">Gunakan . sebagai wildcard dan * untuk pengulangan. Misalnya 123.* blok nomor dimulai dengan 123 dan .* 123.* blok angka yang mengandung 123</string>
+  <string name="blacklist_policy_block_calls">Blokir panggilan masuk</string>
+  <string name="blacklist_policy_block_messages">Blokir pesan masuk</string>
+  <string name="blacklist_bad_number_add">Tidak dapat menambahkan nomor telepon yang tidak sesuai untuk daftar penelepon yang diblokir</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">Hapus Nomor</string>
+  <string name="remove_blacklist_entry">Apakah Anda ingin menghapus nomor telepon yang diblokir ini?</string>
+  <string name="select_contact">Pilih kontak</string>
   <!-- Sms security limit -->
+  <string name="app_security_title">Keamanan aplikasi</string>
+  <string name="sms_security_check_limit_title">Batas pesan SMS</string>
+  <string name="sms_security_check_limit_summary">Aplikasi dapat mengirim %d pesan dalam 1 menit sebelum konfirmasi</string>
+  <string name="sms_security_check_limit_summary_none">Aplikasi tidak diizinkan untuk mengirim pesan tanpa konfirmasi</string>
+  <string name="sms_security_check_limit_none">Tidak ada</string>
   <!-- Notification spamfilter -->
+  <string name="spam_added_title">Ditambahkan %1$s</string>
+  <string name="spam_last_blocked_title">Terakhir diblokir %1$s</string>
+  <string name="block_notifications_title">Pemberitahuan penyaringan</string>
+  <string name="block_notifications_summary">Kelola pemberitahuan yang diabaikan dan filter</string>
+  <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Statistik CyanogenMod</string>
+  <string name="anonymous_statistics_summary">Bantu CyanogenMod untuk menjadi lebih baik dengan memilih ikut dalam pelaporan statistik anonim</string>
+  <string name="anonymous_statistics_warning_title">Mengenai</string>
+  <string name="anonymous_statistics_warning">Memilih ikut dalam Statistik CyanogenMod akan memungkinkan data nonpribadi dikirimkan kepada para pengembang CyanogenMod untuk melacak instalasi unik pada berbagai macam perangkat. Informasi yang dikirimkan berisi pengenal unik, dan tidak membahayakan privasi atau data pribadi Anda. Data dikirim setiap kali perangkat dibut.\n\nUntuk melihat contoh data yang akan dikirim, ketuk Pratinjau Data.</string>
+  <string name="enable_reporting_title">Aktifkan pelaporan</string>
+  <string name="preview_data_title">Pratinjau data</string>
+  <string name="view_stats_title">Lihat statistik</string>
+  <string name="anonymous_learn_more">Pelajari lebih lanjut</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">ID unik</string>
+  <string name="preview_device_title">Perangkat</string>
+  <string name="preview_version_title">Versi</string>
+  <string name="preview_country_title">Negara</string>
+  <string name="preview_carrier_title">Operator</string>
+  <string name="stats_collection_title">Kumpulan statistik</string>
+  <string name="stats_collection_summary">Ketika diaktifkan, izinkan pengumpulan metrik</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">Atur kembali pola</string>
+  <string name="lockpattern_settings_reset_summary">Masukkan akun surel utama dan sandi yang terkait untuk mengatur ulang kunci pola</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">Atur kembali</string>
+  <string name="menu_hidden_apps_reset_lock">Atur kembali pola kunci</string>
+  <string name="protected_apps">Aplikasi yang di lindungi</string>
+  <string name="protected_apps_summary">Kelola aplikasi yang tersembunyi dengan kunci aman</string>
+  <string name="saving_protected_components">Menyimpan kondisi komponen\u2026</string>
+  <string name="pa_login_username_hint">Nama pengguna (surel)</string>
+  <string name="pa_login_password_hint">Kata sandi</string>
+  <string name="pa_login_submit_button">Masuk</string>
+  <string name="pa_login_checking_password">Memeriksa akun\u2026</string>
+  <string name="pa_login_incorrect_login">Login tidak benar</string>
+  <string name="pa_pattern_or_fingerprint_header">Harus menggambar pola atau menggunakan sidik jari untuk membuka</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">Penyumbang</string>
+  <string name="contributors_cloud_loading_message">Memuat data kontributor\u2026</string>
+  <string name="contributors_cloud_failed_message">Tidak dapat memuat data kontributor</string>
+  <string name="contributor_info_menu">Info kontributor</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Nama:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Nick:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Commits:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">Info sumbangan</string>
+  <string name="contributions_info_msg">
+<![CDATA[<b>Jumlah kontributor:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Jumlah kontribusi:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Pembaruan terakhir:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">Suara</string>
+  <string name="notification_manager">Pemberitahuan</string>
+  <string name="lockscreen_settings">Layar kunci</string>
+  <string name="category_lights">Lampu</string>
+  <string name="category_volume">Volume</string>
+  <string name="category_vibrate">Getar</string>
+  <string name="category_misc">Macam-macam</string>
+  <string name="title_general">Umum</string>
+  <string name="advanced">Lanjutan</string>
+  <string name="link_volume_option_title">Hubungkan volume nada dering &amp; pemberitahuan</string>
+  <string name="lcd_density_prompt_message">Beberapa aplikasi mungkin tidak berfungsi pada DPI yang tidak standar.\n\n Ini akan menyalakan ulang ponsel Anda.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Nomor telepon APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Gandakan APN</string>
+  <string name="duplicate_apn_error_message">APN ini sudah ada. Membuang atau mengubah parameter.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> adalah <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
+  <string name="sim_disabled">dinonaktifkan</string>
+  <string name="sim_missing">hilang atau rusak</string>
+  <string name="sim_enabler_need_disable_sim">Kartu SIM akan dinonaktifkan. Apakah Anda ingin melanjutkan?</string>
+  <string name="sim_enabler_will_disable_sim_title">Perhatian</string>
+  <string name="sim_enabler_need_switch_data_service">SIM ini akan dinonaktifkan dan SIM <xliff:g id="slotid">%1$s </xliff:g> akan digunakan untuk layanan data. Apakah Anda yakin Anda ingin melanjutkan?</string>
+  <string name="sim_enabler_airplane_on">Tidak dapat melakukan operasi saat modus pesawat aktif.</string>
+  <string name="sim_enabler_in_call">Tidak dapat melakukan operasi saat dalam panggilan.</string>
+  <string name="sim_enabler_both_inactive">Tidak dapat menonaktifkan semua kartu SIM</string>
+  <string name="sim_enabler_enabling">Mengaktivasi\u2026</string>
+  <string name="sim_enabler_disabling">Menonaktifkan\u2026</string>
+  <string name="sub_activate_success">SIM diaktifkan.</string>
+  <string name="sub_activate_failed">Aktivasi gagal.</string>
+  <string name="sub_deactivate_success">SIM dinonaktifkan.</string>
+  <string name="sub_deactivate_failed">Penonaktifan gagal.</string>
+  <string name="primary_sub_select_title">Langganan 3G/LTE baku</string>
+  <string name="select_sim_card">Pilih kartu SIM</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">Status %d SIM</string>
+  <string name="sim_card_lock_settings_title">Pengaturan kunci SIM %d</string>
+  <string name="sim_card_summary_empty">SIM tidak diinstal</string>
+  <string name="sim_mobile_network_settings_category_title">Pengaturan jaringan seluler</string>
+  <string name="sim_mobile_network_settings_title">Pengaturan SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">pengingat</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">kegiatan</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">penelepon yang terpilih</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">pesan terpilih</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">Kepala: %1$s W/kg</string>
+  <string name="maximum_body_level">Tubuh: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">Modusl: %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">Nada dering SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">App:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Terakhir kali digunakan:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Waktu penggunaan:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">Ini akan menghapus semua data dari <b>penyimpanan internal</b> tablet Anda, termasuk: \n\n<li>Akun perangkat</li>\n<li>Sistem, data aplikasi dan pengaturan</li>\n<li>Aplikasi unduhan</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">Ini akan menghapus semua data dari <b>penyimpanan internal</b> ponsel Anda, termasuk: \n\n<li>Akun perangkat</li>\n<li>Sistem, data aplikasi dan pengaturan</li>\n<li>Aplikasi unduhan</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">Data pribadi &amp; aplikasi</string>
+  <string name="factory_reset_instructions_summary">Ini akan menghapus semua akun, aplikasi, data aplikasi, dan pengaturan sistem dalam perangkat ini</string>
+  <string name="factory_reset_personal_content">Isi pribadi</string>
+  <string name="factory_reset_erase_stored_content">Hapus isi yang tersimpan</string>
+  <string name="factory_reset_erase_stored_content_summary">Hapus musik, foto, video, dan data pengguna lainnya yang tersimpan dalam perangkat</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">Hapus musik, foto, video, dan data pengguna lainnya yang tersimpan dalam perangkat. \n\n<b>Isi tidak dapat disimpan karena enkripsi perangkat.</b></string>
+  <string name="factory_reset_erase_sd_card">Format Kartu SD</string>
+  <string name="factory_reset_erase_sd_card_summary">Hapus semua data dalam Kartu SD, termasuk musik dan foto</string>
+  <string name="factory_reset_warning_text_reset_now">ATUR KEMBALI SEKARANG</string>
+  <string name="factory_reset_warning_text_message">Semua akun, aplikasi, data aplikasi, dan pengaturan sistem akan dihapus dari perangkat. Ini tidak bisa diurungkan.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Lainnya</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Batas waktu area bersinyal Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_never">Tidak pernah</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 menit</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 menit</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 menit</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Area bersinyal Wi\u2011Fi portabel tak akan habis berlaku</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Area bersinyal Wi\u2011Fi portabel akan habis berlaku sesudah <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Layar kunci Hidup</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Mengaktifkan dan mengkonfigurasi layar kunci Hidup</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">Pengaturan</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Untuk melihat layar kunci Hidup tersedia, Aktifkan layar kunci Hidup.</string>
+  <string name="interruptions_ignore_while_media_title">Cegah penurunan suara</string>
+  <string name="interruptions_ignore_while_media_summary">Jangan kurangi volume pemutaran media ketika ada pemberitahuan baru</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">Hukum CyanogenMod</string>
   <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Atur ulang statistik</string>
   <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Statistik riwayat baterai akan diatur kembali</string>
   <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Dok baterai tidak ada</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Mengisi daya dengan dok AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Mengisi melalui dok USB</string>
+  <string name="restrict_app_wlan_title">Nonaktifkan aplikasi pada penggunaan Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Mencegah aplikasi menggunakan sambungan data Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Nonaktifkan penggunaan data seluler pada aplikasi</string>
+  <string name="restrict_app_cellular_summary">Mencegah aplikasi menggunakan koneksi data seluler</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Cuaca</string>
+  <string name="weather_settings_no_services_prompt">Penyedia layanan cuaca tidak diinstal</string>
+  <string name="weather_settings_button">Pengaturan penyedia</string>
+  <string name="background_data_access">Akses data latar belakang</string>
+  <string name="allow_background_both">Melalui data seluler &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Hanya melalui Wi\u2011Fi</string>
+  <string name="allow_background_none">Tidak ada akses</string>
+  <string name="mobile_data_alert">Lansiran data seluler</string>
+  <string name="mobile_data_alert_summary">Beritahu ketika aplikasi menggunakan sejumlah data besar</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktifkan peringatan penggunaan data</string>
+  <string name="data_usage_menu_disable_data_alerts">Nonaktifkan peringatan penggunaan data</string>
+  <string name="data_usage_menu_reset_stats">Atur kembali statistik data</string>
+  <string name="reset_data_stats_msg">Ini akan menghapus semua informasi pelacakan data masa lalu dan kini</string>
+  <string name="reset_stats_confirm">Pastikan</string>
+  <string name="restrict_cellular_access_title">Batasi akses data seluler</string>
+  <string name="restrict_cellular_access_summary">Nonaktifkan akses data pada jaringan seluler</string>
+  <string name="restrict_cellular_access_dialog_title">Batasi akses data seluler?</string>
+  <string name="restrict_cellular_access_dialog_summary">Fitur ini dapat menyebabkan sebuah aplikasi yang bergantung pada akses jaringan untuk berhenti bekerja apabila hanya jaringan seluler yang tersedia.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih tepat dalam Pengaturan yang tersedia dalam aplikasi.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index a9f34a7..428ff42 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Impostazioni luci</string>
   <string name="led_notification_text">LED attivato dalle impostazioni</string>
+  <string name="notification_light_no_apps_summary">Per modificare le impostazioni per le singole app, attiva \'%1$s\' e premi \'\u002b\' sulla barra in alto</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Debug Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Barra navigazione a schermo</string>
   <string name="disable_navkeys_summary">Attiva la barra di navigazione su schermo e disattiva i pulsanti fisici</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Risveglio con doppio tocco</string>
+  <string name="double_tap_to_wake_summary">Doppio tocco sullo schermo per accenderlo</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Doppio tocco per sospendere</string>
   <string name="double_tap_to_sleep_summary">Doppio tocco sulla barra di stato per spegnere il display</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Rosso</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Blu</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Avvia lettore musicale</string>
   <string name="headset_connect_player_summary">Lancia il lettore musicale predefinito quando vengono connesse le cuffie</string>
@@ -999,6 +1002,7 @@
   <string name="weather_settings_title">Meteo</string>
   <string name="weather_settings_no_services_prompt">Nessun provider meteo installato</string>
   <string name="weather_settings_button">Impostazioni provider</string>
+  <string name="weather_settings_activity_not_found">Impossibile aprire il menu d\'impostazioni di questo provider</string>
   <string name="background_data_access">Accesso dati in background</string>
   <string name="allow_background_both">Con dati mobili &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Solo su Wi\u2011Fi</string>
@@ -1014,4 +1018,6 @@
   <string name="restrict_cellular_access_summary">Disattiva accesso su dati mobili</string>
   <string name="restrict_cellular_access_dialog_title">Applicare restrizione dati mobili?</string>
   <string name="restrict_cellular_access_dialog_summary">Questa funzione potrebbe impedire ad un\'app di funzionare correttamente quando sei connesso solo con dati mobili.\n\nPotresti trovare controlli per l\'utilizzo dati pià appropriati all\'interno delle impostazioni dell\'app stessa.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operatori di rete</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index ca34560..760d7ba 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">הגדרות נורית</string>
   <string name="led_notification_text">נורית LED מופעלת בהגדרות</string>
+  <string name="notification_light_no_apps_summary">כדי להוסיף בקרה ברמת יישום בודד, הפעילו את \"%1$s\" ולחצו על \"\u002b\" בשורת התפריטים</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">איתור באגים של אנדרואיד</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">הפעל לחצני ניווט על המסך</string>
   <string name="disable_navkeys_summary">אפשר לחצני ניווט על המסך והשבת לחצנים פיזיים</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">הקשה כפולה כדי להעיר</string>
+  <string name="double_tap_to_wake_summary">הקש פעמיים כדי להפעיל את התצוגה</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">הקשה כפולה לכיבוי מסך</string>
   <string name="double_tap_to_sleep_summary">הקש פעמיים בשורת המצב כדי לכבות את המסך</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">אדום</string>
   <string name="color_green_title">ירוק</string>
   <string name="color_blue_title">כחול</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">הפעל נגן מוזיקה</string>
   <string name="headset_connect_player_summary">הפעל את נגן המוזיקה המוגדר כברירת המחדל בעת חיבור אוזניות</string>
@@ -1012,4 +1015,5 @@
   <string name="restrict_cellular_access_summary">השבתת גישה לנתונים ברשתות סלולריות</string>
   <string name="restrict_cellular_access_dialog_title">להגביל גישה לנתונים סלולריים?</string>
   <string name="restrict_cellular_access_dialog_summary">תכונה זו עלולה לגרום להפסקת פעולתו של יישום התלוי בגישה לרשת כאשר קיימת זמינות לרשתות סלולריות בלבד.\n\nתוכל למצוא פקדים מתאימים יותר לשימוש בנתונים, בהגדרות הזמינות בתוך היישום.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 129bdc5..2bcd944 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">スクリーンナビゲーションバーを有効化</string>
   <string name="disable_navkeys_summary">スクリーンナビゲーションバーを有効にしてハードウェアボタンを無効にする</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ダブルタップしてスリープ解除</string>
+  <string name="double_tap_to_wake_summary">画面をダブルタップしてディスプレイを点灯する</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">ダブルタップしてスリープ</string>
   <string name="double_tap_to_sleep_summary">ステータスバーをダブルタップしてディスプレイを消灯する</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">赤</string>
   <string name="color_green_title">緑</string>
   <string name="color_blue_title">青</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">音楽アプリを起動</string>
   <string name="headset_connect_player_summary">ヘッドセット接続時にデフォルトの音楽アプリを起動する</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USBでホルダーを充電しています</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 7fadff4..2ab126e 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ತೆರೆಯ-ಮೇಲಿನ ನಾವ್ ಬಾರ್ ಸಕ್ರಿಯಗೊಳಿಸು</string>
   <string name="disable_navkeys_summary">ತೆರೆಯ-ಮೇಲಿನ ನಾವ್ ಬಾರ್ ಸಕ್ರಿಯಗೊಳಿಸು ಮತ್ತು ಹಾರ್ಡ್‍ವೇರ್ ಬಟನ್‍ಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ಎಬ್ಬಿಸಲು ದ್ವಿಗುಣ-ಸ್ಪರ್ಶ</string>
+  <string name="double_tap_to_wake_summary">ಪ್ರದರ್ಶನವನ್ನು ಆನ್ ಮಾಡಲು ಪರದೆಯ ಮೇಲೆ ದ್ವಿಗುಣ-ಸ್ಪರ್ಶಿಸಿ</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">ನಿದ್ರಿಸಲು ದ್ವಿಗುಣ-ಸ್ಪರ್ಶ</string>
   <string name="double_tap_to_sleep_summary">ಪ್ರದರ್ಶನವನ್ನು ಆಫ್ ಮಾಡಲು ಸ್ಟೇಟಸ್ ಬಾರ್‍ ಮೇಲೆ ದ್ವಿಗುಣ-ಸ್ಪರ್ಶಿಸಿ</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">ಕೆಂಪು</string>
   <string name="color_green_title">ಹಸಿರು</string>
   <string name="color_blue_title">ನೀಲಿ</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">ಮ್ಯೂಸಿಕ್ ಆಪ್ ತೆರೆ</string>
   <string name="headset_connect_player_summary">ಹೆಡ್‍ಸೆಟ್ ಸಂಪರ್ಕಗೊಂಡಾಗ ಡೀಫಾಲ್ಟ್ ಮ್ಯೂಸಿಕ್ ಆಪ್ ಆರಂಭಿಸು</string>
@@ -988,4 +990,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ಡಾಕ್ ಯು‍ಎಸ್‍ಬಿಯ ಮೂಲಕ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 299c39c..042377e 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -514,6 +514,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">온스크린 내비게이션 바 사용</string>
   <string name="disable_navkeys_summary">온스크린 내비게이션 바를 활성화하고 하드웨어 버튼을 비활성화합니다</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">더블 탭하여 화면 켜기</string>
+  <string name="double_tap_to_wake_summary">화면에 더블 탭하여 화면 켜기</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">탭하여 화면 끄기</string>
   <string name="double_tap_to_sleep_summary">상태 표시줄에 더블 탭하여 화면 끄기</string>
@@ -537,7 +540,6 @@
   <string name="color_red_title">빨강</string>
   <string name="color_green_title">초록</string>
   <string name="color_blue_title">파랑</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">음악 앱 실행</string>
   <string name="headset_connect_player_summary">헤드셋이 연결되면 기본 음악 앱 실행</string>
@@ -983,4 +985,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">독 USB로 충전중</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 8c5a989..e57e93b 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -430,6 +430,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">چالاکردنی شریتی ڕوونما</string>
   <string name="disable_navkeys_summary">چالاکردنی کردنه‌وه‌ی ڕێدۆزه‌ره‌ی ڕوونما و له‌کارخستنی دوگمه‌ی ڕه‌قه‌کاڵڵا</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">دوجارلێیده‌ بۆ هه‌ڵسان</string>
+  <string name="double_tap_to_wake_summary">دوجار دەستلێدە بۆ کردنەوەی شاشەکە</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">دوجار-لێدان بۆ خه‌وتن</string>
   <string name="double_tap_to_sleep_summary">دوجار دەستبدە لە شریتی دۆخ بۆ کوژانەوەی پیشاندان</string>
@@ -453,7 +456,6 @@
   <string name="color_red_title">سور</string>
   <string name="color_green_title">سه‌وز</string>
   <string name="color_blue_title">شین</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">کردنه‌وه‌ی به‌رنامه‌ی ده‌نگ</string>
   <string name="headset_connect_player_summary">کردنه‌وه‌ی به‌رنامه‌ی مۆسیقای بنه‌ڕه‌تی کاتێک بڵندگۆ په‌یوه‌ندکرا</string>
@@ -760,4 +762,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index c3e5571..f03dfc9 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -453,6 +453,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Navigatiounsläischt um Schierm aktivéieren</string>
   <string name="disable_navkeys_summary">D\'Hardware-Tasten desaktivéieren an eng Navigatiounsläischt um Schierm uweisen</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Zweemol drécke fir waakreg ze maachen</string>
+  <string name="double_tap_to_wake_summary">Zweemol op de Schierm drécke fir en unzeschalten</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Zweemol drécke fir auszemaachen</string>
   <string name="double_tap_to_sleep_summary">Zweemol drécken op der Statusläischt mécht de Schierm aus</string>
@@ -476,7 +479,6 @@
   <string name="color_red_title">Rout</string>
   <string name="color_green_title">Gréng</string>
   <string name="color_blue_title">Blo</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Musek-App starten</string>
   <string name="headset_connect_player_summary">Wa Kopfhörer verbonne ginn, gëtt Standard-Musek-App gestart</string>
@@ -869,4 +871,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Luede mam USB-Dock</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index b5275f8..3478c75 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -453,6 +453,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Įgalinti ekranine naršymo juostą</string>
   <string name="disable_navkeys_summary">Įgalinti ekranine naršymo juostą ir neleisti aparatūros mygtukų</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dukart bakstelėti, kad pažadinti</string>
+  <string name="double_tap_to_wake_summary">Dukart bakstelėti ekraną, kad jį ijungti</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dukart bakstelėti, kad užmigdyti</string>
   <string name="double_tap_to_sleep_summary">Dukart bakstelėti būsenos juostą, kad išjungti ekraną</string>
@@ -476,7 +479,6 @@
   <string name="color_red_title">Raudona</string>
   <string name="color_green_title">Žalia</string>
   <string name="color_blue_title">Mėlyna</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Paleisti muzikos programą</string>
   <string name="headset_connect_player_summary">Paleisti numatytąją muzikos programą, kai prijungiama laisvų rankų įranga</string>
@@ -874,4 +876,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Įkraunama per USB doką</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 2af1dc6..e042eb0 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -334,6 +334,8 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ieslēgt ekrāna navigācijas joslu</string>
   <string name="disable_navkeys_summary">Ieslēgt ekrāna navigācijas joslu un atslēgt aparatūras pogas</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Lai pamodinātu, veiciet dubultu piesitienu</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Lai iemidzinātu, veiciet dubultu piesitienu</string>
   <!-- Proximity wake -->
@@ -355,7 +357,6 @@
   <string name="color_red_title">Sarkans</string>
   <string name="color_green_title">Zaļš</string>
   <string name="color_blue_title">Zils</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="auto_brightness_reset_button">Atstatīt</string>
@@ -547,4 +548,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index c2750bc..c09a9ed 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ഓൺ-സ്ക്രീൻ നാവിഗേഷന്‍ ബാർ പ്രാപ്തമാക്കുക</string>
   <string name="disable_navkeys_summary">ഓൺ-സ്ക്രീൻ നാവിഗേഷൻ ബാർ പ്രാപ്തമാക്കുകയും ഹാർഡ്‌വെയർ ബട്ടണുകൾ അപ്രാപ്തമാക്കുകയും ചെയ്യുക</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">സജീവമാക്കുന്നതിന് ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
+  <string name="double_tap_to_wake_summary">ഡിസ്പ്ലേ ഓണ്‍ ചെയ്യാന്‍ സ്ക്രീനിൽ ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">നിഷ്ക്രിയമാക്കുന്നതിന് ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
   <string name="double_tap_to_sleep_summary">ഡിസ്പ്ലേ ഓഫ് ചെയ്യുന്നതിന് സ്റ്റാറ്റസ് ബാറിൽ ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">ചുവപ്പ്</string>
   <string name="color_green_title">പച്ച</string>
   <string name="color_blue_title">നീല</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
   <string name="headset_connect_player_summary">ഹെഡ്സെറ്റ് ഘടിപ്പിച്ചിരിക്കുമ്പോള്‍ ഡിഫോള്‍ട്ട് സംഗീത ആപ്ലിക്കേഷൻ ആരംഭിക്കുക</string>
@@ -987,4 +989,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USB ഡോക്ക് മുഖേന ചാര്‍ജ് ചെയ്യുന്നു</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 0cea6cc..6efd23f 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ऑन-स्क्रीन nav बार सक्षम करा</string>
   <string name="disable_navkeys_summary">ऑन-स्क्रीन नेव्हिगेशन बार सक्षम करा आणि हार्डवेअर बटणे अक्षम करा</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">जागे करण्यासाठी दुहेरी-टॅप करा</string>
+  <string name="double_tap_to_wake_summary">प्रदर्शन चालू करण्यासाठी स्क्रीनवर दुहेरी-टॅप करा</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">झोपेसाठी दुहेरी-टॅप करा</string>
   <string name="double_tap_to_sleep_summary">प्रदर्शन बंद करण्यासाठी स्थिती बारवर दुहेरी-टॅप करा</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">लाल</string>
   <string name="color_green_title">हिरवा</string>
   <string name="color_blue_title">निळा</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">संगीत अनुप्रयोग सुरू करा</string>
   <string name="headset_connect_player_summary">जेव्हा हेडसेट कनेक्ट केलेला असेल तेव्हा डिफॉल्ट संगीत अनुप्रयोग सुरू करा</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक USB वर चार्ज करत आहे</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 313c61e..a81d96b 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -493,6 +493,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Aktiverer navigasjonsbar på skjermen</string>
   <string name="disable_navkeys_summary">Aktiverer navigasjonsbar på skjermen og deaktiver hardware knapper</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dobbelttapp for å vekke</string>
+  <string name="double_tap_to_wake_summary">Dobbelttrykk på skjermen for å aktivere displayet</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dobbeltapp for å sove</string>
   <string name="double_tap_to_sleep_summary">Dobbelttapp på statuslinjen for å slå av skjermen</string>
@@ -516,7 +519,6 @@
   <string name="color_red_title">Rød</string>
   <string name="color_green_title">Grønn</string>
   <string name="color_blue_title">Blå</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Start musikk app</string>
   <string name="headset_connect_player_summary">Start standard musikk app når hodesett er tilkoblet</string>
@@ -949,4 +951,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Lader via dokk-USB</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 7acfc41..c267923 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">On-screen navigatiebalk inschakelen</string>
   <string name="disable_navkeys_summary">On-screen navigatiebalk inschakelen en hardware-knoppen uitschakelen</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dubbeltikken om te ontwaken</string>
+  <string name="double_tap_to_wake_summary">Dubbeltikken op het scherm om te ontwaken</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dubbeltikken voor slaapstand</string>
   <string name="double_tap_to_sleep_summary">Dubbeltikken op de statusbalk voor slaapstand</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Rood</string>
   <string name="color_green_title">Groen</string>
   <string name="color_blue_title">Blauw</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Muziek-app openen</string>
   <string name="headset_connect_player_summary">Standaardmuziek-app openen bij aansluiten headset</string>
@@ -989,4 +991,5 @@
   <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 41f85836..c2925a9 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ନେଭ୍‍ ବାର୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ</string>
   <string name="disable_navkeys_summary">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ନେଭ୍‍ ବାର୍‍ ସ‍କ୍ଷମ କରନ୍ତୁ ଓ ହାର୍ଡ୍‍ଓୟାର୍‍ ବଟନ୍‍ ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ଉଠାଇବା ପାଇଁ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <string name="double_tap_to_wake_summary">ଡିସ୍‍ପ୍ଲେ ଅନ୍‍ କରିବା ପାଇଁ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">ଶୋ‍ଇବା ପାଇଁ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
   <string name="double_tap_to_sleep_summary">ଡିସ୍‍ପ୍ଲେ ଅଫ୍‍ କରିବା ପାଇଁ ଷ୍ଟାଟସ୍‍ ବାର୍‍ରେ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">ଲାଲ୍</string>
   <string name="color_green_title">ସବୁଜ</string>
   <string name="color_blue_title">ନୀଳ</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଉନ୍ମୋଚନ କରନ୍ତୁ</string>
   <string name="headset_connect_player_summary">ହେଡ୍‍ସେଟ୍‍ ସଂଯୋଗ ହୋଇଥିବା ସମୟରେ ଡିଫଲ୍ଟ ମ୍ୟୁଜିକ୍‍ ଆପ୍ଲିକେସନ୍‍ ଲଞ୍ଚ କରନ୍ତୁ</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ଡକ୍‍ USBରେ ଚାର୍ଜିଂ</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 0b1d8c0..26190d7 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -512,6 +512,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Włącz ekranowy pasek nawigacji</string>
   <string name="disable_navkeys_summary">Włącz ekranowy pasek nawigacji i wyłącz przyciski sprzętowe</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Wybudzanie podwójnym dotknięciem</string>
+  <string name="double_tap_to_wake_summary">Dotknij dwukrotnie ekranu, aby włączyć podświetlenie</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dwukrotnie dotknij, aby uśpić</string>
   <string name="double_tap_to_sleep_summary">Dotknij dwukrotnie pasek stanu, aby zablokować ekran</string>
@@ -535,7 +538,6 @@
   <string name="color_red_title">Czerwony</string>
   <string name="color_green_title">Zielony</string>
   <string name="color_blue_title">Niebieski</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Uruchom aplikację muzyki</string>
   <string name="headset_connect_player_summary">Uruchom domyślną aplikację muzyki po podłączeniu słuchawek</string>
@@ -991,4 +993,7 @@
   <string name="restrict_app_cellular_summary">Uniemożliwia aplikacji na korzystanie z danych mobilnych</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Pogoda</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operatorzy sieci</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 4611b4b..1f37baf 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -257,6 +257,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Configurações de luz</string>
   <string name="led_notification_text">Luz de LED ativada nas configurações</string>
+  <string name="notification_light_no_apps_summary">Para adicionar controle por app, ative o \'%1$s\' e pressione \'\u002b\' na barra de menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuração Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -336,7 +337,7 @@
   <string name="app_ops_summaries_use_fingerprint">usar impressão digital</string>
   <string name="app_ops_summaries_use_body_sensors">usar sensores corporais</string>
   <string name="app_ops_summaries_read_cell_broadcasts">ler transmissões da rede de celular</string>
-  <string name="app_ops_summaries_mock_location">localização fictícia</string>
+  <string name="app_ops_summaries_mock_location">simular a localização</string>
   <string name="app_ops_summaries_read_external_storage">ler o armazenamento externo</string>
   <string name="app_ops_summaries_write_external_storage">escrever no armazenamento externo</string>
   <string name="app_ops_summaries_turn_screen_on">ligar a tela</string>
@@ -406,9 +407,9 @@
   <string name="app_ops_labels_use_fingerprint">Usar a impressão digital</string>
   <string name="app_ops_labels_use_body_sensors">Usar sensores corporais</string>
   <string name="app_ops_labels_read_cell_broadcasts">Ler transmissões da rede de celular</string>
-  <string name="app_ops_labels_mock_location">Localização fictícia</string>
+  <string name="app_ops_labels_mock_location">Simular a localização</string>
   <string name="app_ops_labels_read_external_storage">Ler armazenamento externo</string>
-  <string name="app_ops_labels_write_external_storage">Escrever no armazenamento externo</string>
+  <string name="app_ops_labels_write_external_storage">Gravar no armazenamento externo</string>
   <string name="app_ops_labels_turn_screen_on">Ligar a tela</string>
   <string name="app_ops_labels_get_accounts">Obter as contas</string>
   <string name="app_ops_labels_toggle_wifi">Alternar Wi-Fi</string>
@@ -513,6 +514,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ativar barra de navegação na tela</string>
   <string name="disable_navkeys_summary">Ativar barra de navegação na tela e desativar botões físicos</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Toque duplo para acordar</string>
+  <string name="double_tap_to_wake_summary">Dê um duplo toque na tela para ligá-la</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Toque duplo para dormir</string>
   <string name="double_tap_to_sleep_summary">Toque duas vezes na barra de status para desligar a tela</string>
@@ -536,7 +540,6 @@
   <string name="color_red_title">Vermelho</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Abrir aplicativo de música</string>
   <string name="headset_connect_player_summary">Abrir o aplicativo de música padrão quando os fones de ouvido forem conectados</string>
@@ -919,7 +922,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
-  <string name="zen_mode_summary_selected_callers">contatos selecionados</string>
+  <string name="zen_mode_summary_selected_callers">números selecionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensagens selecionadas</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -931,7 +934,7 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Toque SIM %d</string>
   <!-- label for application name -->
-  <string name="app_name_label_cm">App:</string>
+  <string name="app_name_label_cm">Aplicativo:</string>
   <!-- label for last time used -->
   <string name="last_time_used_label_cm">Usado pela última vez:</string>
   <!-- label for usage time -->
@@ -986,11 +989,28 @@
   <string name="battery_info_status_charging_dock_usb">Carregamento via dock USB</string>
   <string name="restrict_app_wlan_title">Impedir o uso de Wi\u2011Fi no app</string>
   <string name="restrict_app_wlan_summary">Impedir que o app use a conexão de dados de Wi\u2011Fi</string>
-  <string name="restrict_app_cellular_title">Impedir que o app o use a rede de celular</string>
-  <string name="restrict_app_cellular_summary">Impedir que este app usar a conexão de dados celular</string>
+  <string name="restrict_app_cellular_title">Impedir que o aplicativo use a rede de celular</string>
+  <string name="restrict_app_cellular_summary">Impedir que este aplicativo use a conexão de dados celular</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
-  <string name="weather_settings_title">Previsão do Tempo</string>
+  <string name="weather_settings_title">Clima</string>
   <string name="weather_settings_no_services_prompt">Não há provedor de previsão do tempo instalado</string>
   <string name="weather_settings_button">Configurações do provedor</string>
+  <string name="background_data_access">Acesso aos dados em 2º plano</string>
+  <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
+  <string name="allow_background_none">Sem acesso</string>
+  <string name="mobile_data_alert">Alerta de dados móveis</string>
+  <string name="mobile_data_alert_summary">Notificar quando o app usar uma quantidade significativa de dados</string>
+  <string name="data_usage_menu_enable_data_alerts">Ativar alertas de uso de dados</string>
+  <string name="data_usage_menu_disable_data_alerts">Desativar os alertas de uso de dados</string>
+  <string name="data_usage_menu_reset_stats">Redefinir as estatísticas de dados</string>
+  <string name="reset_data_stats_msg">Isto irá limpar todas as informações de rastreamento de dados</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restringir o acesso de dados móveis</string>
+  <string name="restrict_cellular_access_summary">Desativar o acesso de dados em redes móveis</string>
+  <string name="restrict_cellular_access_dialog_title">Restringir o acesso de dados móveis?</string>
+  <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que um app que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nVocê pode encontrar ferramentas mais apropriadas para o controle de dados nas configurações disponíveis no app.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de rede</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 60cd964..e8d80ae 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Definições de luz</string>
   <string name="led_notification_text">Luz do LED ativada pelas definições</string>
+  <string name="notification_light_no_apps_summary">Para configurar as luzes de notificação para uma aplicação específica, ative \"%1$s\" e toque em \"\u002b\" na barra de menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuração Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -468,7 +469,7 @@
   <string name="camera_launch_title">Iniciar a câmara</string>
   <string name="camera_launch_summary">Pressionar algum tempo e depois soltar iniciará a câmara</string>
   <string name="volbtn_music_controls_title">Controlo de reprodução</string>
-  <string name="volbtn_music_controls_summary">Quando o ecrã estiver desligado, manter pressionados os botões de volume irá procurar as faixas de música</string>
+  <string name="volbtn_music_controls_summary">Alternar as faixas de música ao manter os botões de volume pressionados com o ecrã desligado</string>
   <string name="volbtn_cursor_control_title">Controlo do cursor de teclado</string>
   <string name="volbtn_cursor_control_off">Desativado</string>
   <string name="volbtn_cursor_control_on">Volume para cima/baixo move o cursor para a esquerda/direita</string>
@@ -517,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ativar os botões virtuais</string>
   <string name="disable_navkeys_summary">Ativar os botões virtuais e desativar os botões físicos</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Toque duplo liga o ecrã</string>
+  <string name="double_tap_to_wake_summary">Dê um toque duplo no ecrã para ligar o dispositivo</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Toque duplo para desligar o ecrã</string>
   <string name="double_tap_to_sleep_summary">Dê um toque duplo na barra de estado para desligar o dispositivo</string>
@@ -540,7 +544,6 @@
   <string name="color_red_title">Vermelho</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Iniciar a aplicação de música</string>
   <string name="headset_connect_player_summary">Iniciar a aplicação de música predefinida quando ligar os auscultadores</string>
@@ -1006,10 +1009,11 @@
   <string name="data_usage_menu_enable_data_alerts">Ativar alertas de uso de dados</string>
   <string name="data_usage_menu_disable_data_alerts">Desativar alertas de uso de dados</string>
   <string name="data_usage_menu_reset_stats">Redefinir as estatísticas de dados</string>
-  <string name="reset_data_stats_msg">Isto irá limpar todas as informações de rastreamento de dados</string>
+  <string name="reset_data_stats_msg">Isto irá apagar todas as informações de rastreamento de dados</string>
   <string name="reset_stats_confirm">Confirmar</string>
   <string name="restrict_cellular_access_title">Restringir o acesso de dados móveis</string>
   <string name="restrict_cellular_access_summary">Desativar o acesso de dados em redes móveis</string>
   <string name="restrict_cellular_access_dialog_title">Restringir o acesso de dados móveis?</string>
   <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que uma aplicação que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nPoderá encontrar ferramentas mais apropriadas para o controlo de dados nas definições disponíveis na aplicação.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index c04384b..7995355 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -487,6 +487,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Activare bară navig pe ecran</string>
   <string name="disable_navkeys_summary">Activare bara navigare pe ecran și dezactivează butoanele hardware</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dublă-apăsare pentru trezire</string>
+  <string name="double_tap_to_wake_summary">Atingeți de două ori ecranul pentru a activa afișajul</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dublă-apăsare pentru stand-by</string>
   <string name="double_tap_to_sleep_summary">Atingeți de două ori bara de stare pentru a dezactiva afișarea</string>
@@ -510,7 +513,6 @@
   <string name="color_red_title">Roșu</string>
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Albastru</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Lansează aplicație muzică</string>
   <string name="headset_connect_player_summary">Lansează aplicația implicită de muzică când se conectează casca audio</string>
@@ -910,4 +912,5 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vremea</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 46be554..fab43ff 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -517,6 +517,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Экранные кнопки</string>
   <string name="disable_navkeys_summary">Включить экранную панель навигации и отключить аппаратные кнопки</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Включение при двойном нажатии</string>
+  <string name="double_tap_to_wake_summary">Дважды коснитесь экрана, чтобы вывести устройство из спящего режима</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Выключать экран при двойном нажатии</string>
   <string name="double_tap_to_sleep_summary">Дважды коснитесь строки состояния, чтобы перевести устройство в спящий режим</string>
@@ -540,7 +543,6 @@
   <string name="color_red_title">Красный</string>
   <string name="color_green_title">Зеленый</string>
   <string name="color_blue_title">Синий</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Автозапуск плеера</string>
   <string name="headset_connect_player_summary">Запускать плеер при подключении наушников</string>
@@ -994,4 +996,6 @@
   <string name="restrict_app_cellular_summary">Не разрешать приложению передачу данных по мобильным сетям</string>
   <string name="privacy_guard_internet_category">Интернет</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Погода</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 87c21e6..d8e869f 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -342,6 +342,8 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">තිරය මත සංචාලන තීරුව සබල කරන්න</string>
   <string name="disable_navkeys_summary">තිරය මත සංචාලන තීරුව සබල කර දෘඩාංග බොත්තම් අබල කරන්න</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ඇහැරවීමට දෙවරක් තට්ටු කරන්න</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">දෙවරක් තට්ටුකර නිදිකරවන්න</string>
   <!-- Proximity wake -->
@@ -363,7 +365,6 @@
   <string name="color_red_title">රතු</string>
   <string name="color_green_title">කොළ</string>
   <string name="color_blue_title">නිල්</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="auto_brightness_reset_button">යළි පිහිටුවන්න</string>
@@ -555,4 +556,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 4b94cc9..c39e0bf 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -453,6 +453,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Povoliť navigačný panel na obrazovke</string>
   <string name="disable_navkeys_summary">Povoliť navigačný panel na obrazovke a zakázať hardvérové tlačidlá</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Prebudiť dvojitým poklepaním</string>
+  <string name="double_tap_to_wake_summary">Zapnúť displej dvojitým poklepaním na obrazovku</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Uspať dvojitým poklepaním</string>
   <string name="double_tap_to_sleep_summary">Vypnúť displej dvojitým poklepaním na stavový riadok</string>
@@ -476,7 +479,6 @@
   <string name="color_red_title">Červená</string>
   <string name="color_green_title">Zelená</string>
   <string name="color_blue_title">Modrá</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Spustiť aplikáciu na prehrávanie hudby</string>
   <string name="headset_connect_player_summary">Spustiť predvolenú aplikáciu na prehrávanie hudby po pripojení slúchadiel</string>
@@ -874,4 +876,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index c3a7192..f2da787 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -263,6 +263,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Nastavitve lučke</string>
   <string name="led_notification_text">Lučka LED omogočena v nastavitvah</string>
+  <string name="notification_light_no_apps_summary">Za dodajanje nadzora za posamezne aplikacije omogočite \'%1$s\' in pritisnite \'\u002b\' na menijski vrstici</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Razhroščevanje Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -519,6 +520,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Omogoči vrstico za krmarjenje na zaslonu</string>
   <string name="disable_navkeys_summary">Omogoči vrstico za krmarjenje na zaslonu in onemogoči fizične gumbe</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dvakrat tapnite za bujenje</string>
+  <string name="double_tap_to_wake_summary">Dvakrat tapnite na zaslon, da ga vklopite</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dvakrat tapnite za spanje</string>
   <string name="double_tap_to_sleep_summary">Dvakrat tapnite na vrstico stanja, da izklopite zaslon</string>
@@ -542,7 +546,6 @@
   <string name="color_red_title">Rdeča</string>
   <string name="color_green_title">Zelena</string>
   <string name="color_blue_title">Modra</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Zaženi aplikacijo za glasbo</string>
   <string name="headset_connect_player_summary">Zaženi privzeto aplikacijo za glasbo, ko so priključene slušalke</string>
@@ -1001,6 +1004,7 @@
   <string name="weather_settings_title">Vreme</string>
   <string name="weather_settings_no_services_prompt">Ni nameščene storitve ponudnika vremena</string>
   <string name="weather_settings_button">Nastavitve ponudnika</string>
+  <string name="weather_settings_activity_not_found">Menija nastavitev za tega ponudnika ni mogoče zagnati</string>
   <string name="background_data_access">Dostop do podatkov v ozadju</string>
   <string name="allow_background_both">Preko mobilnih podatkov in omr. Wi\u2011Fi</string>
   <string name="allow_background_wlan">Samo preko omr. Wi\u2011Fi</string>
@@ -1016,4 +1020,6 @@
   <string name="restrict_cellular_access_summary">Onemogoči dostop do podatkov na mobilnem omrežju</string>
   <string name="restrict_cellular_access_dialog_title">Omeji dostop do mobilnih podatkov?</string>
   <string name="restrict_cellular_access_dialog_summary">Ta značilnost lahko povzroči, da aplikacija, ki je odvisna od dostopa do omrežja, preneha delovati, ko so na voljo samo mob. omrežja.\n\nPrimernejše nastavitve nadzora porabe podatkov lahko najdete v aplikaciji.</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Omrežni operaterji</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 1df7150..80c755a 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -518,6 +518,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Омогући нав. траку на екрану</string>
   <string name="disable_navkeys_summary">Омогући навигациону траку на екрану и онемогући хардверске дугмиће</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Дупли-додир за буђење</string>
+  <string name="double_tap_to_wake_summary">Двапут додирни екран да укључиш дисплеј</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Дупли-додир за спавање</string>
   <string name="double_tap_to_sleep_summary">Двапут додирни статусну траку да искључиш дисплеј</string>
@@ -541,7 +544,6 @@
   <string name="color_red_title">Црвена</string>
   <string name="color_green_title">Зелена</string>
   <string name="color_blue_title">Плава</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Покрени музичку апликацију</string>
   <string name="headset_connect_player_summary">Покрени подразумевану музичку апликацију када су слушалице повезане</string>
@@ -998,4 +1000,5 @@
   <string name="weather_settings_title">Време</string>
   <string name="weather_settings_no_services_prompt">Нема инсталираног добављача услуга временске прогнозе</string>
   <string name="weather_settings_button">Поставке добављача</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index b18f763..d60819f 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Aktivera navigeringsfält på skärmen</string>
   <string name="disable_navkeys_summary">Aktivera navigeringsfält på skärmen och inaktivera hårdvaruknappar</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Dubbeltryck för att väcka</string>
+  <string name="double_tap_to_wake_summary">Dubbeltryck på skärmen för att slå på displayen</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Dubbeltryck för att släcka</string>
   <string name="double_tap_to_sleep_summary">Dubbeltryck på statusfältet för att stänga av skärmen</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Röd</string>
   <string name="color_green_title">Grön</string>
   <string name="color_blue_title">Blå</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Öppna musikapp</string>
   <string name="headset_connect_player_summary">Öppna standardmusikapp när hörlurar kopplas in</string>
@@ -996,4 +998,9 @@ inkluderar en unik identifikation,
   <string name="restrict_app_cellular_summary">Förhindra att appen använder en mobildataanslutning</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Väder</string>
+  <string name="allow_background_wlan">Endast över Wi\u2011Fi</string>
+  <string name="allow_background_none">Ingen åtkomst</string>
+  <string name="reset_stats_confirm">Bekräfta</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 0bf68bd..3f5b7c0 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">திரை மீதான உலாவி பட்டையை செயல்படுத்துக</string>
   <string name="disable_navkeys_summary">திரை மீதான உலாவி பட்டையை செயல்படுத்தி வன்பொருள் பட்டனை முடக்குக</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">விழிப்பூட்ட இருமுறை தட்டு</string>
+  <string name="double_tap_to_wake_summary">காட்சியை ஆன் செய்ய திரையை இருமுறை தட்டுக</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">உறங்குவதற்கு இருமுறை தட்டு</string>
   <string name="double_tap_to_sleep_summary">காட்சியை ஆஃப் செய்ய நிலை பட்டை மீது இருமுறை தட்டு</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">சிவப்பு</string>
   <string name="color_green_title">பச்சை</string>
   <string name="color_blue_title">நீலம்</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">இசை ஆப்-ஐ தொடங்குக</string>
   <string name="headset_connect_player_summary">ஹெட்செட் இணைக்கப்பட்டு இருக்கும்போது இயல்நிலை இசை ஆப்-ஐ தொடங்குக</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">டாக் USB மீது சார்ஜ் செய்கிறது</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index dd5bc2a..96196b8 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ఆన్-స్క్రీన్ నావిగేషన్ బారును చేతనపరుచుము</string>
   <string name="disable_navkeys_summary">ఆన్-స్క్రీన్ నావిగేషన్ బారును చేతనపరుచుము మరియు హార్డ్ వేర్ బటనులను అచేతనం చేయుము</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">ప్రదర్శనను ప్రారంభించేందుకు తెర పైన రెండు మార్లు తట్టు</string>
+  <string name="double_tap_to_wake_summary">ప్రదర్శనను ప్రారంభించేందుకు తెర పైన రెండు మార్లు తట్టు</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">నిర్వీర్యం చేయడానికి రెండుసార్లు ట్యాప్ చేయండి</string>
   <string name="double_tap_to_sleep_summary">డిస్ప్లేను ఆపివేయడానికి స్టేటస్ బార్ పైన రెండుసార్లు ట్యాప్ చేయండి</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">ఎరుపు రంగు</string>
   <string name="color_green_title">పచ్చ రంగు</string>
   <string name="color_blue_title">నీలి రంగు</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">సంగీతాన్ని ప్రారంభించు అనువర్తనం</string>
   <string name="headset_connect_player_summary">హెడ్ సెట్ అనుసంధానించబడి ఉన్నప్పుడు స్వయంసిద్ధ సంగీతం అనువర్తనాన్ని ప్రారంభించుము</string>
@@ -986,4 +988,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">డాక్ USB పైన చార్జింగ్ అవుతుంది</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index feaf136..49cee7f 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -260,6 +260,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">ตั้งค่าความสว่าง</string>
   <string name="led_notification_text">เปิดใช้งาน LED จากการตั้งค่า</string>
+  <string name="notification_light_no_apps_summary">เพื่อเพิ่มการควบคุมแอป เปิดใช้ \'%1$s\' และกด \'\u002b\' บนแถบเมนู</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">แก้ไขข้อบกพร่องแอนดรอยด์</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -429,6 +430,7 @@
   <string name="app_ops_allowed_count">ให้อนุญาต <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">ถูกปฏิเสธ <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">ให้อนุญาต <xliff:g id="count">%1$s</xliff:g> ถูกปฏิเสธ <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">ถูกปิดเนื่องจากประสิทธิภาพของแบตเตอรี่</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">แสดงแอปของผู้ใช้</string>
   <string name="app_ops_show_system_apps">แสดงแอประบบ</string>
@@ -515,6 +517,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">เปิดใช้งานแถบนำทางบนหน้าจอ</string>
   <string name="disable_navkeys_summary">เปิดใช้งานแถบนำทางบนหน้าจอและปิดการใช้งานปุ่มฮาร์ดแวร์</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">แตะสองครั้งเพื่อเปิดจอ</string>
+  <string name="double_tap_to_wake_summary">แตะหน้าสองครั้งเพื่อเปิดหน้าจอ</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">แตะสองครั้งเพื่อปิดจอ</string>
   <string name="double_tap_to_sleep_summary">แตะสองครั้งที่แถบสถานะเพื่อปิดหน้าจอ</string>
@@ -538,7 +543,6 @@
   <string name="color_red_title">แดง</string>
   <string name="color_green_title">เขียว</string>
   <string name="color_blue_title">น้ำเงิน</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">เปิดแอปเล่นเพลง</string>
   <string name="headset_connect_player_summary">เปิดแอปเล่นเพลงค่าเริ่มต้นเมื่อมีการเชื่อมต่อจากช่องหูฟัง</string>
@@ -992,4 +996,23 @@
   <string name="restrict_app_cellular_summary">ป้องกันแอปจากการใช้การเชื่อมต่อข้อมูลทางโทรศัพท์</string>
   <string name="privacy_guard_internet_category">อินเทอร์เน็ต</string>
   <!-- Weather -->
+  <string name="weather_settings_title">สภาพอากาศ</string>
+  <string name="weather_settings_no_services_prompt">ไม่มีผู้ให้บริการข้อมูลสภาพอากาศติดตั้งอยู่</string>
+  <string name="weather_settings_button">ตั้งค่าผู้ให้บริการ</string>
+  <string name="background_data_access">เข้าถึงข้อมูลพื้นหลัง</string>
+  <string name="allow_background_both">ผ่านข้อมูลโทรศัพท์มือถือ &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">เฉพาะเมื่อใช้ Wi\u2011Fi เท่านั้น</string>
+  <string name="allow_background_none">ไม่เข้าถึง</string>
+  <string name="mobile_data_alert">แจ้งเตือนข้อมูลเครือข่าย</string>
+  <string name="mobile_data_alert_summary">แจ้งเตือนเมื่อแอปใช้ข้อมูลเครือข่ายเป็นจำนวนมาก</string>
+  <string name="data_usage_menu_enable_data_alerts">เปิดใช้งานแจ้งเตือนปริมาณข้อมูล</string>
+  <string name="data_usage_menu_disable_data_alerts">ปิดการใช้งานแจ้งเตือนปริมาณข้อมูล</string>
+  <string name="data_usage_menu_reset_stats">ล้างสถิติการใช้งานเครือข่าย</string>
+  <string name="reset_data_stats_msg">นี่จะล้างข้อมูลที่ถูกบันทึกไส้ตั้งแต่อดีตจนถึงปัจจุบัน</string>
+  <string name="reset_stats_confirm">ยืนยัน</string>
+  <string name="restrict_cellular_access_title">จำกัดการเข้าถึงข้อมูลโทรศัพท์มือถือ</string>
+  <string name="restrict_cellular_access_summary">ปิดใช้งานการเข้าถึงข้อมูลบนเครือข่ายมือถือ</string>
+  <string name="restrict_cellular_access_dialog_title">ต้องการจำกัดการเข้าถึงข้อมูลโทรศัพท์มือถือหรือไม่?</string>
+  <string name="restrict_cellular_access_dialog_summary">ความสามารถนี้อาจทำใหแอปที่ต้องใช้งานเครือข่ายหยุดทำงานเมื่อมีเพียงเครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถตั้งการควบคุมข้อมูลให้เหมาะสมได้จากการตั้งค่าผ่านแอปเหล่านั้น</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index e790c4d..84a625a 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -516,6 +516,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Ekrandaki dolaşım çubuğunu etkinleştir</string>
   <string name="disable_navkeys_summary">Ekran üstü dolaşım çubuğunu etkinleştir ve donanımsal butonları devre dışı bırak</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Uyanmak için çift dokun</string>
+  <string name="double_tap_to_wake_summary">Ekranı açmak için ekrana iki defa dokunun</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Uykuya geçmek için iki kez dokun</string>
   <string name="double_tap_to_sleep_summary">Ekranı kapatmak için durum çubuğuna iki defa dokunun</string>
@@ -539,7 +542,6 @@
   <string name="color_red_title">Kırmızı</string>
   <string name="color_green_title">Yeşil</string>
   <string name="color_blue_title">Mavi</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Müzik uygulamasını başlat</string>
   <string name="headset_connect_player_summary">Kulaklık bağlandığında müzik uygulamasını başlatır</string>
@@ -993,4 +995,5 @@
   <string name="restrict_app_cellular_summary">Uygulamanın hücresel veri bağlantısını kullanmasını engelle</string>
   <string name="privacy_guard_internet_category">İnternet</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 78fc9d3..e0d5ea7 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -515,6 +515,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">ئېكراندىكى يولباشچى بالداقنى قوزغىتىدۇ</string>
   <string name="disable_navkeys_summary">ئېكراندىكى يولباشچى بالداقنى قوزغىتىپ قاتتىق دېتال توپچىنى چەكلەيدۇ</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">قوش چېكىلسە ئويغىتىدۇ</string>
+  <string name="double_tap_to_wake_summary">ئېكران قوش چېكىلسە ئېكراننى قوزغىتىدۇ</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">قوش چېكىلسە ئۇخلىتىدۇ</string>
   <string name="double_tap_to_sleep_summary">ئېكراننى تاقاش ئۈچۈن ھالەت بالداقنى قوش چېكىڭ</string>
@@ -538,7 +541,6 @@
   <string name="color_red_title">قىزىل</string>
   <string name="color_green_title">يېشىل</string>
   <string name="color_blue_title">كۆك</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">نەغمە ئەپنى قوزغات</string>
   <string name="headset_connect_player_summary">تىڭشىغۇچ قىستۇرۇلغاندا كۆڭۈلدىكى نەغمە چالىدىغان ئەپنى قوزغىتىدۇ</string>
@@ -992,4 +994,8 @@
   <string name="restrict_app_cellular_summary">ئەپنىڭ كۆچمە تورنى ئىشلىتىپ تورغا ئۇلىنىشىدىن ساقلىنىش</string>
   <string name="privacy_guard_internet_category">ئىنتېرنېت</string>
   <!-- Weather -->
+  <string name="weather_settings_title">ھاۋارايى</string>
+  <string name="reset_stats_confirm">جەزملەش</string>
+  <string name="restrict_cellular_access_dialog_summary">كۆچمە تورغىلا باغلىنىدىغان ئەھۋالدا، بۇ ئىقتىدار تەگلىك سانلىق مەلۇماتىغا ئېھتىياجلىق پىروگراممىنىڭ خىزمەت قىلىشىنى توختىتىپ قويۇشى مۇمكىن.\n\nسىز شۇ ئەپنىڭ تەمىنلىگەن تەڭشىكىدىن سانلىق مەلۇمات ئېقىمىنى تىزگىنلەيدىغان تېخىمۇ مۇۋاپىق تاللانمىنى تاپالىشىڭىز مۇمكىن.</string>
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 6f2520b..6531d29 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -501,6 +501,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Екранні кнопки</string>
   <string name="disable_navkeys_summary">Увімкнути панель навігації і вимкнути апаратні сенсорні кнопки</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Подв. натискання прокидає</string>
+  <string name="double_tap_to_wake_summary">Двічі натиснути на екран, щоб увімкнути його</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Вимикати екран при подвійному натисканні</string>
   <string name="double_tap_to_sleep_summary">Двічі натисніть на рядок стану, аби вимкнути екран</string>
@@ -524,7 +527,6 @@
   <string name="color_red_title">Червоний</string>
   <string name="color_green_title">Зелений</string>
   <string name="color_blue_title">Синій</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Запуск програвача</string>
   <string name="headset_connect_player_summary">Запускати програвач при під’єднанні навушників</string>
@@ -922,4 +924,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Заряджаємось від док-станції по USB</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 88e3145..ac78d54 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -514,6 +514,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Kích hoạt thanh điều hướng trên màn hình</string>
   <string name="disable_navkeys_summary">Kích hoạt thanh điều hướng trên màn hình và vô hiệu hóa các phím cứng</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Chạm hai lần để bật màn hình</string>
+  <string name="double_tap_to_wake_summary">Chạm hai lần trên màn hình để bật màn hình hiển thị</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Chạm hai lần để tắt màn hình</string>
   <string name="double_tap_to_sleep_summary">Chạm hai lần vào thanh trạng thái để tắt màn hình hiển thị</string>
@@ -537,7 +540,6 @@
   <string name="color_red_title">Đỏ</string>
   <string name="color_green_title">Xanh lá</string>
   <string name="color_blue_title">Xanh dương</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Khởi động ứng dụng nghe nhạc</string>
   <string name="headset_connect_player_summary">Khởi động ứng dụng nghe nhạc mặc định khi cắm tai nghe</string>
@@ -985,4 +987,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Đang sạc qua USB của đế</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index d25ad3e..6dd6e97 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -257,6 +257,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示灯设置</string>
   <string name="led_notification_text">LED 灯被“设置”启用</string>
+  <string name="notification_light_no_apps_summary">若要添加单个应用控制，请激活“%1$s”并按下菜单栏上的“\u002b”</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android 调试</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -513,6 +514,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">启用屏幕上的导航栏</string>
   <string name="disable_navkeys_summary">启用屏幕上导航栏并禁用硬件按钮</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">双击唤醒</string>
+  <string name="double_tap_to_wake_summary">双击屏幕来开启屏幕显示</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">双击以睡眠</string>
   <string name="double_tap_to_sleep_summary">双击状态栏以关闭屏幕显示</string>
@@ -536,7 +540,6 @@
   <string name="color_red_title">红</string>
   <string name="color_green_title">绿</string>
   <string name="color_blue_title">蓝</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">启动音乐播放器</string>
   <string name="headset_connect_player_summary">插入耳机时启动默认音乐播放器</string>
@@ -1009,4 +1012,6 @@
   <string name="restrict_cellular_access_summary">禁用移动网络的数据访问</string>
   <string name="restrict_cellular_access_dialog_title">限制访问移动数据？</string>
   <string name="restrict_cellular_access_dialog_summary">此功能在仅有移动数据网络时可能会导致依赖网络访问的应用停止工作。\n\n您可以在设置中找到对于该应用更加合适的数据使用情况控制。</string>
+  <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">网络运营商</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index d765b05..6772025 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -423,6 +423,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">啟用螢幕上的導覽列</string>
   <string name="disable_navkeys_summary">啟用螢幕上的導覽列和停用硬件按鈕</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">輕按兩下來喚醒</string>
+  <string name="double_tap_to_wake_summary">按兩下螢幕來開啟顯示器</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">按兩下進入休眠</string>
   <string name="double_tap_to_sleep_summary">按兩下狀態列來關閉顯示器</string>
@@ -445,7 +448,6 @@
   <string name="color_red_title">紅色</string>
   <string name="color_green_title">綠色</string>
   <string name="color_blue_title">藍色</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">自動優先順序</string>
@@ -814,4 +816,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 6877eb2..eff4ceb 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -458,6 +458,9 @@
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">啟用螢幕上的導覽列</string>
   <string name="disable_navkeys_summary">啟用螢幕上的導航欄和停用硬件按鈕</string>
+  <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">輕按兩下即可喚醒</string>
+  <string name="double_tap_to_wake_summary">輕點螢幕兩次來喚醒手機</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">輕按兩下即可休眠</string>
   <string name="double_tap_to_sleep_summary">輕點兩次狀態欄來關閉螢幕</string>
@@ -481,7 +484,6 @@
   <string name="color_red_title">紅色</string>
   <string name="color_green_title">綠色</string>
   <string name="color_blue_title">藍色</string>
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">啟動音樂應用程式</string>
   <string name="headset_connect_player_summary">插入耳機時啟動預設音樂應用程式</string>
@@ -851,4 +853,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 786c346..262bd43 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -80,6 +80,7 @@
   <!-- Settings main menu entry -->
   <!-- Power menu -->
   <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
   <!-- tap-to-sleep -->
   <!-- Proximity wake -->
   <!-- Turn on display when power connected; turn off display when power disconnected -->
@@ -88,7 +89,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <!-- Hardware tunables - Color calibration -->
-  <!-- used if no name provided by overlay -->
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
@@ -179,4 +179,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
 </resources>
-- 
cgit v1.1


From a3a64ce79d1f7f2bb848cfa7af2260be6360ae0e Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Sun, 27 Mar 2016 22:36:58 +0200
Subject: Settings: Rework vibration intensity slider

Use as many steps as intensity levels. The preference value is still
saved as percentage to maintain backward compatibility.
Also, make percentToIntensity() actually round the given values.

Change-Id: Ib15765d7e077987c6712c59fd8eb43222ea4c878
---
 .../settings/hardware/VibratorIntensity.java       | 32 +++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index e55d456..1d934f5 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -120,7 +120,8 @@ public class VibratorIntensity extends DialogPreference implements
                 getContext().getResources().getColor(android.R.color.holo_red_light));
 
         mSeekBar.setOnSeekBarChangeListener(this);
-        mSeekBar.setProgress(intensityToPercent(mMinValue, mMaxValue, mOriginalValue));
+        mSeekBar.setMax(mMaxValue - mMinValue);
+        mSeekBar.setProgress(mOriginalValue - mMinValue);
     }
 
     @Override
@@ -134,7 +135,7 @@ public class VibratorIntensity extends DialogPreference implements
         defaultsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mSeekBar.setProgress(intensityToPercent(mMinValue, mMaxValue, mDefaultValue));
+                mSeekBar.setProgress(mDefaultValue - mMinValue);
             }
         });
     }
@@ -146,7 +147,9 @@ public class VibratorIntensity extends DialogPreference implements
         if (positiveResult) {
             // Store percent value in SharedPreferences object
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
-            prefs.edit().putInt(PREF_NAME, mSeekBar.getProgress()).commit();
+            int intensity = mSeekBar.getProgress() + mMinValue;
+            int percent = intensityToPercent(mMinValue, mMaxValue, intensity);
+            prefs.edit().putInt(PREF_NAME, percent).commit();
         } else {
             CMSettings.Secure.putInt(getContext().getContentResolver(),
                     CMSettings.Secure.VIBRATOR_INTENSITY, mOriginalValue);
@@ -161,9 +164,8 @@ public class VibratorIntensity extends DialogPreference implements
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         int min = hardware.getVibratorMinIntensity();
         int max = hardware.getVibratorMaxIntensity();
-        int defaultValue = intensityToPercent(min, max,
-                hardware.getVibratorDefaultIntensity());
-        int percent = prefs.getInt(PREF_NAME, defaultValue);
+        int defaultIntensity = hardware.getVibratorDefaultIntensity();
+        int percent = prefs.getInt(PREF_NAME, intensityToPercent(min, max, defaultIntensity));
 
         CMSettings.Secure.putInt(context.getContentResolver(),
                 CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(min, max, percent));
@@ -171,9 +173,8 @@ public class VibratorIntensity extends DialogPreference implements
 
     @Override
     public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        boolean shouldWarn =
-                mWarningValue > 0 && progress >= intensityToPercent(mMinValue, mMaxValue,
-                        mWarningValue);
+        int intensity = progress + mMinValue;
+        boolean shouldWarn = mWarningValue > 0 && intensity >= mWarningValue;
 
         if (mProgressDrawable != null) {
             mProgressDrawable.setColorFilter(shouldWarn ? mRedFilter : null);
@@ -183,9 +184,8 @@ public class VibratorIntensity extends DialogPreference implements
         }
 
         CMSettings.Secure.putInt(getContext().getContentResolver(),
-                CMSettings.Secure.VIBRATOR_INTENSITY, percentToIntensity(mMinValue, mMaxValue,
-                        progress));
-        mValue.setText(String.format("%d%%", progress));
+                CMSettings.Secure.VIBRATOR_INTENSITY, intensity);
+        mValue.setText(String.format("%d%%", intensityToPercent(mMinValue, mMaxValue, intensity)));
     }
 
     @Override
@@ -199,8 +199,8 @@ public class VibratorIntensity extends DialogPreference implements
         vib.vibrate(200);
     }
 
-    private static int intensityToPercent(double minValue, double maxValue, int value) {
-        double percent = (value - minValue) * (100 / (maxValue - minValue));
+    private static int intensityToPercent(int minValue, int maxValue, int value) {
+        int percent = Math.round((value - minValue) * (100.f / (maxValue - minValue)));
 
         if (percent > 100) {
             percent = 100;
@@ -208,11 +208,11 @@ public class VibratorIntensity extends DialogPreference implements
             percent = 0;
         }
 
-        return (int) percent;
+        return percent;
     }
 
     private static int percentToIntensity(int minValue, int maxValue, int percent) {
-        int value = Math.round((((maxValue - minValue) * percent) / 100) + minValue);
+        int value = Math.round((((maxValue - minValue) * percent) / 100.f) + minValue);
 
         if (value > maxValue) {
             value = maxValue;
-- 
cgit v1.1


From 76997a7856c5185c143088268d76bd760cf67a89 Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Tue, 29 Mar 2016 16:34:11 +0200
Subject: Settings: Save vibration intensity on close

Sometimes the vibrator intensity is not updated quickly enough for
the preview. Change the actual intensity rather than waiting for
the framework to react to the preference change to keep up with the
preview.

Change-Id: Ic345978ebd8439a991975f9d004a6fbd6c753b95
---
 src/com/android/settings/hardware/VibratorIntensity.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index 1d934f5..c17c376 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -150,6 +150,8 @@ public class VibratorIntensity extends DialogPreference implements
             int intensity = mSeekBar.getProgress() + mMinValue;
             int percent = intensityToPercent(mMinValue, mMaxValue, intensity);
             prefs.edit().putInt(PREF_NAME, percent).commit();
+            CMSettings.Secure.putInt(getContext().getContentResolver(),
+                    CMSettings.Secure.VIBRATOR_INTENSITY, intensity);
         } else {
             CMSettings.Secure.putInt(getContext().getContentResolver(),
                     CMSettings.Secure.VIBRATOR_INTENSITY, mOriginalValue);
@@ -183,8 +185,6 @@ public class VibratorIntensity extends DialogPreference implements
             mProgressThumb.setColorFilter(shouldWarn ? mRedFilter : null);
         }
 
-        CMSettings.Secure.putInt(getContext().getContentResolver(),
-                CMSettings.Secure.VIBRATOR_INTENSITY, intensity);
         mValue.setText(String.format("%d%%", intensityToPercent(mMinValue, mMaxValue, intensity)));
     }
 
@@ -195,8 +195,10 @@ public class VibratorIntensity extends DialogPreference implements
 
     @Override
     public void onStopTrackingTouch(SeekBar seekBar) {
+        mHardware.setVibratorIntensity(seekBar.getProgress() + mMinValue);
         Vibrator vib = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
         vib.vibrate(200);
+        mHardware.setVibratorIntensity(mOriginalValue);
     }
 
     private static int intensityToPercent(int minValue, int maxValue, int value) {
-- 
cgit v1.1


From 356312084396351f866973385a42ca9327ab827c Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Fri, 15 Apr 2016 10:40:45 +0200
Subject: Settings: Move ADB_ENABLED to "Global"

ADB_ENABLED is in Global now, so move it there
-> Reduces "adb_enabled has moved from x to y" messages

Change-Id: Id5a7fb1c270e95d2c24c3cd60ddca71890bda3be
---
 src/com/android/settings/DevelopmentSettings.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 10f650e..3054cec 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -845,10 +845,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         if (Integer.valueOf(newValue.toString()) < 2 && !oldValue.equals(newValue)
                 && "1".equals(SystemProperties.get("service.adb.root", "0"))) {
             SystemProperties.set("service.adb.root", "0");
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ADB_ENABLED, 0);
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ADB_ENABLED, 1);
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.ADB_ENABLED, 0);
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.ADB_ENABLED, 1);
         }
         updateRootAccessOptions();
     }
@@ -858,10 +858,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         SystemProperties.set(ROOT_ACCESS_PROPERTY, "0");
         if (!oldValue.equals("0") && "1".equals(SystemProperties.get("service.adb.root", "0"))) {
             SystemProperties.set("service.adb.root", "0");
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ADB_ENABLED, 0);
-            Settings.Secure.putInt(getActivity().getContentResolver(),
-                    Settings.Secure.ADB_ENABLED, 1);
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.ADB_ENABLED, 0);
+            Settings.Global.putInt(getActivity().getContentResolver(),
+                    Settings.Global.ADB_ENABLED, 1);
         }
         updateRootAccessOptions();
     }
-- 
cgit v1.1


From 9184afbf013ccc19fc4078726e734fec2cb50fa2 Mon Sep 17 00:00:00 2001
From: Randall Rushing <randall.rushing@gmail.com>
Date: Tue, 5 Apr 2016 11:24:26 -0500
Subject: Themes: Add tint mode so custom icons can show in power usage detail

adding to this original commit: http://review.cyanogenmod.org/#/c/136136/

Change-Id: Id38035d8eaa4c3bd004fe747a5df3899646e5cdc
Signed-off-by: Bryan Owens <djbryan3540@gmail.com>
---
 src/com/android/settings/fuelgauge/PowerUsageDetail.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/fuelgauge/PowerUsageDetail.java b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
index 26102c0..135b70e 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageDetail.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageDetail.java
@@ -29,6 +29,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.graphics.drawable.Drawable;
+import android.graphics.PorterDuff;
 import android.net.Uri;
 import android.os.BatteryStats;
 import android.os.Bundle;
@@ -479,7 +480,9 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
         if (appIcon == null) {
             appIcon = getActivity().getPackageManager().getDefaultActivityIcon();
         }
-
+        if (appIcon != null) {
+            appIcon.setTintMode(PorterDuff.Mode.SRC_ATOP);
+        }
         if (pkg == null && mPackages != null) {
             pkg = mPackages[0];
         }
-- 
cgit v1.1


From 7de366bcca504a88ac29fa3f67164224d6243634 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Fri, 22 Apr 2016 09:43:18 -0700
Subject: Settings: fix incorrect default sim/sms/data selection logic

change id I8ba32f3b203751e79697c7dcbc2cfcf1c6ae4ad0 broke this and
assumed all needed a default index of 0; set it to -1 only for the data
selection.

Ticket: CYNGNOS-2388, CYNGNOS-2212

Change-Id: Ic81d1151aa71017e261107f1d67785cc50f2bd7f
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/sim/SimDialogActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index fe6642e..84276cb 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -295,6 +295,7 @@ public class SimDialogActivity extends Activity {
                 }
             }
         } else {
+            currentIndex = -1;
             final int defaultDataSubId = SubscriptionManager.getDefaultDataSubId();
             for (int i = 0; i < selectableSubInfoLength; ++i) {
                 final SubscriptionInfo sir = subInfoList.get(i);
-- 
cgit v1.1


From e77cc0ad3be72a35fe7b66813d91353b1b90bd2e Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 25 Apr 2016 22:46:17 -0700
Subject: settings: Remove LiveDisplay preferences if not available

 * This really shouldn't be the case, but apparently some devices
   are misconfigured and are overriding the GPU-based CMHW
   implementation which would ensure the basic capabilities are
   available.

Change-Id: I9f72cb58c9bbb63e0fdec4085b17a089f9d50174
---
 src/com/android/settings/DisplaySettings.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 97353a8..ef7f9c3 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -84,6 +84,8 @@ import java.util.ArrayList;
 import java.util.List;
 import com.android.settings.Utils;
 import com.android.settings.cyanogenmod.DisplayRotation;
+
+import cyanogenmod.hardware.LiveDisplayManager;
 import cyanogenmod.providers.CMSettings;
 
 public class DisplaySettings extends SettingsPreferenceFragment implements
@@ -112,12 +114,14 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private static final String KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";
     private static final String KEY_NOTIFICATION_LIGHT = "notification_light";
     private static final String KEY_BATTERY_LIGHT = "battery_light";
+    private static final String KEY_LIVEDISPLAY = "live_display";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
     private ListPreference mLcdDensityPreference;
     private FontDialogPreference mFontSizePref;
     private PreferenceScreen mDisplayRotationPreference;
+    private PreferenceScreen mLiveDisplayPreference;
 
     private final Configuration mCurConfig = new Configuration();
 
@@ -172,6 +176,11 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
             mAccelerometer.setPersistent(false);
         }
 
+        mLiveDisplayPreference = (PreferenceScreen) findPreference(KEY_LIVEDISPLAY);
+        if (!LiveDisplayManager.getInstance(getActivity()).getConfig().isAvailable()) {
+            displayPrefs.removePreference(mLiveDisplayPreference);
+        }
+
         mScreenSaverPreference = findPreference(KEY_SCREEN_SAVER);
         if (mScreenSaverPreference != null
                 && getResources().getBoolean(
-- 
cgit v1.1


From 2bbd3ddae43eae12e2e50443312662e404363488 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Mon, 25 Apr 2016 18:26:37 -0700
Subject: Setting : Don't show search for activities not within same shared
 user id

Ticket: CYNGNOS-2522

Change-Id: I00d0a0e4d9ecc619846ce5e4e8fe8f6d7eeb4887
---
 src/com/android/settings/SettingsActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index dfef1a4..df197a5 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -41,6 +41,7 @@ import android.nfc.Tag;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
+import android.os.Process;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.Preference;
@@ -642,7 +643,7 @@ public class SettingsActivity extends Activity
                     1 /* one home activity by default */);
         } else {
             if (!mIsShowingDashboard) {
-                mDisplaySearch = true;
+                mDisplaySearch = Process.myUid() == Process.SYSTEM_UID;
                 // UP will be shown only if it is a sub settings
                 if (mIsShortcut) {
                     mDisplayHomeAsUpEnabled = isSubSettings;
-- 
cgit v1.1


From b2c27cdb839074d5ea2b73568c239543760afe5d Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 11 Apr 2016 13:07:34 +0200
Subject: Simplify and improve dream, LLS and weather provider layouts.

In particular, make sure the selection ripple extends to the edges of
the screen.

Change-Id: Ie5694dfea8fd14810895581e4e7daef15c8890c3
---
 res/layout/dream_info_row.xml                      | 101 ++++++----------
 res/layout/live_lock_screen_info_row.xml           | 101 ++++++----------
 res/layout/weather_service_provider_info_row.xml   | 131 +++++++++------------
 src/com/android/settings/DreamSettings.java        |   7 +-
 .../cyanogenmod/LiveLockScreenSettings.java        |   7 +-
 .../cyanogenmod/WeatherServiceSettings.java        |   7 +-
 6 files changed, 139 insertions(+), 215 deletions(-)

diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
index 7ed26cb..ef07c43 100644
--- a/res/layout/dream_info_row.xml
+++ b/res/layout/dream_info_row.xml
@@ -13,94 +13,69 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground" >
 
-    <!-- Dream selectable row (icon, caption, radio button) -->
+    <!-- Dream icon -->
 
-    <RelativeLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/divider"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" >
-
-        <!-- Dream icon -->
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@android:dimen/app_icon_size"
-            android:layout_height="@android:dimen/app_icon_size"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="10dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginTop="10dp"
-            android:contentDescription="@null"
-            android:maxHeight="@android:dimen/app_icon_size"
-            android:maxWidth="@android:dimen/app_icon_size"
-            android:scaleType="fitCenter" />
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter" />
 
-        <!-- Dream caption -->
+    <!-- Dream caption -->
 
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@android:id/button1"
-            android:layout_toEndOf="@android:id/icon"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textAlignment="viewStart"
-            android:labelFor="@android:id/button2" />
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
 
-        <!-- Dream radio button -->
+    <!-- Dream radio button -->
 
-        <RadioButton
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:duplicateParentState="true"
-            android:clickable="false"
-            android:focusable="false" />
-    </RelativeLayout>
+    <RadioButton
+        android:id="@+id/radio"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:duplicateParentState="true"
+        android:clickable="false"
+        android:focusable="false" />
 
     <!-- Divider -->
 
     <ImageView
-        android:id="@id/divider"
+        android:id="@+id/divider"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@android:id/button2"
         android:contentDescription="@null"
         android:src="@drawable/nav_divider" />
 
     <!-- Settings icon -->
 
     <ImageView
-        android:id="@android:id/button2"
+        android:id="@+id/settings"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@android:id/widget_frame"
-        android:layout_alignParentEnd="true"
-        android:layout_alignTop="@android:id/widget_frame"
-        android:layout_centerVertical="true"
-        android:layout_margin="0dip"
-        android:background="?android:attr/selectableItemBackground"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
         android:contentDescription="@string/screensaver_settings_button"
         android:padding="8dip"
         android:clickable="true"
         android:focusable="true"
         android:src="@drawable/ic_bt_config" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/live_lock_screen_info_row.xml b/res/layout/live_lock_screen_info_row.xml
index 181e95e..d88e297 100644
--- a/res/layout/live_lock_screen_info_row.xml
+++ b/res/layout/live_lock_screen_info_row.xml
@@ -13,94 +13,71 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!-- Live lock screen selectable row (icon, caption, radio button) -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground" >
 
-    <!-- Live lock screen selectable row (icon, caption, radio button) -->
+    <!-- Live lock screen icon -->
 
-    <RelativeLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/divider"
-        android:clickable="true"
-        android:focusable="true"
-        android:background="?android:attr/selectableItemBackground" >
-
-        <!-- Live lock screen icon -->
-
-        <ImageView
-            android:id="@android:id/icon"
-            android:layout_width="@android:dimen/app_icon_size"
-            android:layout_height="@android:dimen/app_icon_size"
-            android:layout_centerVertical="true"
-            android:layout_marginBottom="10dp"
-            android:layout_marginStart="0dp"
-            android:layout_marginEnd="6dp"
-            android:layout_marginTop="10dp"
-            android:contentDescription="@null"
-            android:maxHeight="@android:dimen/app_icon_size"
-            android:maxWidth="@android:dimen/app_icon_size"
-            android:scaleType="fitCenter" />
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter" />
 
-        <!-- Live lock screen caption -->
+    <!-- Live lock screen caption -->
 
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@android:id/button1"
-            android:layout_toEndOf="@android:id/icon"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textAlignment="viewStart"
-            android:labelFor="@android:id/button2" />
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
 
-        <!-- Live lock screen radio button -->
+    <!-- Live lock screen radio button -->
 
-        <RadioButton
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:duplicateParentState="true"
-            android:clickable="false"
-            android:focusable="false" />
-    </RelativeLayout>
+    <RadioButton
+        android:id="@+id/radio"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:duplicateParentState="true"
+        android:clickable="false"
+        android:focusable="false" />
 
     <!-- Divider -->
 
     <ImageView
-        android:id="@id/divider"
+        android:id="@+id/divider"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@android:id/button2"
         android:contentDescription="@null"
         android:src="@drawable/nav_divider" />
 
     <!-- Settings icon -->
 
     <ImageView
-        android:id="@android:id/button2"
+        android:id="@+id/settings"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@android:id/widget_frame"
-        android:layout_alignParentEnd="true"
-        android:layout_alignTop="@android:id/widget_frame"
-        android:layout_centerVertical="true"
-        android:layout_margin="0dip"
-        android:background="?android:attr/selectableItemBackground"
+        android:layout_gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/live_lock_screen_settings_button"
         android:padding="8dip"
         android:clickable="true"
         android:focusable="true"
         android:src="@drawable/ic_bt_config" />
 
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/weather_service_provider_info_row.xml b/res/layout/weather_service_provider_info_row.xml
index 36d5470..676863e 100644
--- a/res/layout/weather_service_provider_info_row.xml
+++ b/res/layout/weather_service_provider_info_row.xml
@@ -13,92 +13,67 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+    android:background="?android:attr/selectableItemBackground" >
 
-    <RelativeLayout
-            android:id="@android:id/widget_frame"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_toStartOf="@+id/divider"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="?android:attr/selectableItemBackground" >
+    <!-- Weather Provider Service icon -->
 
-        <!-- Weather Provider Service icon -->
-
-        <ImageView
-                android:id="@android:id/icon"
-                android:layout_width="@android:dimen/app_icon_size"
-                android:layout_height="@android:dimen/app_icon_size"
-                android:layout_centerVertical="true"
-                android:layout_marginBottom="10dp"
-                android:layout_marginStart="0dp"
-                android:layout_marginEnd="6dp"
-                android:layout_marginTop="10dp"
-                android:contentDescription="@null"
-                android:maxHeight="@android:dimen/app_icon_size"
-                android:maxWidth="@android:dimen/app_icon_size"
-                android:scaleType="fitCenter" />
-
-        <!-- Weather Provider Service caption -->
-
-        <TextView
-                android:id="@android:id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
-                android:layout_toStartOf="@android:id/button1"
-                android:layout_toEndOf="@android:id/icon"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:textAlignment="viewStart"
-                android:labelFor="@android:id/button2" />
-
-        <!-- Weather Provider Service radio button -->
-
-        <RadioButton
-                android:id="@android:id/button1"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_alignParentEnd="true"
-                android:layout_centerVertical="true"
-                android:duplicateParentState="true"
-                android:clickable="false"
-                android:focusable="false" />
-
-    </RelativeLayout>
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="@android:dimen/app_icon_size"
+        android:layout_height="@android:dimen/app_icon_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="6dp"
+        android:contentDescription="@null"
+        android:scaleType="fitCenter" />
+
+    <!-- Weather Provider Service caption -->
+
+    <TextView
+        android:id="@android:id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:layout_gravity="center_vertical"
+        android:ellipsize="end"
+        android:singleLine="true"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textAlignment="viewStart" />
+
+    <!-- Weather Provider Service radio button -->
+
+    <RadioButton
+        android:id="@+id/radio"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:duplicateParentState="true"
+        android:clickable="false"
+        android:focusable="false" />
 
     <!-- Divider -->
 
     <ImageView
-            android:id="@id/divider"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@android:id/button2"
-            android:contentDescription="@null"
-            android:src="@drawable/nav_divider" />
+        android:id="@+id/divider"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:contentDescription="@null"
+        android:src="@drawable/nav_divider" />
 
     <ImageView
-            android:id="@android:id/button2"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignBottom="@android:id/widget_frame"
-            android:layout_alignParentEnd="true"
-            android:layout_alignTop="@android:id/widget_frame"
-            android:layout_centerVertical="true"
-            android:layout_margin="0dip"
-            android:background="?android:attr/selectableItemBackground"
-            android:contentDescription="@string/weather_settings_button"
-            android:padding="8dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:src="@drawable/ic_bt_config" />
-
-
-</RelativeLayout>
+        android:id="@+id/settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:background="?android:attr/selectableItemBackgroundBorderless"
+        android:contentDescription="@string/weather_settings_button"
+        android:padding="8dip"
+        android:clickable="true"
+        android:focusable="true"
+        android:src="@drawable/ic_bt_config" />
+
+</LinearLayout>
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 8137cd4..8431721 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -307,7 +307,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements
             ((TextView) row.findViewById(android.R.id.title)).setText(dreamInfo.caption);
 
             // bind radio button
-            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+            RadioButton radioButton = (RadioButton) row.findViewById(R.id.radio);
             radioButton.setChecked(dreamInfo.isActive);
             radioButton.setOnTouchListener(new OnTouchListener() {
                 @Override
@@ -321,7 +321,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements
             View settingsDivider = row.findViewById(R.id.divider);
             settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
 
-            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            ImageView settingsButton = (ImageView) row.findViewById(R.id.settings);
             settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
             settingsButton.setAlpha(dreamInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
             settingsButton.setEnabled(dreamInfo.isActive);
@@ -337,8 +337,7 @@ public class DreamSettings extends SettingsPreferenceFragment implements
 
         private View createDreamInfoRow(ViewGroup parent) {
             final View row =  mInflater.inflate(R.layout.dream_info_row, parent, false);
-            final View header = row.findViewById(android.R.id.widget_frame);
-            header.setOnClickListener(new OnClickListener(){
+            row.setOnClickListener(new OnClickListener(){
                 @Override
                 public void onClick(View v) {
                     v.setPressed(true);
diff --git a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
index 800e59c..17be5cd 100644
--- a/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
+++ b/src/com/android/settings/cyanogenmod/LiveLockScreenSettings.java
@@ -215,7 +215,7 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement
             ((TextView) row.findViewById(android.R.id.title)).setText(liveLockScreenInfo.caption);
 
             // bind radio button
-            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+            RadioButton radioButton = (RadioButton) row.findViewById(R.id.radio);
             radioButton.setChecked(liveLockScreenInfo.isActive);
             radioButton.setOnTouchListener(new OnTouchListener() {
                 @Override
@@ -229,7 +229,7 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement
             View settingsDivider = row.findViewById(R.id.divider);
             settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
 
-            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            ImageView settingsButton = (ImageView) row.findViewById(R.id.settings);
             settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
             settingsButton.setAlpha(liveLockScreenInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
             settingsButton.setEnabled(liveLockScreenInfo.isActive);
@@ -246,8 +246,7 @@ public class LiveLockScreenSettings extends SettingsPreferenceFragment implement
 
         private View createLiveLockScreenInfoRow(ViewGroup parent) {
             final View row =  mInflater.inflate(R.layout.live_lock_screen_info_row, parent, false);
-            final View header = row.findViewById(android.R.id.widget_frame);
-            header.setOnClickListener(new OnClickListener(){
+            row.setOnClickListener(new OnClickListener(){
                 @Override
                 public void onClick(View v) {
                     v.setPressed(true);
diff --git a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
index 0fae5fd..55c0991 100644
--- a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
+++ b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
@@ -268,7 +268,7 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
 
             ((TextView) row.findViewById(android.R.id.title)).setText(info.caption);
 
-            RadioButton radioButton = (RadioButton) row.findViewById(android.R.id.button1);
+            RadioButton radioButton = (RadioButton) row.findViewById(R.id.radio);
             radioButton.setChecked(info.isActive);
             radioButton.setOnTouchListener(new View.OnTouchListener() {
                 @Override
@@ -281,7 +281,7 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
             boolean showSettings = info.settingsComponentName != null;
             View settingsDivider = row.findViewById(R.id.divider);
             settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            ImageView settingsButton = (ImageView) row.findViewById(android.R.id.button2);
+            ImageView settingsButton = (ImageView) row.findViewById(R.id.settings);
             settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
             settingsButton.setAlpha(info.isActive ? 1f : Utils.DISABLED_ALPHA);
             settingsButton.setEnabled(info.isActive);
@@ -320,8 +320,7 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
         private View buildRow(ViewGroup parent) {
             final View row =  mInflater.inflate(R.layout.weather_service_provider_info_row,
                     parent, false);
-            final View header = row.findViewById(android.R.id.widget_frame);
-            header.setOnClickListener(new View.OnClickListener(){
+            row.setOnClickListener(new View.OnClickListener(){
                 @Override
                 public void onClick(View v) {
                     v.setPressed(true);
-- 
cgit v1.1


From 08147933e211b727c5d3dda3222f20bb7f70f429 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Tue, 26 Apr 2016 15:53:43 -0700
Subject: Settings: restore proper live display color profile

Select currently selected, not default, profile.

Ticket: CYNGNOS-2575

Change-Id: I8db23feefd88776949fe0af356b320b8b4a7b8cb
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/livedisplay/LiveDisplay.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index 5cb7aff..f4214b9 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -232,7 +232,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             return false;
         }
 
-        final DisplayMode cur = mHardware.getDefaultDisplayMode();
+        final DisplayMode cur = mHardware.getCurrentDisplayMode() != null
+                ? mHardware.getCurrentDisplayMode() : mHardware.getDefaultDisplayMode();
         int curId = -1;
         String[] entries = new String[modes.length];
         String[] values = new String[modes.length];
@@ -252,7 +253,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             mColorProfileSummaries[i] = summary;
 
             if (cur != null && modes[i].id == cur.id) {
-                curId = -1;
+                curId = cur.id;
             }
         }
         mColorProfile.setEntries(entries);
@@ -270,7 +271,8 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         }
 
         if (value == null) {
-            DisplayMode cur = mHardware.getDefaultDisplayMode();
+            DisplayMode cur = mHardware.getCurrentDisplayMode() != null
+                    ? mHardware.getCurrentDisplayMode() : mHardware.getDefaultDisplayMode();
             if (cur != null && cur.id >= 0) {
                 value = String.valueOf(cur.id);
             }
-- 
cgit v1.1


From 73a08eeac4b7b925511a1dfa0ca798b4aca827d9 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Fri, 29 Apr 2016 00:45:13 +0300
Subject: Automatic translation import

Change-Id: Ibcb688db7bff937cd92b2a0be1a784830b2e3dc7
---
 res/values-bg/cm_strings.xml     |  3 ++-
 res/values-ca/cm_strings.xml     |  3 ++-
 res/values-cs/cm_strings.xml     |  2 ++
 res/values-de/cm_strings.xml     | 10 ++++++++++
 res/values-eu-rES/cm_strings.xml |  1 +
 res/values-hr/cm_strings.xml     |  2 ++
 res/values-iw/cm_strings.xml     |  1 +
 res/values-pl/cm_strings.xml     | 12 ++++++++++++
 res/values-pt-rBR/cm_strings.xml |  1 +
 res/values-pt-rPT/cm_strings.xml |  4 +++-
 res/values-sr/cm_strings.xml     | 18 ++++++++++++++++++
 res/values-th/cm_strings.xml     |  2 ++
 res/values-zh-rCN/cm_strings.xml |  1 +
 13 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index fb403c6..a7c1456 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -678,7 +678,7 @@
   <string name="status_bar_title">Лента на състоянието</string>
   <string name="status_bar_toggle_brightness">Контрол на яркостта</string>
   <string name="status_bar_toggle_brightness_summary">Настройване на яркостта чрез плъзгане в лентата на състоянието</string>
-  <string name="status_bar_notif_count_title">Покажи броя на известията</string>
+  <string name="status_bar_notif_count_title">Показване броя на известията</string>
   <string name="status_bar_notif_count_summary">Показва броя на новите известия</string>
   <string name="status_bar_quick_qs_pulldown_title">Бързи настройки</string>
   <string name="status_bar_quick_qs_pulldown_summary">Дръпнете %1$s лентата на състоянието за бързи настройки</string>
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_title">Прогноза за времето</string>
   <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
   <string name="weather_settings_button">Настройки на доставчика</string>
+  <string name="weather_settings_activity_not_found">Неуспешно стартиране на меню \"Настройки\" на този доставчик</string>
   <string name="background_data_access">Достъп до данни на заден план</string>
   <string name="allow_background_both">Надвишени мобилни данни &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Само над Wi\u2011Fi</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 463d972..d5a814e 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -519,7 +519,7 @@
   <string name="disable_navkeys_title">Habilita bar nav en pantalla</string>
   <string name="disable_navkeys_summary">Habilita la barra de navegació en pantalla y deshabilitar els botons físics</string>
   <!-- tap-to-wake -->
-  <string name="double_tap_to_wake_title">Pica doblement per encendre</string>
+  <string name="double_tap_to_wake_title">Pica dues vegades per encendre</string>
   <string name="double_tap_to_wake_summary">Pica dues vegades a la pantalla per encendre la pantalla</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Pica dues vegades per posar en repòs</string>
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_title">El temps</string>
   <string name="weather_settings_no_services_prompt">No hi ha cap servei de proveïdor de temps instal·lat</string>
   <string name="weather_settings_button">Configuració del proveïdor</string>
+  <string name="weather_settings_activity_not_found">No s\'ha pogut iniciar el menú de configuració d\'aquest proveïdor</string>
   <string name="background_data_access">Accés a les dades en segon pla</string>
   <string name="allow_background_both">Sobre dades mòbils &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Només sobre Wi\u2011Fi</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index d2d87c0..213e0f1 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_title">Počasí</string>
   <string name="weather_settings_no_services_prompt">Nejsou nainstalovány žádné služby poskytovatele počasí</string>
   <string name="weather_settings_button">Nastavení poskytovatele</string>
+  <string name="weather_settings_activity_not_found">Nelze spustit nastavení tohoto poskytovatele</string>
   <string name="background_data_access">Přístup k datům na pozadí</string>
   <string name="allow_background_both">Přes mobilní data a Wi\u2011Fi</string>
   <string name="allow_background_wlan">Pouze přes Wi\u2011Fi</string>
@@ -1016,4 +1017,5 @@
   <string name="restrict_cellular_access_dialog_title">Omezit přístup k mobilním datům?</string>
   <string name="restrict_cellular_access_dialog_summary">Tato vlastnost může způsobit zastavení funkčnosti některých aplikací, které jsou závislé na přístupu k datům a zařízení je právě připojeno pouze k mobilní datové síti.\n\nVhodnějsí omezení využití dat je možné nalézt v ovládání používání datových sítí v nastavení aplikace.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Síťový poskytovatelé</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 0a480fe..600b613 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1000,12 +1000,22 @@
   <string name="weather_settings_title">Wetter</string>
   <string name="weather_settings_no_services_prompt">Keine Wetteranbieterdienste installiert</string>
   <string name="weather_settings_button">Anbieter-Einstellungen</string>
+  <string name="weather_settings_activity_not_found">Das Einstellungsmenü dieses Anbieters konnten nicht gestartet werden</string>
   <string name="background_data_access">Hintergrunddaten-Zugriff</string>
   <string name="allow_background_both">Über Mobilfunk &amp; WLAN</string>
   <string name="allow_background_wlan">Nur über WLAN</string>
   <string name="allow_background_none">Kein Zugriff</string>
+  <string name="mobile_data_alert">Mobilfunkdaten-Warnung</string>
   <string name="mobile_data_alert_summary">Benachrichtigen, wenn die Anwendung eine erhebliche Menge an Daten verbraucht</string>
+  <string name="data_usage_menu_enable_data_alerts">Datenverbrauchswarnungen aktivieren</string>
+  <string name="data_usage_menu_disable_data_alerts">Datenverbrauchswarnungen deaktivieren</string>
+  <string name="data_usage_menu_reset_stats">Zähler zurücksetzen</string>
   <string name="reset_data_stats_msg">Diese Aktion löscht alle vergangenen und die aktuellen Datenverbrauchs-Statistiken.</string>
   <string name="reset_stats_confirm">Bestätigen</string>
+  <string name="restrict_cellular_access_title">Mobilfunk-Datenzugriff beschränken</string>
+  <string name="restrict_cellular_access_summary">Datenzugriff aus Mobilfunknetzen deaktivieren</string>
+  <string name="restrict_cellular_access_dialog_title">Mobilfunk-Datenzugriff beschränken?</string>
+  <string name="restrict_cellular_access_dialog_summary">Diese Funktion kann verursachen, dass eine App, die Netzzugang benötigt, nicht mehr funktioniert, wenn nur das Mobilfunknetz zur Verfügung steht.\n\nPassendere Einstellungen können Sie in den app-eigenen Einstellungen finden.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Netzbetreiber</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index d72e7c2..5b95b5b 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_title">Eguraldia</string>
   <string name="weather_settings_no_services_prompt">Ez da eguraldi hornitzailerik instalatu</string>
   <string name="weather_settings_button">Hornitzailearen ezarpenak</string>
+  <string name="weather_settings_activity_not_found">Ezin izan da hornitzaile honen ezarpen menua abiatu</string>
   <string name="background_data_access">Bigarren planoko datuetara sarbidea</string>
   <string name="allow_background_both">Datu mugikorrak eta Wi\u2011Fi bidez</string>
   <string name="allow_background_wlan">Wi\u2011Fi bidez besterik ez</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 02b80a8..62be801 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1001,6 +1001,7 @@
   <string name="weather_settings_title">Vrijeme</string>
   <string name="weather_settings_no_services_prompt">Nema instaliranih usluga davatelja vremenske prognoze</string>
   <string name="weather_settings_button">Postavke davatelja</string>
+  <string name="weather_settings_activity_not_found">Nije moguće otvoriti izbornik postavki ovog davatelja usluga</string>
   <string name="background_data_access">Pristup pozadinskim podacima</string>
   <string name="allow_background_both">Preko mobilnih mreža i Wi-Fi-ja</string>
   <string name="allow_background_wlan">Samo preko Wi-Fi-ja</string>
@@ -1017,4 +1018,5 @@
   <string name="restrict_cellular_access_dialog_title">Ograničiti pristup mobilnim podacima?</string>
   <string name="restrict_cellular_access_dialog_summary">Ova značajka može uzrokovati da aplikacija koja je ovisna o pristupu mreži prestane raditi kada je samo mobilna veza dostupna.\n\nPrimjerenije postavke kontrole potrošnje podataka možete naći u aplikaciji.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Mrežni operateri</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 760d7ba..b8a6b21 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1016,4 +1016,5 @@
   <string name="restrict_cellular_access_dialog_title">להגביל גישה לנתונים סלולריים?</string>
   <string name="restrict_cellular_access_dialog_summary">תכונה זו עלולה לגרום להפסקת פעולתו של יישום התלוי בגישה לרשת כאשר קיימת זמינות לרשתות סלולריות בלבד.\n\nתוכל למצוא פקדים מתאימים יותר לשימוש בנתונים, בהגדרות הזמינות בתוך היישום.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">ספקי סלולר</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 26190d7..ea57c8a 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -426,6 +426,7 @@
   <string name="app_ops_allowed_count">Zezwolono <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Odrzucono <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Zezwolono <xliff:g id="count">%1$s</xliff:g>, odrzucono <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Wyłączone przez optymalizację baterii</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Pokaż aplikacje użytkownika</string>
   <string name="app_ops_show_system_apps">Pokaż wbudowane aplikacje</string>
@@ -994,6 +995,17 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Pogoda</string>
+  <string name="weather_settings_no_services_prompt">Nie zainstalowano usług dostawcy pogody</string>
+  <string name="weather_settings_button">Ustawienia dostawcy</string>
+  <string name="background_data_access">Dostęp do danych w tle</string>
+  <string name="allow_background_both">Dane mobilne &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Tylko przez Wi\u2011Fi</string>
+  <string name="allow_background_none">Brak dostępu</string>
+  <string name="data_usage_menu_reset_stats">Resetuj statystyki danych</string>
+  <string name="reset_data_stats_msg">Spowoduje to skasowanie przeszłych i aktualnych informacji o użyciu danych</string>
+  <string name="reset_stats_confirm">Potwierdź</string>
+  <string name="restrict_cellular_access_title">Ogranicz dostęp do danych mobilnych</string>
+  <string name="restrict_cellular_access_dialog_title">Ograniczyć dostęp do danych mobilnych?</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 1f37baf..46d241b 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -996,6 +996,7 @@
   <string name="weather_settings_title">Clima</string>
   <string name="weather_settings_no_services_prompt">Não há provedor de previsão do tempo instalado</string>
   <string name="weather_settings_button">Configurações do provedor</string>
+  <string name="weather_settings_activity_not_found">Não foi possível iniciar o menu de configurações deste provedor</string>
   <string name="background_data_access">Acesso aos dados em 2º plano</string>
   <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
   <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index e8d80ae..2e31be1 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -80,7 +80,7 @@
   <string name="profile_write_success">A etiqueta foi escrita com sucesso</string>
   <string name="profile_write_failed">Ocorreu um problema ao escrever na etiqueta!</string>
   <string name="profile_selected">Perfil selecionado: %1$s</string>
-  <string name="profile_nfc_text">Escrever um perfil numa etiqueta NFC permite que, com um toque na etiqueta, selecione esse perfil. Tocar uma segunda vez selecionará o perfil anteriormente ativado.</string>
+  <string name="profile_nfc_text">Escrever um perfil numa etiqueta NFC permite que, com um toque na etiqueta, selecione esse perfil. Tocar uma segunda vez selecionará o perfil anteriormente ativo.</string>
   <string name="profile_unknown_nfc_tag">Perfil desconhecido</string>
   <string name="profile_add_nfc_text">Esta etiqueta NFC refere-se a um perfil desconhecido. Anexar esta etiqueta NFC num perfil existente permitirá selecionar o perfil no futuro.</string>
   <string name="profile_select">Selecionar perfil</string>
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_title">Meteorologia</string>
   <string name="weather_settings_no_services_prompt">Não há serviços de provedor de meteorologia instalados</string>
   <string name="weather_settings_button">Definições do provedor</string>
+  <string name="weather_settings_activity_not_found">Não é possível iniciar o menu de definições deste provedor</string>
   <string name="background_data_access">Acesso aos dados em 2º plano</string>
   <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
   <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
@@ -1016,4 +1017,5 @@
   <string name="restrict_cellular_access_dialog_title">Restringir o acesso de dados móveis?</string>
   <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que uma aplicação que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nPoderá encontrar ferramentas mais apropriadas para o controlo de dados nas definições disponíveis na aplicação.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de rede</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 80c755a..9400252 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -262,6 +262,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Поставке светла</string>
   <string name="led_notification_text">LED светло омогућено помоћу поставки</string>
+  <string name="notification_light_no_apps_summary">Да додаш контролу по апликацији, активирај \'%1$s\' и притисни \'\u002b\' на траци са менијима</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android отклањање грешака</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -1000,5 +1001,22 @@
   <string name="weather_settings_title">Време</string>
   <string name="weather_settings_no_services_prompt">Нема инсталираног добављача услуга временске прогнозе</string>
   <string name="weather_settings_button">Поставке добављача</string>
+  <string name="weather_settings_activity_not_found">Није могуће покренути подешавање менија овог добављача</string>
+  <string name="background_data_access">Приступ подацима у позадини</string>
+  <string name="allow_background_both">Преко мрежних података &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Само преко Wi\u2011Fi</string>
+  <string name="allow_background_none">Нема приступа</string>
+  <string name="mobile_data_alert">Упозорење мрежних података</string>
+  <string name="mobile_data_alert_summary">Упозори када апликација користи значајну количину података</string>
+  <string name="data_usage_menu_enable_data_alerts">Омогући упозорење за коришћење података</string>
+  <string name="data_usage_menu_disable_data_alerts">Онемогући упозорење за податке</string>
+  <string name="data_usage_menu_reset_stats">Ресетуј статистику података</string>
+  <string name="reset_data_stats_msg">Ово ће обрисати све прошле и садашње информације о праћењу података</string>
+  <string name="reset_stats_confirm">Потврди</string>
+  <string name="restrict_cellular_access_title">Ограничи приступ мрежним подацима</string>
+  <string name="restrict_cellular_access_summary">Онемогући приступ подацима на мобилним мрежама</string>
+  <string name="restrict_cellular_access_dialog_title">Ограничи приступ мрежним подацима?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ова функција може узроковати да апликација која зависи од мрежног приступа престане радити када су само мобилне мрежа доступне.\n\nМожеш наћи више одговарајућих контрола у подешавању апликације.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Оператор мреже</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 49cee7f..0d0eef1 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -999,6 +999,7 @@
   <string name="weather_settings_title">สภาพอากาศ</string>
   <string name="weather_settings_no_services_prompt">ไม่มีผู้ให้บริการข้อมูลสภาพอากาศติดตั้งอยู่</string>
   <string name="weather_settings_button">ตั้งค่าผู้ให้บริการ</string>
+  <string name="weather_settings_activity_not_found">ไม่สามารถเปิดการตั้งค่าของผู้ให้บริการนี้ได้</string>
   <string name="background_data_access">เข้าถึงข้อมูลพื้นหลัง</string>
   <string name="allow_background_both">ผ่านข้อมูลโทรศัพท์มือถือ &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">เฉพาะเมื่อใช้ Wi\u2011Fi เท่านั้น</string>
@@ -1015,4 +1016,5 @@
   <string name="restrict_cellular_access_dialog_title">ต้องการจำกัดการเข้าถึงข้อมูลโทรศัพท์มือถือหรือไม่?</string>
   <string name="restrict_cellular_access_dialog_summary">ความสามารถนี้อาจทำใหแอปที่ต้องใช้งานเครือข่ายหยุดทำงานเมื่อมีเพียงเครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถตั้งการควบคุมข้อมูลให้เหมาะสมได้จากการตั้งค่าผ่านแอปเหล่านั้น</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">ผู้ให้บริการเครือข่าย</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 6dd6e97..b3ea4c8 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -997,6 +997,7 @@
   <string name="weather_settings_title">天气</string>
   <string name="weather_settings_no_services_prompt">没有安装天气提供商服务</string>
   <string name="weather_settings_button">提供商设置</string>
+  <string name="weather_settings_activity_not_found">无法为此提供商启动设置菜单</string>
   <string name="background_data_access">后台数据访问</string>
   <string name="allow_background_both">仅通过移动数据 &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">仅通过 Wi\u2011Fi</string>
-- 
cgit v1.1


From 72a512203dce93cc3a610f88fd71535fbaafea31 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Thu, 28 Apr 2016 13:33:51 -0700
Subject: Settings: Ensure user has to wait 30 before retrying pattern

Issue-id: FEIJ-257, FEIJ-273

Change-Id: I08f16c6863ca5bbdb586d756da813453124851b2
---
 .../settings/applications/LockPatternActivity.java | 48 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/applications/LockPatternActivity.java b/src/com/android/settings/applications/LockPatternActivity.java
index 9ab51b5..561041d 100644
--- a/src/com/android/settings/applications/LockPatternActivity.java
+++ b/src/com/android/settings/applications/LockPatternActivity.java
@@ -46,9 +46,12 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     public static final String PATTERN_LOCK_PROTECTED_APPS = "pattern_lock_protected_apps";
     public static final String RECREATE_PATTERN = "recreate_pattern_lock";
 
+    private static String TIMEOUT_PREF_KEY = "retry_timeout";
+
     private static final int MIN_PATTERN_SIZE = 4;
     private static final int MAX_PATTERN_RETRY = 5;
     private static final int PATTERN_CLEAR_TIMEOUT_MS = 2000;
+    private static final long FAILED_ATTEMPT_RETRY = 30;
 
     private static final int MENU_RESET = 0;
 
@@ -68,6 +71,7 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     boolean mRetryPattern = true;
     boolean mConfirming = false;
     boolean mFingerPrintSetUp = false;
+    boolean mRetryLocked = false;
 
     private FingerprintManager mFingerprintManager;
     private FingerprintUiHelper mFingerPrintUiHelper;
@@ -137,14 +141,16 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         menu.clear();
-        if (!mCreate) {
-            menu.add(0, MENU_RESET, 0, R.string.lockpattern_reset_button)
-                    .setIcon(R.drawable.ic_lockscreen_ime_white)
-                    .setAlphabeticShortcut('r')
-                    .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
-                            MenuItem.SHOW_AS_ACTION_WITH_TEXT);
-            mItem = menu.findItem(0);
+        menu.add(0, MENU_RESET, 0, R.string.lockpattern_reset_button)
+                .setIcon(R.drawable.ic_lockscreen_ime_white)
+                .setAlphabeticShortcut('r')
+                .setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM |
+                        MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        mItem = menu.findItem(0);
+        if (mRetryLocked) {
+            mItem.setIcon(R.drawable.ic_settings_lockscreen_white);
         }
+
         return true;
     }
 
@@ -173,6 +179,9 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     }
 
     private void switchToPattern(boolean reset) {
+        if (isRetryLocked()) {
+            return;
+        }
         if (reset) {
             resetPatternState(false);
         }
@@ -188,7 +197,9 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     private void switchToAccount() {
         mPatternLockHeader.setText(getResources()
                 .getString(R.string.lockpattern_settings_reset_summary));
-        mItem.setIcon(R.drawable.ic_settings_lockscreen_white);
+        if (mItem != null) {
+            mItem.setIcon(R.drawable.ic_settings_lockscreen_white);
+        }
         mAccountView.setVisibility(View.VISIBLE);
         mLockPatternView.setVisibility(View.GONE);
     }
@@ -340,10 +351,12 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
                     mLockPatternView.postDelayed(mCancelPatternRunnable, PATTERN_CLEAR_TIMEOUT_MS);
 
                     if (mRetry >= MAX_PATTERN_RETRY) {
+                        setPatternTimeout();
                         mLockPatternView.removeCallbacks(mCancelPatternRunnable);
                         Toast.makeText(getApplicationContext(),
                                 getResources().getString(
-                                        R.string.lockpattern_too_many_failed_confirmation_attempts),
+                                        R.string.lockpattern_too_many_failed_confirmation_attempts,
+                                        FAILED_ATTEMPT_RETRY),
                                 Toast.LENGTH_SHORT).show();
                         switchToAccount();
                     }
@@ -396,5 +409,22 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
             mPatternLockHeader.setText(getString(R.string.pa_pattern_or_fingerprint_header));
             mFingerPrintUiHelper.startListening();
         }
+        if (isRetryLocked()) {
+            invalidateOptionsMenu();
+            switchToAccount();
+        }
+    }
+
+    private boolean isRetryLocked() {
+        long time = System.currentTimeMillis();
+        SharedPreferences prefs = getSharedPreferences(getPackageName(), MODE_PRIVATE);
+        long retryTime = prefs.getLong(TIMEOUT_PREF_KEY, 0);
+        mRetryLocked = (time - retryTime) < (FAILED_ATTEMPT_RETRY * 1000);
+        return mRetryLocked;
+    }
+
+    private void setPatternTimeout() {
+        SharedPreferences prefs = getSharedPreferences(getPackageName(), MODE_PRIVATE);
+        prefs.edit().putLong(TIMEOUT_PREF_KEY, System.currentTimeMillis()).apply();
     }
 }
-- 
cgit v1.1


From 6f12b368dca8fa42cc22a5fbda254f577499c1a7 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 25 Apr 2016 12:00:02 -0700
Subject: Settings: refresh ui on foce stop/diable

Fixes the storage summary not updating after force closing, enabling,
or disabling the app.

Ticket: CYNGNOS-2527

Change-Id: I000459d27d06071a36ab0ac6761c1af56c132dde
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../android/settings/applications/InstalledAppDetails.java   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 4d29c73..f2e6392 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -709,6 +709,10 @@ public class InstalledAppDetails extends AppInfoBase
     }
 
     private void checkForceStop() {
+        if (getActivity() == null || getActivity().isFinishing()) {
+            return;
+        }
+
         if (mDpm.packageHasActiveAdmins(mPackageInfo.packageName)) {
             // User can't force stop device admin.
             updateForceStopButton(false);
@@ -984,6 +988,13 @@ public class InstalledAppDetails extends AppInfoBase
             mPm.setApplicationEnabledSetting(mInfo.packageName, mState, 0);
             return null;
         }
+
+        @Override
+        protected void onPostExecute(Object o) {
+            if (mActivity.get() !=  null) {
+                mActivity.get().refreshUi();
+            }
+        }
     }
 
     private final LoaderCallbacks<ChartData> mDataCallbacks = new LoaderCallbacks<ChartData>() {
@@ -1009,6 +1020,7 @@ public class InstalledAppDetails extends AppInfoBase
         @Override
         public void onReceive(Context context, Intent intent) {
             updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
+            refreshUi();
         }
     };
 
-- 
cgit v1.1


From deed3e81fc5c94a19cf090b7c98a59d5583a91c8 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 25 Apr 2016 15:12:43 -0700
Subject: Settings: fix backlight illumination wrong summary

This fixes the visual indicator of the button illumination summary after
trying to disable. Previously after setting the timeout to never, would
display a summary of "1", or with 5, it would end up displaying 6 after
applying the settings.

Ticket: CYNGNOS-2565

Change-Id: Ia982e4849d0099b6e208b362770a431dc89dd2f1
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../cyanogenmod/BacklightTimeoutSeekBar.java        | 21 ---------------------
 .../cyanogenmod/ButtonBacklightBrightness.java      |  2 +-
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java b/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
index 66a6d3f..66f1fdd 100644
--- a/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
+++ b/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
@@ -60,27 +60,6 @@ public class BacklightTimeoutSeekBar extends SeekBar {
     }
 
     @Override
-    public void setProgress(int progress) {
-        if (progress == 0) {
-            progress = getMax();
-        } else {
-            progress--;
-        }
-        super.setProgress(progress);
-    }
-
-    @Override
-    public int getProgress() {
-        int progress = super.getProgress();
-        if (mUpdatingThumb) {
-            return progress;
-        } else if (progress == getMax()) {
-            return 0;
-        }
-        return progress + 1;
-    }
-
-    @Override
     protected int updateTouchProgress(int lastProgress, int newProgress) {
         if (newProgress < mMax) {
             return newProgress;
diff --git a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
index a15a55c..7c63f34 100644
--- a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
+++ b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
@@ -252,7 +252,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
             if (buttonBrightness == 0) {
                 setSummary(R.string.backlight_summary_disabled);
             } else if (timeout == 0) {
-                setSummary(R.string.backlight_summary_enabled);
+                setSummary(R.string.backlight_timeout_unlimited);
             } else {
                 setSummary(getContext().getString(R.string.backlight_summary_enabled_with_timeout,
                         getTimeoutString(timeout)));
-- 
cgit v1.1


From 2794f4fe351fd96ce04b6d8ce4854a3362ac88ef Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Tue, 3 May 2016 13:54:42 -0700
Subject: Settings: Make sure to rebuild on app entries loaded.

  Previously, notifydatasetchanged would only be called in oncreate,
  and any further callbacks from the application state session would
  be ignored. Now, make sure to handle the various scenarios and rebuild
  as necessary, notifying the ui as needed.

Change-Id: I61572ff082629046d1fdf5fedb1e8ec37343f588
TICKET: FEIJ-334
---
 .../settings/applications/ExpandedDesktopPreferenceFragment.java   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
index af8bf10..4f4f234 100644
--- a/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
+++ b/src/com/android/settings/applications/ExpandedDesktopPreferenceFragment.java
@@ -106,8 +106,6 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
         }
         mAllPackagesAdapter = new AllPackagesAdapter(getActivity());
 
-        mAllPackagesAdapter.notifyDataSetChanged();
-
         setHasOptionsMenu(true);
     }
 
@@ -260,7 +258,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
 
     @Override
     public void onRebuildComplete(ArrayList<ApplicationsState.AppEntry> entries) {
-        handleAppEntries(entries);
+        rebuild();
     }
 
     @Override
@@ -282,7 +280,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
 
     @Override
     public void onLoadEntriesCompleted() {
-
+        rebuild();
     }
 
     private void handleAppEntries(List<ApplicationsState.AppEntry> entries) {
@@ -335,6 +333,7 @@ public class ExpandedDesktopPreferenceFragment extends SettingsPreferenceFragmen
                 mActivityFilter, ApplicationsState.ALPHA_COMPARATOR);
         if (newEntries != null) {
             handleAppEntries(newEntries);
+            mAllPackagesAdapter.notifyDataSetChanged();
         }
     }
 
-- 
cgit v1.1


From eb59535455a63ac697acbe94e7a7c8d3befdb6f2 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 3 May 2016 08:29:28 -0700
Subject: LLS: Load title and summary from ext. package if avail.

Query for packages that support the
ACTION_OPEN_LIVE_LOCK_SCREEN_SETTINGS and load the title and summary
for the preference from that package.

If no other packages exist or we are unable to load the title AND
summary, then we use the defaults and carry on as usual.

Change-Id: Ibbd5347aa35994877fa067b29cacbe9a9ed12dad
TICKET: CYNGNOS-2696
---
 src/com/android/settings/SecuritySettings.java | 43 ++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 2652e8c..cc46ba7 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -356,8 +356,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 Preference liveLockPreference = new Preference(getContext(), null);
                 liveLockPreference.setIntent(new Intent(ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS));
                 liveLockPreference.setOrder(-1);
-                liveLockPreference.setTitle(R.string.live_lock_screen_title);
-                liveLockPreference.setSummary(R.string.live_lock_screen_summary);
+                setLiveLockScreenPreferenceTitleAndSummary(liveLockPreference);
                 groupToAddTo.addPreference(liveLockPreference);
             }
         }
@@ -873,6 +872,46 @@ public class SecuritySettings extends SettingsPreferenceFragment
     }
 
     /**
+     * Loads the title and summary for live lock screen preference.  If an external package supports
+     * the {@link cyanogenmod.content.Intent#ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS} we attempt to
+     * load the title and summary from that package and use defaults if those cannot be loaded or
+     * no other package is found to support the action.
+     * @param pref
+     */
+    private void setLiveLockScreenPreferenceTitleAndSummary(Preference pref) {
+        String title = getString(R.string.live_lock_screen_title);
+        String summary = getString(R.string.live_lock_screen_summary);
+        PackageManager pm = getPackageManager();
+        List<ResolveInfo> infos = pm.queryIntentActivities(
+                new Intent(ACTION_OPEN_LIVE_LOCKSCREEN_SETTINGS), 0);
+        if (infos != null && infos.size() > 1) {
+            for (ResolveInfo info : infos) {
+                if (!getActivity().getPackageName().equals(info.activityInfo.packageName)) {
+                    try {
+                        final Context ctx = getActivity().createPackageContext(
+                                info.activityInfo.packageName, 0);
+                        final Resources res = ctx.getResources();
+                        int titleId = res.getIdentifier("live_lock_screen_title", "string",
+                                info.activityInfo.packageName);
+                        int summaryId = res.getIdentifier("live_lock_screen_summary", "string",
+                                info.activityInfo.packageName);
+                        if (titleId !=0 && summaryId != 0) {
+                            title = res.getString(titleId);
+                            summary = res.getString(summaryId);
+                        }
+                    } catch (PackageManager.NameNotFoundException e) {
+                        /* ignore and use defaults */
+                    }
+                    break;
+                }
+            }
+        }
+
+        pref.setTitle(title);
+        pref.setSummary(summary);
+    }
+
+    /**
      * For Search. Please keep it in sync when updating "createPreferenceHierarchy()"
      */
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
-- 
cgit v1.1


From bdc83b4a556e5b74e6f6d3160e01adf45c29b877 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Tue, 1 Sep 2015 15:25:01 -0700
Subject: LockPatternView: persist state across rotates

We need to persist and restore the activity states across rotates so the
user doesn't have to restart from the beginning.

Ref: CYNGNOS-141

Change-Id: I18458d55748666b439cf7b6fcecd81ee5c4c7865
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../settings/applications/LockPatternActivity.java | 38 +++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/LockPatternActivity.java b/src/com/android/settings/applications/LockPatternActivity.java
index 561041d..05d30ec 100644
--- a/src/com/android/settings/applications/LockPatternActivity.java
+++ b/src/com/android/settings/applications/LockPatternActivity.java
@@ -46,6 +46,14 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     public static final String PATTERN_LOCK_PROTECTED_APPS = "pattern_lock_protected_apps";
     public static final String RECREATE_PATTERN = "recreate_pattern_lock";
 
+    private static final String STATE_IS_ACCOUNT_VIEW = "isAccountView";
+    private static final String STATE_CONTINUE_ENABLED = "continueEnabled";
+    private static final String STATE_CONFIRMING = "confirming";
+    private static final String STATE_RETRY_PATTERN = "retrypattern";
+    private static final String STATE_RETRY = "retry";
+    private static final String STATE_PATTERN_HASH = "pattern_hash";
+    private static final String STATE_CREATE = "create";
+
     private static String TIMEOUT_PREF_KEY = "retry_timeout";
 
     private static final int MIN_PATTERN_SIZE = 4;
@@ -155,6 +163,35 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
     }
 
     @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putBoolean(STATE_IS_ACCOUNT_VIEW, mAccountView.getVisibility() == View.VISIBLE);
+        outState.putBoolean(STATE_CONTINUE_ENABLED, mContinue.isEnabled());
+        outState.putBoolean(STATE_CONFIRMING, mConfirming);
+        outState.putBoolean(STATE_RETRY_PATTERN, mRetryPattern);
+        outState.putInt(STATE_RETRY, mRetry);
+        outState.putByteArray(STATE_PATTERN_HASH, mPatternHash);
+        outState.putBoolean(STATE_CREATE, mCreate);
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Bundle savedInstanceState) {
+        super.onRestoreInstanceState(savedInstanceState);
+        if (savedInstanceState.getBoolean(STATE_IS_ACCOUNT_VIEW)) {
+            switchToAccount();
+        } else {
+            switchToPattern(false);
+            mPatternHash = savedInstanceState.getByteArray(STATE_PATTERN_HASH);
+            mConfirming = savedInstanceState.getBoolean(STATE_CONFIRMING);
+            mRetryPattern = savedInstanceState.getBoolean(STATE_RETRY_PATTERN);
+            mRetry = savedInstanceState.getInt(STATE_RETRY);
+            mCreate = savedInstanceState.getBoolean(STATE_CREATE);
+            mContinue.setEnabled(savedInstanceState.getBoolean(STATE_CONTINUE_ENABLED,
+                    mContinue.isEnabled()));
+        }
+    }
+
+    @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case MENU_RESET:
@@ -224,7 +261,6 @@ public class LockPatternActivity extends Activity implements OnNotifyAccountRese
         resetPatternState(false);
 
         //Setup Pattern Lock View
-        mLockPatternView.setSaveEnabled(false);
         mLockPatternView.setFocusable(false);
         mLockPatternView.setOnPatternListener(new UnlockPatternListener());
 
-- 
cgit v1.1


From 6f391f8c134cf79cbd1c7e90e501715935c36a0f Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Tue, 3 May 2016 15:37:46 -0700
Subject: Protected apps: fix rotation states

Don't try to relaunch the activity if it's already been launched.

Ticket: FEIJ-224

Change-Id: I597417570f2f937afb0195fecd7dc406ff2508f3
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 .../applications/ProtectedAppsActivity.java         | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/applications/ProtectedAppsActivity.java b/src/com/android/settings/applications/ProtectedAppsActivity.java
index a1c6cd5..5089f19 100644
--- a/src/com/android/settings/applications/ProtectedAppsActivity.java
+++ b/src/com/android/settings/applications/ProtectedAppsActivity.java
@@ -56,6 +56,7 @@ public class ProtectedAppsActivity extends Activity {
     private static final int REQ_RESET_PATTERN = 2;
 
     private static final String NEEDS_UNLOCK = "needs_unlock";
+    private static final String TARGET_INTENT = "target_intent";
 
     private ListView mListView;
 
@@ -100,16 +101,17 @@ public class ProtectedAppsActivity extends Activity {
 
         if (savedInstanceState != null) {
             mUserIsAuth = savedInstanceState.getBoolean(NEEDS_UNLOCK);
-        }
-
-        if (!mUserIsAuth) {
-            // Require unlock
-            Intent lockPattern = new Intent(this, LockPatternActivity.class);
-            startActivityForResult(lockPattern, REQ_ENTER_PATTERN);
+            mTargetIntent = savedInstanceState.getParcelable(TARGET_INTENT);
         } else {
-            //LAUNCH
-            if (mTargetIntent != null) {
-                launchTargetActivityInfoAndFinish();
+            if (!mUserIsAuth) {
+                // Require unlock
+                Intent lockPattern = new Intent(this, LockPatternActivity.class);
+                startActivityForResult(lockPattern, REQ_ENTER_PATTERN);
+            } else {
+                //LAUNCH
+                if (mTargetIntent != null) {
+                    launchTargetActivityInfoAndFinish();
+                }
             }
         }
     }
@@ -118,6 +120,7 @@ public class ProtectedAppsActivity extends Activity {
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putBoolean(NEEDS_UNLOCK, mUserIsAuth);
+        outState.putParcelable(TARGET_INTENT, mTargetIntent);
     }
 
     @Override
-- 
cgit v1.1


From 9984dc1bf13aa721e45c2f1d1cadf75d1e871ea7 Mon Sep 17 00:00:00 2001
From: Sam Mortimer <sam@mortimer.me.uk>
Date: Sun, 1 May 2016 11:11:45 -0700
Subject: Partial revert "Settings : Add per app internet/data control"

This reverts commit a3549a2715e47ce07297315586ea9c5798da2997

Revert changes only to:
src/com/android/settings/privacyguard/PrivacyGuardManager.java
src/com/android/settings/privacyguard/AppInfoLoader.java

We currently have inconsistent behaviour where:

*) if pg is on by default, a newly installed app will not
   have restricted network access

*) if the pg state for an app is toggled off/on it will end
   up with restricted network access

Newly installed apps where pg is on should result in the
same end state compared to flipping pg guard off/on per app.

This partial revert stops the data control setting changing
when pg state is changed on a specific app.

Change-Id: I1eba14204abe0d137ebd45c5a6a3b7db354339bb
---
 .../android/settings/privacyguard/AppInfoLoader.java |  3 ---
 .../settings/privacyguard/PrivacyGuardManager.java   | 20 --------------------
 2 files changed, 23 deletions(-)

diff --git a/src/com/android/settings/privacyguard/AppInfoLoader.java b/src/com/android/settings/privacyguard/AppInfoLoader.java
index 520bd20..6efd7a5 100644
--- a/src/com/android/settings/privacyguard/AppInfoLoader.java
+++ b/src/com/android/settings/privacyguard/AppInfoLoader.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.privacyguard;
 
-import android.Manifest;
 import android.app.AppOpsManager;
 import android.content.AsyncTaskLoader;
 import android.content.Context;
@@ -105,8 +104,6 @@ import java.util.List;
             app.uid = info.applicationInfo.uid;
             app.privacyGuardEnabled = mAppOps.getPrivacyGuardSettingForPackage(
                     app.uid, app.packageName);
-            app.hasInternetPermission = mPm.checkPermission(Manifest.permission.INTERNET,
-                    app.packageName) == PackageManager.PERMISSION_GRANTED;
             apps.add(app);
         }
 
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
index 4cc8214..adbe8cc 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
@@ -16,10 +16,7 @@
 
 package com.android.settings.privacyguard;
 
-import android.Manifest;
 import android.app.FragmentTransaction;
-import android.content.pm.PackageManager;
-import android.net.NetworkPolicyManager;
 import android.view.animation.AnimationUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -90,7 +87,6 @@ public class PrivacyGuardManager extends Fragment
 
     // Privacy Guard Fragment
     private final static String PRIVACY_GUARD_FRAGMENT_TAG = "privacy_guard_fragment";
-    private NetworkPolicyManager mPolicyManager;
 
     // holder for package data passed into the adapter
     public static final class AppInfo {
@@ -99,13 +95,6 @@ public class PrivacyGuardManager extends Fragment
         boolean enabled;
         boolean privacyGuardEnabled;
         int uid;
-        boolean hasInternetPermission;
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        mPolicyManager = NetworkPolicyManager.from(getActivity());
     }
 
     @Override
@@ -291,15 +280,6 @@ public class PrivacyGuardManager extends Fragment
         app.privacyGuardEnabled = !app.privacyGuardEnabled;
         mAppOps.setPrivacyGuardSettingForPackage(app.uid, app.packageName, app.privacyGuardEnabled);
 
-        if (app.hasInternetPermission) {
-            if (app.privacyGuardEnabled) {
-                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
-                mPolicyManager.addUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
-            } else {
-                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_DATA);
-                mPolicyManager.removeUidPolicy(app.uid, NetworkPolicyManager.POLICY_REJECT_ON_WLAN);
-            }
-        }
         mAdapter.notifyDataSetChanged();
     }
 
-- 
cgit v1.1


From f252c25166ab1585a2628ddbb962f0603165e5f4 Mon Sep 17 00:00:00 2001
From: Ankit Gupta <agupta@cyngn.com>
Date: Tue, 3 May 2016 13:41:41 -0700
Subject: Settings: sync qs invert color with color inversion in Settings

Color inversion in settings is not consistent with the quick
settings tiles for the inverted color.
This patch registers the invert color settings variable to
content resolver to apply any change to it from either
qs tiles or settings menu.

Change-Id: Ib1433238d4985e930f3a1c650198dbeb05ccba52
Issue-id: FEIJ-164
---
 src/com/android/settings/accessibility/AccessibilitySettings.java   | 2 +-
 src/com/android/settings/accessibility/SettingsContentObserver.java | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 27f6768..1dd5508 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -160,7 +160,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                 @Override
                 public void onChange(boolean selfChange, Uri uri) {
                     loadInstalledServices();
-                    updateServicesPreferences();
+                    updateAllPreferences();
                 }
             };
 
diff --git a/src/com/android/settings/accessibility/SettingsContentObserver.java b/src/com/android/settings/accessibility/SettingsContentObserver.java
index c3baec5..383f54c 100644
--- a/src/com/android/settings/accessibility/SettingsContentObserver.java
+++ b/src/com/android/settings/accessibility/SettingsContentObserver.java
@@ -32,6 +32,8 @@ abstract class SettingsContentObserver extends ContentObserver {
                 Settings.Secure.ACCESSIBILITY_ENABLED), false, this);
         contentResolver.registerContentObserver(Settings.Secure.getUriFor(
                 Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES), false, this);
+        contentResolver.registerContentObserver(Settings.Secure.getUriFor(
+                Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED), false, this);
     }
 
     public void unregister(ContentResolver contentResolver) {
-- 
cgit v1.1


From 0ccd34c3688740f7bb89a8e08eeb540bb2023cd4 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Wed, 4 May 2016 19:10:11 -0700
Subject: WifiSettings : Fix forgetting saved networks crash after rotation

FEIJ-310

Change-Id: If6e3e28025ae4eba0bf20d53c68b7d840f76ce6c
---
 .../settings/wifi/SavedAccessPointsWifiSettings.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
index a3140a1..e7166da 100644
--- a/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
+++ b/src/com/android/settings/wifi/SavedAccessPointsWifiSettings.java
@@ -177,6 +177,8 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment
             if (savedInstanceState.containsKey(SAVE_DIALOG_ACCESS_POINT_STATE)) {
                 mAccessPointSavedState =
                     savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
+                mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
+                mSelectedAccessPoint = mDlgAccessPoint;
             }
             mPrioritiesOrderChanged = savedInstanceState.getBoolean(
                     PRIORITIES_ORDER_CHANGED_STATE, false);
@@ -270,8 +272,13 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment
 
         final int accessPointsSize = accessPoints.size();
         for (int i = 0; i < accessPointsSize; ++i){
-            AccessPointPreference preference = new AccessPointPreference(accessPoints.get(i),
+            AccessPoint accessPoint = accessPoints.get(i);
+            AccessPointPreference preference = new AccessPointPreference(accessPoint,
                     context, mUserBadgeCache, true, true);
+            if (mSelectedAccessPoint != null &&
+                    mSelectedAccessPoint.getNetworkId() == accessPoint.getNetworkId()) {
+                mSelectedAccessPoint = accessPoint;
+            }
             preference.setOrder(i);
             preferenceScreen.addPreference(preference);
         }
@@ -297,11 +304,6 @@ public class SavedAccessPointsWifiSettings extends RestrictedSettingsFragment
     public Dialog onCreateDialog(int dialogId) {
         switch (dialogId) {
             case WifiSettings.WIFI_DIALOG_ID:
-                if (mDlgAccessPoint == null) { // For re-launch from saved state
-                    mDlgAccessPoint = new AccessPoint(getActivity(), mAccessPointSavedState);
-                    // Reset the saved access point data
-                    mAccessPointSavedState = null;
-                }
                 mSelectedAccessPoint = mDlgAccessPoint;
 
                 // Hide forget button if config editing is locked down
-- 
cgit v1.1


From 23b30aaefcf611e0c5e1915437b48589da724866 Mon Sep 17 00:00:00 2001
From: Dave Kover <kover@cyngn.com>
Date: Wed, 4 May 2016 17:25:21 -0700
Subject: Update power control widget preview image.

The image was not reflective of the current design of the widget.

Change-Id: Ia3fe45337359edbb0c469ff2e1d2fd1f1351b8f0
Ticket: FEIJ-305
---
 res/drawable-nodpi/preview.png | Bin 9173 -> 20623 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/res/drawable-nodpi/preview.png b/res/drawable-nodpi/preview.png
index 0ffb700..bf36c71 100644
Binary files a/res/drawable-nodpi/preview.png and b/res/drawable-nodpi/preview.png differ
-- 
cgit v1.1


From 215d44020f4a6449260ebbab55feb3462f2416a6 Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Tue, 26 Apr 2016 22:42:21 -0700
Subject: Add option to select temperature unit

Added a menu in the weather settings to select the
temperature unit. This setting will be visible only
if the user has at least one weather service provider
installed.

The weather settings layout was refactored to make room
for this new preference

Change-Id: I5e9f206573e0ff95fcee31a010b52530a907acc6
TICKET: CYNGNOS-2605
---
 res/layout/empty_weather_state.xml                 |  16 +-
 res/layout/weather_service_provider_info_row.xml   |   1 +
 res/values/cm_arrays.xml                           |  11 +
 res/values/cm_strings.xml                          |   9 +
 res/xml/weather_settings.xml                       |  40 +++
 .../cyanogenmod/WeatherServiceSettings.java        | 362 ++++++++++++++-------
 6 files changed, 308 insertions(+), 131 deletions(-)
 create mode 100644 res/xml/weather_settings.xml

diff --git a/res/layout/empty_weather_state.xml b/res/layout/empty_weather_state.xml
index 09c3794..7ae635a 100644
--- a/res/layout/empty_weather_state.xml
+++ b/res/layout/empty_weather_state.xml
@@ -32,16 +32,22 @@
                 android:layout_marginBottom="12dip"
                 android:src="@drawable/ic_settings_weather"
                 android:tint="@color/weather_settings_icon_tint"
-                android:contentDescription="@null">
-        </ImageView>
-
+                android:contentDescription="@null" />
         <TextView
                 android:id="@+id/message"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textSize="18dp"
-                android:textColor="?android:attr/textColorSecondary">
-        </TextView>
+                android:textColor="?android:attr/textColorSecondary" />
 
+        <Button android:id="@+id/add_weather_provider"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:gravity="center"
+                style="?android:attr/buttonBarButtonStyle"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:text="@string/weather_settings_add_weather_provider"
+                android:textAllCaps="true" />
     </LinearLayout>
 </FrameLayout>
diff --git a/res/layout/weather_service_provider_info_row.xml b/res/layout/weather_service_provider_info_row.xml
index 676863e..ddaa820 100644
--- a/res/layout/weather_service_provider_info_row.xml
+++ b/res/layout/weather_service_provider_info_row.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
      Copyright (C) 2016 The CyanogenMod Project
 
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 09fd23e..c1aa849 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -592,4 +592,15 @@
         <item>No access</item>
     </string-array>
 
+    <!-- Weather temperature -->
+    <string-array name="weather_temp_unit_entries" translatable="false">
+        <item>@string/weather_settings_temp_celsius</item>
+        <item>@string/weather_settings_temp_fahrenheit</item>
+    </string-array>
+
+    <string-array name="weather_temp_unit_values" translatable="false">
+        <item>1</item>
+        <item>2</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 128660e..1c61579 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1167,6 +1167,15 @@
     <string name="weather_settings_no_services_prompt">No weather provider services installed</string>
     <string name="weather_settings_button">Provider settings</string>
     <string name="weather_settings_activity_not_found">Unable to launch the settings menu of this provider</string>
+    <string name="weather_settings_add_weather_provider">Add weather provider</string>
+    <string name="weather_settings_play_store_market_url" translatable="false">market://search?q=cyanogenmodweatherprovider&amp;c=apps</string>
+    <string name="weather_settings_play_store_http_url" translatable="false">http://play.google.com/store/search?q=cyanogenmodweatherprovider&amp;c=apps</string>
+    <string name="weather_settings_general_settings_title">General</string>
+    <string name="weather_settings_providers_title">Providers</string>
+    <string name="weather_settings_temp_units_title">Temperature unit</string>
+    <string name="weather_settings_temp_celsius">Celsius</string>
+    <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+    <string name="weather_settings_keyword">weather</string>
 
     <string name="background_data_access">Background data access</string>
     <string name="allow_background_both">Over cellular data &amp; Wi\u2011Fi</string>
diff --git a/res/xml/weather_settings.xml b/res/xml/weather_settings.xml
new file mode 100644
index 0000000..17df51a
--- /dev/null
+++ b/res/xml/weather_settings.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 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.
+-->
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:title="@string/weather_settings_general_settings_title"
+                  settings:keywords="@string/weather_settings_keyword">
+    <PreferenceCategory
+            android:key="weather_general_settings"
+            android:title="@string/weather_settings_general_settings_title"
+            android:order="0">
+        <ListPreference
+                android:key="weather_temperature_unit"
+                android:entries="@array/weather_temp_unit_entries"
+                android:entryValues="@array/weather_temp_unit_values"
+                android:title="@string/weather_settings_temp_units_title"
+                android:summary="%s"
+                android:persistent="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="weather_service_providers"
+        android:title="@string/weather_settings_providers_title"
+        android:order="1">
+
+    </PreferenceCategory>
+</PreferenceScreen>
diff --git a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
index 55c0991..903af8b 100644
--- a/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
+++ b/src/com/android/settings/cyanogenmod/WeatherServiceSettings.java
@@ -27,19 +27,21 @@ import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.content.res.XmlResourceParser;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.UserHandle;
+import android.preference.ListPreference;
+import android.preference.Preference;
+import android.preference.PreferenceCategory;
+import android.preference.PreferenceScreen;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.Xml;
-import android.view.Gravity;
-import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ImageView;
+import android.widget.Button;
 import android.widget.ListView;
 import android.widget.RadioButton;
 import android.widget.TextView;
@@ -50,23 +52,34 @@ import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.Utils;
 import cyanogenmod.providers.CMSettings;
+import cyanogenmod.providers.WeatherContract;
+import cyanogenmod.weather.CMWeatherManager;
 import cyanogenmod.weatherservice.WeatherProviderService;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 
-import static org.cyanogenmod.internal.logging.CMMetricsLogger.WEATHER_SETTINGS;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
-public class WeatherServiceSettings extends SettingsPreferenceFragment {
+import static org.cyanogenmod.internal.logging.CMMetricsLogger.WEATHER_SETTINGS;
+
+public class WeatherServiceSettings extends SettingsPreferenceFragment
+        implements Preference.OnPreferenceChangeListener {
 
     private Context mContext;
-    private WeatherProviderServiceInfoAdapter mAdapter;
     private Handler mHandler;
     private static final String TAG = WeatherServiceSettings.class.getSimpleName();
 
+    private static final String PREFERENCE_GENERAL = "weather_general_settings";
+    private static final String PREFERENCE_PROVIDERS = "weather_service_providers";
+    private static final String PREFERENCE_TEMP_UNIT = "weather_temperature_unit";
+
+    private PreferenceCategory mGeneralSettingsCategory;
+    private PreferenceCategory mProvidersCategory;
+    private ListPreference mTemperatureUnit;
+
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
@@ -75,6 +88,18 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
     }
 
     @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        addPreferencesFromResource(R.xml.weather_settings);
+
+        final PreferenceScreen ps = getPreferenceScreen();
+        mGeneralSettingsCategory = (PreferenceCategory) ps.findPreference(PREFERENCE_GENERAL);
+        mProvidersCategory = (PreferenceCategory) ps.findPreference(PREFERENCE_PROVIDERS);
+        mTemperatureUnit = (ListPreference) ps.findPreference(PREFERENCE_TEMP_UNIT);
+        mTemperatureUnit.setOnPreferenceChangeListener(this);
+    }
+
+    @Override
     protected int getMetricsCategory() {
         return WEATHER_SETTINGS;
     }
@@ -84,6 +109,8 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
         super.onResume();
         updateAdapter();
         registerPackageMonitor();
+
+        mTemperatureUnit.setValue(String.valueOf(getSelectedTemperatureUnit(mContext)));
     }
 
     @Override
@@ -92,11 +119,33 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
         unregisterPackageMonitor();
     }
 
+    @Override
+    public boolean onPreferenceChange(Preference preference, Object newValue) {
+        if (preference == mTemperatureUnit) {
+            CMSettings.Global.putInt(mContext.getContentResolver(),
+                    CMSettings.Global.WEATHER_TEMPERATURE_UNIT,
+                    Integer.valueOf((String) newValue));
+        }
+        return true;
+    }
+
     private void registerPackageMonitor() {
         mPackageMonitor.register(mContext, BackgroundThread.getHandler().getLooper(),
                 UserHandle.ALL, true);
     }
 
+    private void launchGetWeatherProviders() {
+        try {
+            startActivity(new Intent(Intent.ACTION_VIEW,
+                    Uri.parse(getString(R.string.weather_settings_play_store_market_url)))
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        } catch (ActivityNotFoundException e) {
+            startActivity(new Intent(Intent.ACTION_VIEW,
+                    Uri.parse(getString(R.string.weather_settings_play_store_http_url)))
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+        }
+    }
+
     private void unregisterPackageMonitor() {
         mPackageMonitor.unregister();
     }
@@ -154,11 +203,177 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
 
             weatherProviderServiceInfos.add(serviceInfo);
         }
-        mAdapter.clear();
-        mAdapter.addAll(weatherProviderServiceInfos);
+
+        final PreferenceScreen ps = getPreferenceScreen();
+        if (!weatherProviderServiceInfos.isEmpty()) {
+            if (ps.findPreference(PREFERENCE_GENERAL) == null) {
+                ps.addPreference(mGeneralSettingsCategory);
+            }
+            if (ps.findPreference(PREFERENCE_PROVIDERS) == null) {
+                ps.addPreference(mProvidersCategory);
+            }
+
+            mProvidersCategory.removeAll();
+            for (WeatherProviderServiceInfo info : weatherProviderServiceInfos) {
+                mProvidersCategory.addPreference(new WeatherProviderPreference(mContext, info));
+            }
+
+            Preference addServicePreference = new Preference(mContext);
+            addServicePreference.setTitle(R.string.weather_settings_add_weather_provider);
+            addServicePreference.setIcon(R.drawable.ic_add);
+            addServicePreference.setOnPreferenceClickListener(
+                    new Preference.OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    launchGetWeatherProviders();
+                    return false;
+                }
+            });
+            mProvidersCategory.addPreference(addServicePreference);
+
+        } else {
+            ps.removePreference(mGeneralSettingsCategory);
+            ps.removePreference(mProvidersCategory);
+        }
 
     }
 
+    /**
+     * Gets the currently selected temperature unit.
+     * If none is selected yet, returns a unit appropriate for the current locale
+     */
+    public static int getSelectedTemperatureUnit(Context context) {
+        int tempUnit = CMSettings.Global.getInt(context.getContentResolver(),
+                CMSettings.Global.WEATHER_TEMPERATURE_UNIT, -1);
+        if (tempUnit != -1) {
+            return tempUnit;
+        }
+
+        Locale locale = context.getResources().getConfiguration().locale;
+        boolean useFahrenheit = locale.equals(Locale.US)
+                || locale.toString().equals("ms_MY") // Malaysia
+                || locale.toString().equals("si_LK"); // Sri Lanka
+        return useFahrenheit
+                ? WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT
+                : WeatherContract.WeatherColumns.TempUnit.CELSIUS;
+    }
+
+    private static class WeatherProviderPreference extends Preference
+            implements View.OnClickListener {
+        private WeatherProviderServiceInfo mInfo;
+        private View mView;
+        private RadioButton mRadioButton;
+        private View mSettingsButton;
+        private Context mContext;
+
+        public WeatherProviderPreference(Context context, WeatherProviderServiceInfo info) {
+            super(context);
+            mInfo = info;
+            mContext = context;
+
+            setLayoutResource(R.layout.weather_service_provider_info_row);
+            setTitle(mInfo.caption);
+            setIcon(mInfo.icon);
+        }
+
+        @Override
+        protected void onBindView(final View view) {
+            super.onBindView(view);
+            mView = view;
+            mView.setOnClickListener(this);
+
+            mRadioButton = (RadioButton) view.findViewById(R.id.radio);
+            mRadioButton.setChecked(mInfo.isActive);
+            mRadioButton.setOnTouchListener(new View.OnTouchListener() {
+                @Override
+                public boolean onTouch(View v, MotionEvent event) {
+                    view.onTouchEvent(event);
+                    return false;
+                }
+            });
+
+            boolean showSettings = mInfo.settingsComponentName != null;
+            View settingsDivider = view.findViewById(R.id.divider);
+            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+
+            mSettingsButton = view.findViewById(R.id.settings);
+            mSettingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
+            mSettingsButton.setAlpha(mInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
+            mSettingsButton.setEnabled(mInfo.isActive);
+            mSettingsButton.setFocusable(mInfo.isActive);
+            mSettingsButton.setOnClickListener(this);
+        }
+
+        @Override
+        public void onClick(View v) {
+            if (v == mView) {
+                v.setPressed(true);
+                setActiveWeatherProviderService();
+            }
+            launchSettingsActivity(mInfo);
+        }
+
+        private boolean isActiveProvider() {
+            return mInfo.isActive;
+        }
+
+        public void setActiveState(boolean active) {
+            mInfo.isActive = active;
+            mRadioButton.setChecked(active);
+
+            boolean hasSettings = mInfo.settingsComponentName != null;
+            if (hasSettings) {
+                mSettingsButton.setAlpha(mInfo.isActive ? 1f : Utils.DISABLED_ALPHA);
+                mSettingsButton.setEnabled(mInfo.isActive);
+                mSettingsButton.setFocusable(mInfo.isActive);
+            }
+        }
+
+        private void launchSettingsActivity(WeatherProviderServiceInfo info) {
+            if (info != null && info.settingsComponentName != null) {
+                try {
+                    mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
+                } catch (ActivityNotFoundException e) {
+                    Toast.makeText(mContext,
+                            R.string.weather_settings_activity_not_found,
+                            Toast.LENGTH_LONG)
+                            .show();
+                    Log.w(TAG, info.settingsComponentName + " not found");
+                }
+            }
+        }
+
+        private void setActiveWeatherProviderService() {
+            if (!mInfo.isActive) {
+                markAsActiveProvider();
+                CMSettings.Secure.putString(mContext.getContentResolver(),
+                        CMSettings.Secure.WEATHER_PROVIDER_SERVICE,
+                        mInfo.componentName.flattenToString());
+            }
+        }
+
+        private void markAsActiveProvider() {
+            // Check for current active provider
+            PreferenceCategory providersCategory = (PreferenceCategory) findPreferenceInHierarchy(
+                    WeatherServiceSettings.PREFERENCE_PROVIDERS);
+            if (providersCategory != null) {
+                final int count = providersCategory.getPreferenceCount();
+                for (int index = 0; index < count; index++) {
+                    Preference p = providersCategory.getPreference(index);
+                    if (p instanceof WeatherProviderPreference) {
+                        WeatherProviderPreference preference = (WeatherProviderPreference) p;
+                        if (preference.isActiveProvider()) {
+                            preference.setActiveState(false);
+                            break;
+                        }
+                    }
+                }
+            }
+            // Mark this provider as active
+            setActiveState(true);
+        }
+    }
+
     private ComponentName getSettingsComponent(PackageManager pm, ResolveInfo resolveInfo) {
         if (resolveInfo == null
                 || resolveInfo.serviceInfo == null
@@ -222,20 +437,25 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        ListView listView = getListView();
-        ViewGroup contentRoot = (ViewGroup) listView.getParent();
-        listView.setItemsCanFocus(true);
 
+        ViewGroup contentRoot = (ViewGroup) getListView().getParent();
         View emptyView = getActivity().getLayoutInflater().inflate(
                 R.layout.empty_weather_state, contentRoot, false);
         TextView emptyTextView = (TextView) emptyView.findViewById(R.id.message);
         emptyTextView.setText(R.string.weather_settings_no_services_prompt);
 
-        listView.setEmptyView(emptyView);
+        Button addProviderButton = (Button) emptyView.findViewById(R.id.add_weather_provider);
+        addProviderButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                launchGetWeatherProviders();
+            }
+        });
 
         contentRoot.addView(emptyView);
-        mAdapter = new WeatherProviderServiceInfoAdapter(mContext);
-        listView.setAdapter(mAdapter);
+
+        ListView listView = getListView();
+        listView.setEmptyView(emptyView);
     }
 
     private class WeatherProviderServiceInfo {
@@ -245,114 +465,4 @@ public class WeatherServiceSettings extends SettingsPreferenceFragment {
         ComponentName componentName;
         public ComponentName settingsComponentName;
     }
-
-    private class WeatherProviderServiceInfoAdapter
-            extends ArrayAdapter<WeatherProviderServiceInfo> {
-
-        private final LayoutInflater mInflater;
-
-        public WeatherProviderServiceInfoAdapter(Context context) {
-            super(context, 0);
-            mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            WeatherProviderServiceInfo info = getItem(position);
-            final View row = convertView != null ? convertView :
-                    buildRow(parent);
-            row.setTag(info);
-
-            ((ImageView) row.findViewById(android.R.id.icon))
-                    .setImageDrawable(info.icon);
-
-            ((TextView) row.findViewById(android.R.id.title)).setText(info.caption);
-
-            RadioButton radioButton = (RadioButton) row.findViewById(R.id.radio);
-            radioButton.setChecked(info.isActive);
-            radioButton.setOnTouchListener(new View.OnTouchListener() {
-                @Override
-                public boolean onTouch(View v, MotionEvent event) {
-                    row.onTouchEvent(event);
-                    return false;
-                }
-            });
-
-            boolean showSettings = info.settingsComponentName != null;
-            View settingsDivider = row.findViewById(R.id.divider);
-            settingsDivider.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            ImageView settingsButton = (ImageView) row.findViewById(R.id.settings);
-            settingsButton.setVisibility(showSettings ? View.VISIBLE : View.INVISIBLE);
-            settingsButton.setAlpha(info.isActive ? 1f : Utils.DISABLED_ALPHA);
-            settingsButton.setEnabled(info.isActive);
-            settingsButton.setFocusable(info.isActive);
-            settingsButton.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    launchSettingsActivity((WeatherProviderServiceInfo)row.getTag());
-                }
-            });
-
-            return row;
-        }
-
-        private void launchSettingsActivity(WeatherProviderServiceInfo info) {
-            if (info != null && info.settingsComponentName != null) {
-                try {
-                    mContext.startActivity(new Intent().setComponent(info.settingsComponentName));
-                } catch (ActivityNotFoundException e) {
-                    mHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            Toast t = Toast.makeText(mContext,
-                                    R.string.weather_settings_activity_not_found,
-                                        Toast.LENGTH_LONG);
-                            TextView v = (TextView) t.getView().findViewById(android.R.id.message);
-                            if (v != null) v.setGravity(Gravity.CENTER);
-                            t.show();
-                        }
-                    });
-                    Log.w(TAG, info.settingsComponentName + " not found");
-                }
-            }
-        }
-
-        private View buildRow(ViewGroup parent) {
-            final View row =  mInflater.inflate(R.layout.weather_service_provider_info_row,
-                    parent, false);
-            row.setOnClickListener(new View.OnClickListener(){
-                @Override
-                public void onClick(View v) {
-                    v.setPressed(true);
-                    setActiveWeatherProviderService((WeatherProviderServiceInfo) row.getTag());
-                }
-            });
-
-            return row;
-        }
-
-        private void setActiveWeatherProviderService(WeatherProviderServiceInfo info) {
-            WeatherProviderServiceInfo currentSelection = getCurrentSelection();
-            if (info.equals(currentSelection)) return;
-            if (currentSelection != null) {
-                currentSelection.isActive = false;
-            }
-            info.isActive = true;
-            CMSettings.Secure.putString(mContext.getContentResolver(),
-                    CMSettings.Secure.WEATHER_PROVIDER_SERVICE,
-                        info.componentName.flattenToString());
-            launchSettingsActivity(info);
-            notifyDataSetChanged();
-        }
-
-        private WeatherProviderServiceInfo getCurrentSelection() {
-            for (int indx = 0; indx < getCount(); indx++) {
-                WeatherProviderServiceInfo info = getItem(indx);
-                if (info.isActive) {
-                    return info;
-                }
-            }
-            return null;
-        }
-    }
 }
-- 
cgit v1.1


From 1dc89a668dcd325613304ee42b504d52605b8b2d Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Wed, 4 May 2016 17:43:43 +0200
Subject: Disable battery pulsing if segmented battery LED is enabled

Change-Id: Ic5b4e7ce7830c43e84f9a14919ea85bbe993ac99
---
 src/com/android/settings/notificationlight/BatteryLightSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/notificationlight/BatteryLightSettings.java b/src/com/android/settings/notificationlight/BatteryLightSettings.java
index 80d7fa2..2ee884e 100644
--- a/src/com/android/settings/notificationlight/BatteryLightSettings.java
+++ b/src/com/android/settings/notificationlight/BatteryLightSettings.java
@@ -71,7 +71,8 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
         mLightEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(LIGHT_ENABLED_PREF);
         mPulseEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(PULSE_ENABLED_PREF);
 
-        if (!getResources().getBoolean(com.android.internal.R.bool.config_ledCanPulse)) {
+        if (!getResources().getBoolean(com.android.internal.R.bool.config_ledCanPulse) ||
+                getResources().getBoolean(org.cyanogenmod.platform.internal.R.bool.config_useSegmentedBatteryLed)) {
             mGeneralPrefs.removePreference(mPulseEnabledPref);
         }
 
-- 
cgit v1.1


From 08638e5126c14e60edf4f182e13dad3d03d7d706 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Tue, 10 May 2016 18:38:09 +0300
Subject: Automatic translation import

Change-Id: Idf93c9826109ee82aa18fc78a5fe6dff47bc5588
---
 res/values-af/cm_strings.xml      |  1 +
 res/values-ar/cm_strings.xml      | 32 ++++++++++++++++++++
 res/values-as-rIN/cm_strings.xml  |  1 +
 res/values-ast-rES/cm_strings.xml | 63 +++++++++++++++++++++++++++++++++++++++
 res/values-az-rAZ/cm_strings.xml  |  1 +
 res/values-be/cm_strings.xml      |  1 +
 res/values-bg/cm_strings.xml      | 11 +++++--
 res/values-bn-rBD/cm_strings.xml  |  1 +
 res/values-ca/cm_strings.xml      |  9 +++++-
 res/values-cs/cm_strings.xml      |  7 +++++
 res/values-da/cm_strings.xml      |  1 +
 res/values-de/cm_strings.xml      | 17 +++++++----
 res/values-el/cm_strings.xml      |  7 +++++
 res/values-en-rAU/cm_strings.xml  |  1 +
 res/values-en-rGB/cm_strings.xml  | 13 ++++++++
 res/values-en-rIN/cm_strings.xml  |  1 +
 res/values-eo/cm_strings.xml      |  1 +
 res/values-es-rUS/cm_strings.xml  | 30 +++++++++++++++++++
 res/values-es/cm_strings.xml      | 23 ++++++++++++++
 res/values-et-rEE/cm_strings.xml  |  1 +
 res/values-eu-rES/cm_strings.xml  |  7 +++++
 res/values-fa/cm_strings.xml      |  1 +
 res/values-fi/cm_strings.xml      |  7 +++++
 res/values-fr/cm_strings.xml      | 36 ++++++++++++++++++++++
 res/values-gu-rIN/cm_strings.xml  |  1 +
 res/values-hi/cm_strings.xml      |  1 +
 res/values-hr/cm_strings.xml      |  7 +++++
 res/values-hu/cm_strings.xml      |  1 +
 res/values-in/cm_strings.xml      | 34 +++++++++++++--------
 res/values-it/cm_strings.xml      |  7 +++++
 res/values-iw/cm_strings.xml      | 22 +++++++++-----
 res/values-ja/cm_strings.xml      |  1 +
 res/values-kn-rIN/cm_strings.xml  |  1 +
 res/values-ko/cm_strings.xml      | 32 ++++++++++++++++++++
 res/values-ku/cm_strings.xml      |  1 +
 res/values-lb/cm_strings.xml      |  1 +
 res/values-lt/cm_strings.xml      |  1 +
 res/values-lv/cm_strings.xml      |  1 +
 res/values-ml-rIN/cm_strings.xml  |  1 +
 res/values-mr-rIN/cm_strings.xml  |  1 +
 res/values-nb/cm_strings.xml      | 27 +++++++++++++++++
 res/values-nl/cm_strings.xml      |  1 +
 res/values-or-rIN/cm_strings.xml  |  1 +
 res/values-pl/cm_strings.xml      |  8 +++++
 res/values-pt-rBR/cm_strings.xml  | 17 +++++++++--
 res/values-pt-rPT/cm_strings.xml  |  7 +++++
 res/values-ro/cm_strings.xml      |  1 +
 res/values-ru/cm_strings.xml      | 28 +++++++++++++++++
 res/values-si-rLK/cm_strings.xml  |  1 +
 res/values-sk/cm_strings.xml      |  1 +
 res/values-sl/cm_strings.xml      |  7 +++++
 res/values-sr/cm_strings.xml      |  1 +
 res/values-sv/cm_strings.xml      |  1 +
 res/values-ta-rIN/cm_strings.xml  |  1 +
 res/values-te-rIN/cm_strings.xml  |  1 +
 res/values-th/cm_strings.xml      |  1 +
 res/values-tr/cm_strings.xml      | 29 ++++++++++++++++++
 res/values-ug/cm_strings.xml      |  1 +
 res/values-uk/cm_strings.xml      |  1 +
 res/values-vi/cm_strings.xml      | 36 ++++++++++++++++++++++
 res/values-zh-rCN/cm_strings.xml  |  7 +++++
 res/values-zh-rHK/cm_strings.xml  |  1 +
 res/values-zh-rTW/cm_strings.xml  |  1 +
 63 files changed, 536 insertions(+), 30 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index d4fe7b1..313b064 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -995,5 +995,6 @@
   <string name="restrict_app_cellular_summary">Voorkom toep om sellulêre data konneksie te gebruik</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Algemeen</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 7b64d1d..f7ba6ad 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -265,6 +265,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">إعدادات الإضاءة</string>
   <string name="led_notification_text">إضاءة الـ LED ممكنة من الإعدادات</string>
+  <string name="notification_light_no_apps_summary">لإضافة تحكم لكل تطبيق، قم بتنشيط \'%1$s\' واضغط على \'\u002b\' على شريط القوائم</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">تصحيح أخطاء Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -434,6 +435,7 @@
   <string name="app_ops_allowed_count">المسموح بها <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">مرفوض<xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">مسموح<xliff:g id="count">%1$s</xliff:g>, مرفوض<xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">تم التعطيل من خلال تحسين البطارية</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">إظهار تطبيقات المستخدم</string>
   <string name="app_ops_show_system_apps">إظهار تطبيقات مضمنة</string>
@@ -1001,5 +1003,35 @@
   <string name="restrict_app_cellular_summary">منع التطبيق من استخدام اتصال البيانات الخلوي</string>
   <string name="privacy_guard_internet_category">الإنترنت</string>
   <!-- Weather -->
+  <string name="weather_settings_title">طقس</string>
+  <string name="weather_settings_no_services_prompt">لم يتم تثبيت خدمات موفر الطقس</string>
+  <string name="weather_settings_button">إعدادات الموفر</string>
+  <string name="weather_settings_activity_not_found">تعذر تشغيل قائمة الإعدادات لهذا الموفر</string>
+  <string name="weather_settings_add_weather_provider">إضافة موفر الطقس</string>
+  <string name="weather_settings_general_settings_title">عام</string>
+  <string name="weather_settings_providers_title">مقدمي الخدمات</string>
+  <string name="weather_settings_temp_units_title">وحدة درجة الحرارة</string>
+  <string name="weather_settings_temp_celsius">مئوية</string>
+  <string name="weather_settings_temp_fahrenheit">فهرنهايت</string>
+  <string name="weather_settings_keyword">الطقس</string>
+  <string name="background_data_access">الوصول إلى بيانات الخلفية</string>
+  <string name="allow_background_both">عبر البيانات الخلوية &amp; Wi\u2011Fi
+ 
+Context | Edit Context
+</string>
+  <string name="allow_background_wlan">فقط على Wi\u2011Fi</string>
+  <string name="allow_background_none">لا يوجد وصول</string>
+  <string name="mobile_data_alert">تنبيه البيانات الخلوية</string>
+  <string name="mobile_data_alert_summary">الإبلاغ عند استخدام التطبيق كمية كبيرة من البيانات</string>
+  <string name="data_usage_menu_enable_data_alerts">تمكين تنبيهات استخدام البيانات</string>
+  <string name="data_usage_menu_disable_data_alerts">تعطيل تنبيهات استخدام البيانات</string>
+  <string name="data_usage_menu_reset_stats">إعادة تعيين إحصائيات البيانات</string>
+  <string name="reset_data_stats_msg">سيؤدي هذا إلى مسح كافة البيانات السابقة والحالية التي تتبع المعلومات</string>
+  <string name="reset_stats_confirm">تأكيد</string>
+  <string name="restrict_cellular_access_title">تقييد الوصول إلى البيانات الخلوية</string>
+  <string name="restrict_cellular_access_summary">تعطيل الوصول إلى البيانات على الشبكات الخلوية</string>
+  <string name="restrict_cellular_access_dialog_title">تقييد الوصول إلى البيانات الخلوية؟</string>
+  <string name="restrict_cellular_access_dialog_summary">قد تسبب هذه الميزة توقف تطبيق معين يعتمد على الوصول إلى شبكة الاتصال لإيقاف العمل في حالة توفر شبكات خلوية.\n\nيمكنك العثور على ضوابط أكثر ملاءمة لاستخدام البيانات في الإعدادات المتوفرة داخل التطبيق.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">مشغلات الشبكات</string>
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 856583a..83e7f9d 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ডক USB ত চাৰ্জিং কৰি আছে</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">সাধাৰণ</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index cfce6e2..351b489 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -117,6 +117,8 @@
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">Perfiles</string>
   <string name="profile_profile_manage">Alministrar perfil</string>
+  <string name="profile_appgroups_manage">Grupos d\'aplicaciones</string>
+  <string name="profile_appgroup_manage">Xestionar grupu d\'apps</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
   <string name="profile_settings">Axustes de perfil</string>
   <string name="profile_trigger_connect">Al coneutar</string>
@@ -124,13 +126,17 @@
   <string name="profile_trigger_notrigger">Ensin eventu</string>
   <!-- Profile Settings sound modes labels -->
   <string name="sound_mode">Mou de notificación</string>
+  <string name="ringer_mode">Mou de soníu</string>
   <string name="lights_mode">Mou lluces</string>
   <string name="vibrate_mode">Mou vibración</string>
   <string name="choose_soundtone">Esbillar tonu d\'avisu</string>
+  <string name="choose_ringtone">Esbillar tonu</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">Tonu d\'avisos</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupos d\'aplicaciones</string>
   <string name="profile_applist_title">Aplicaciones</string>
+  <string name="profile_new_appgroup">Grupu d\'apps nuevu</string>
   <string name="profile_delete_appgroup">¿Desaniciar esti grupu d\'aplicaciones?</string>
   <string name="profile_appgroup_name_prompt">Introduz un nome pal grupu d\'aplicaciones nuevu</string>
   <string name="profile_appgroup_name_title">Nome</string>
@@ -139,9 +145,12 @@
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">Axustes del Sistema</string>
   <string name="profile_lockmode_title">Mou Bloquéu de pantalla</string>
+  <string name="profile_lockmode_policy_disabled_summary">Esta opción del perfil ta deshabilitada por una política del alministrador de preseos</string>
   <string name="profile_lockmode_insecure_summary">Nun pidir PIN o contraseña</string>
   <string name="profile_lockmode_disabled_summary">Desactivar el bloquéu de pantalla</string>
   <string name="profile_airplanemode_title">Mou avión</string>
+  <string name="profile_brightness_title">Rellumu de pantalla</string>
+  <string name="profile_brightness_override_summary">Afitar a %1$d%%</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
   <string name="toggleWifiAp">Puntu d\'accesu Wi\u2011Fi</string>
@@ -152,12 +161,15 @@
   <string name="toggle2g3g4g">Triba de rede preferida</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Códigu de rexón Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Especificar el códigu de rexón pa Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Hebo un fallu al afitar el códigu de rexón.</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Desaniciar</string>
   <string name="profile_action_none">Dexar ensin cambeos</string>
+  <string name="profile_action_system">Sistema por defeutu</string>
   <string name="profile_action_disable">Apagar</string>
   <string name="profile_action_enable">Prender</string>
   <string name="profile_trigger_a2dp_connect">Al coneutar A2DP</string>
@@ -170,7 +182,11 @@
   <string name="profile_setup_setup_triggers_title_config">Modificar eventos: <xliff:g id="profile_name">%1$s</xliff:g></string>
   <string name="profile_setup_actions_title">Paso 2: Configurar aiciones</string>
   <string name="profile_setup_actions_title_config">Reconfigurar aiciones</string>
+  <string name="profile_appgroups_manage">Grupos d\'aplicaciones</string>
+  <string name="profile_appgroup_manage">Xestionar grupu d\'apps</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupos d\'aplicaciones</string>
+  <string name="profile_new_appgroup">Grupu d\'apps nuevu</string>
   <string name="profile_delete_appgroup">¿Desaniciar esti grupu d\'aplicaciones?</string>
   <string name="profile_appgroup_name_prompt">Introduz un nome pal grupu d\'aplicaciones nuevu</string>
   <string name="profile_appgroup_name_title">Nome</string>
@@ -195,6 +211,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="navigation_bar_reset_message">¿Quies desaniciar los axustes actuales y restaurar la disposición por defeutu?</string>
   <string name="navigation_bar_arrow_keys_title">Amosar fleches al escribir</string>
   <string name="navigation_bar_arrow_keys_summary">Amosar los cursores esquierda y derecha mentanto la escritura. Troca al seleutor IME.</string>
+  <string name="navigation_bar_recents_title">Pulsación llarga en recientes</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Editar axustes de lluz</string>
   <string name="pulse_speed_title">Duración y velocidá</string>
@@ -230,6 +247,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="notification_light_default_value">Por defeutu</string>
   <string name="notification_light_missed_call_title">Llamada perdida</string>
   <string name="notification_light_voicemail_title">Buzón de voz</string>
+  <string name="notification_light_use_multiple_leds">Múltiples LEDs</string>
+  <string name="keywords_lights_brightness_level">amatagar el rellumu de los leds</string>
   <!-- Lights settings, LED notification -->
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuración Android</string>
@@ -361,6 +380,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="hardware_keys_menu_key_title">Botón Menú</string>
   <string name="hardware_keys_assist_key_title">Botón Gueta</string>
   <string name="hardware_keys_appswitch_key_title">Botón Recientes</string>
+  <string name="hardware_keys_camera_key_title">Botón Cámara</string>
   <string name="hardware_keys_volume_keys_title">Botones de volume</string>
   <string name="hardware_keys_short_press_title">Aición pulsación curtia</string>
   <string name="hardware_keys_long_press_title">Aición pulsación llarga</string>
@@ -374,6 +394,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="hardware_keys_action_launch_camera">Abrir cámara</string>
   <string name="hardware_keys_action_sleep">Apagar la pantalla</string>
   <string name="hardware_keys_action_last_app">Cabera aplicación</string>
+  <string name="camera_sleep_on_release_title">Vista rápida</string>
+  <string name="camera_sleep_on_release_summary">Una llixera pulsación del botón, va dexar la pantalla encesa hasta qu\'esti se llibere</string>
+  <string name="camera_launch_title">Llanzar cámara</string>
   <string name="volbtn_music_controls_title">Control multimedia</string>
   <string name="volbtn_music_controls_summary">Cuando la pantalla tea apagada, una pulsación prollongada de los controles de volume, va avanzar o retroceder sobre les pistes de música actives</string>
   <string name="volbtn_cursor_control_title">Control del cursor</string>
@@ -426,8 +449,10 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="disable_navkeys_summary">Habilitar la barra de navegación en pantalla y deshabilitar los botones físicos</string>
   <!-- tap-to-wake -->
   <string name="double_tap_to_wake_title">Doble toque pa esconsoñar</string>
+  <string name="double_tap_to_wake_summary">Calca dos vegaes na pantalla pa prendela</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Doble toque pa bloquiar</string>
+  <string name="double_tap_to_sleep_summary">Calca dos vegaes na barra d\'estáu p\'apagar la pantalla</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir encendíu accidental</string>
   <string name="proximity_wake_summary">Comprobar el sensor de proximidá enantes de prender la pantalla</string>
@@ -449,6 +474,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="color_green_title">Verde</string>
   <string name="color_blue_title">Azul</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">Llanzar aplicación de música</string>
+  <string name="headset_connect_player_summary">Llanza l\'aplicación de música por defeutu al coneutase los auriculares</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioridá automática</string>
   <string name="auto_brightness_reset_button">Restablecer</string>
@@ -479,6 +506,17 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiza la to pantalla basándose na hora\'l día y les condiciones ambientales p\'ameyorar la llexibilidá y amenorgar el cansanciu de güeyos</string>
   <string name="live_display_color_temperature_title">Temperatura de color</string>
+  <string name="live_display_color_temperature_summary">Día: <xliff:g id="day_temperature">%1$d</xliff:g>K Nueche: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">Día</string>
+  <string name="live_display_night">Nueche</string>
+  <string name="live_display_enhance_color_title">Ameyorar colores</string>
+  <string name="live_display_color_profile_title">Pefil de color</string>
+  <string name="live_display_color_profile_standard_title">Estándar</string>
+  <string name="live_display_color_profile_natural_title">Natural</string>
+  <string name="live_display_color_profile_dynamic_title">Dinámicu</string>
+  <string name="live_display_color_profile_cinema_title">Cine</string>
+  <string name="live_display_color_profile_astronomy_title">Astronomía</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seleutor d\'iconu</string>
   <string name="ime_switcher_notify_summary">Amosar l\'iconu de seleición del métodu d\'entrada</string>
@@ -529,6 +567,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="increasing_ring_min_volume_title">Volume inicial</string>
   <string name="increasing_ring_ramp_up_time_title">Duración d\'incrementu</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="volume_keys_control_ring_stream_title">Remanar el volume de llamada</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Les tecles de volume remanen el volume de llamada</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Les tecles de volume remanen el volume multimedia</string>
   <string name="category_calibration">Calibración</string>
   <string name="display_and_lights">Pantalla y leds</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -549,6 +590,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="status_bar_toggle_brightness_summary">Permitir axustar la lluminosidá de la pantalla eslizando\'l deu pela barra d\'estáu</string>
   <string name="status_bar_notif_count_title">Amosar contador notificaciones</string>
   <string name="status_bar_notif_count_summary">Amosar el númberu de notificaciones pendientes na barra d\'estáu</string>
+  <string name="status_bar_quick_qs_pulldown_title">Baxada rápida</string>
+  <string name="status_bar_quick_qs_pulldown_summary">El borde %1$s de la barra de notificaciones va desplegar el panel d\'axustes rápidos</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Esquierda</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Derecha</string>
   <string name="status_bar_quick_qs_pulldown_left">Esquierda</string>
@@ -603,14 +646,18 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">Amosar puntos del patrón</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Amosar direutamente la contraseña</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Amosar direutamente\'l patrón</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Amosar direutamente la entrada PIN</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Amosar visualizador de música</string>
   <!-- lock screen disabled by QS tile warning -->
   <!-- Battery saver -->
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">Habilitar los perfiles por aplicación</string>
+  <string name="autoperf_summary">Escoyer automáticamente\'l mou de batería afayadizu pa delles aplicaciones</string>
   <string name="perf_profile_title">Mou batería</string>
   <!-- Memory -->
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
@@ -645,10 +692,13 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="select_custom_app_title">Seleicionar aplicación personalizada</string>
   <string name="select_custom_activity_title">Seleicionar actividá personalizada</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">Llista de númberos bloquiaos</string>
+  <string name="blacklist_edit_dialog_title">Editar númberu teléfonu bloquiáu</string>
   <string name="blacklist_prefs">Axustes</string>
   <string name="blacklist_button_delete">Desaniciar</string>
   <string name="blacklist_empty_text">Nun tienes númberos bloquiaos. Amiesta una entrada tocando\'l botón Amestar (+).</string>
   <string name="blacklist_summary_disabled">Deshabilitada</string>
+  <string name="blacklist_summary">Nun vas recibir llamaes o mensaxes de los númberos incluyíos na llista prieta de llamaes</string>
   <string name="blacklist_notify">Amosar notificación</string>
   <string name="blacklist_private_numbers_title">Númberos privaos</string>
   <string name="blacklist_private_numbers_summary_disabled">Nun bloquiar llamaes de númberos privaos</string>
@@ -663,8 +713,10 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="blacklist_regex_summary">Usar \u00AB.\u00BB como comodín y \u00AB*\u00BB pa repetición. Por exemplu \u00AB123.*\u00BB va bloquiar númberos qu\'entamen por 123 y \u00AB.*123.*\u00BB va bloquiar númberos que contengan 123</string>
   <string name="blacklist_policy_block_calls">Bloquiar llamaes entrantes</string>
   <string name="blacklist_policy_block_messages">Bloquiar mensaxes entrantes</string>
+  <string name="blacklist_bad_number_add">Nun pudo amestase un númberu inválidu a la llista prieta</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">Quitar númberu</string>
+  <string name="remove_blacklist_entry">¿Quies desaniciar esti númberu teléfonu bloquiáu?</string>
   <string name="select_contact">Seleicionar contautu</string>
   <!-- Sms security limit -->
   <string name="app_security_title">Seguridá n\'aplicaciones</string>
@@ -680,11 +732,17 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="no_filters_title">Nun hai filtros afitaos</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_warning_title">Tocante a</string>
+  <string name="enable_reporting_title">Activar unviu d\'estadístiques</string>
+  <string name="preview_data_title">Previsualizar datos</string>
+  <string name="view_stats_title">Ver estadístiques</string>
   <string name="anonymous_learn_more">Deprendi más</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">ID única</string>
   <string name="preview_device_title">Preséu</string>
   <string name="preview_version_title">Versión</string>
   <string name="preview_country_title">País</string>
+  <string name="preview_carrier_title">Operadora móvil</string>
   <string name="stats_collection_title">Colleición de datos</string>
   <string name="stats_collection_summary">Cuando ta activáu, permite la recoleición de métriques</string>
   <!-- Protected apps lockpattern reset button -->
@@ -701,6 +759,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="pa_login_checking_password">Comprobando cuenta\u2026</string>
   <string name="pa_login_incorrect_login">Conexón incorreuta</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">Collaboradores</string>
   <string name="category_sounds">Soníos</string>
   <string name="notification_manager">Avisos</string>
   <string name="lockscreen_settings">Pantalla de bloquéu</string>
@@ -738,6 +797,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- Factory reset strings -->
+  <string name="factory_reset_erase_sd_card_summary">Desanicia tolos datos na tarxeta SD, incluyendo música y semeyes</string>
+  <string name="factory_reset_warning_text_reset_now">REAFITAR AGORA</string>
+  <string name="factory_reset_warning_text_message">Desaniciaránse d\'esti preséu toles cuentes, aplicaciones, datos d\'aplicaciones y axustes del sistema. Esto nun pue desfacese.</string>
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">Enxamás</string>
@@ -756,5 +818,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Xeneral</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index e0d0639..e005120 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -691,5 +691,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Ümumi</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 3ce9e17..64342b4 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -973,5 +973,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зарадка праз USB дак-станцыю</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Агульныя</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index a7c1456..48156c5 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -836,7 +836,7 @@
   <string name="no_filters_title">Няма зададени филтри</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">CyanogenMod статистики</string>
+  <string name="anonymous_statistics_title">Статистики</string>
   <string name="anonymous_statistics_summary">Помогнете да направим CyanogenMod по-добър, като разрешите да събира анонимни статистически данни</string>
   <string name="anonymous_statistics_warning_title">Информация</string>
   <string name="anonymous_statistics_warning">Ще позволи на CyanogenMod Statistics да изпраща не лична информация  на разработчиците от CyanogenMod, за проследяване на инсталациите в устройството. Предоставената информация включва уникален идентификатор, който не застрашава вашата поверителност или лични данни. Данните се подават по време на всяко зареждане.\n\nПример за данните, които са подадени.</string>
@@ -980,7 +980,7 @@
   <string name="interruptions_ignore_while_media_title">Не намалявай силата на звука</string>
   <string name="interruptions_ignore_while_media_summary">Не намалявай силата на звука, когато пристига известие</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">CyanogenMod правни</string>
+  <string name="cmlicense_title">CyanogenMod правна информация</string>
   <!-- Menu label for reset the battery stats -->
   <string name="menu_stats_reset">Нулиране на статистиката</string>
   <!-- Reset stats confirmation dialog's message -->
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
   <string name="weather_settings_button">Настройки на доставчика</string>
   <string name="weather_settings_activity_not_found">Неуспешно стартиране на меню \"Настройки\" на този доставчик</string>
+  <string name="weather_settings_add_weather_provider">Добавяне на доставчик на време</string>
+  <string name="weather_settings_general_settings_title">Общи</string>
+  <string name="weather_settings_providers_title">Доставчици</string>
+  <string name="weather_settings_temp_units_title">Температурни единици</string>
+  <string name="weather_settings_temp_celsius">Целзий</string>
+  <string name="weather_settings_temp_fahrenheit">Фаренхайт</string>
+  <string name="weather_settings_keyword">Прогноза за времето</string>
   <string name="background_data_access">Достъп до данни на заден план</string>
   <string name="allow_background_both">Надвишени мобилни данни &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Само над Wi\u2011Fi</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index cff9ed2..8c1e923 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -556,5 +556,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">সাধারণ</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index d5a814e..f8a3341 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -842,7 +842,7 @@
   <string name="anonymous_statistics_warning">Optant a les estadístiques de CyanogenMod permetràs que dades no-personals siguin transmeses als desenvolupadors de CyanogenMod per rastrejar les intal·lacions individuals a través dels dispositius. La informació transmesa inclou un identificador únic, que no compromet la privacitat o les dades personals. Les dades son transmeses durant cada arrancada.\n\nPer un exemple de les dades transmeses, pica a vista prèvia de Dades.</string>
   <string name="enable_reporting_title">Activa els informes</string>
   <string name="preview_data_title">Vista prèvia de Dades</string>
-  <string name="view_stats_title">Mostra estadístiques</string>
+  <string name="view_stats_title">Veure estadístiques</string>
   <string name="anonymous_learn_more">Aprèn més</string>
   <!-- Anonymous Statistics - Preview -->
   <string name="preview_id_title">ID únic</string>
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">No hi ha cap servei de proveïdor de temps instal·lat</string>
   <string name="weather_settings_button">Configuració del proveïdor</string>
   <string name="weather_settings_activity_not_found">No s\'ha pogut iniciar el menú de configuració d\'aquest proveïdor</string>
+  <string name="weather_settings_add_weather_provider">Afegeix proveïdor meteorològic</string>
+  <string name="weather_settings_general_settings_title">General</string>
+  <string name="weather_settings_providers_title">Proveïdors</string>
+  <string name="weather_settings_temp_units_title">Unitat de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">el temps</string>
   <string name="background_data_access">Accés a les dades en segon pla</string>
   <string name="allow_background_both">Sobre dades mòbils &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Només sobre Wi\u2011Fi</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 213e0f1..0f3c83e 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">Nejsou nainstalovány žádné služby poskytovatele počasí</string>
   <string name="weather_settings_button">Nastavení poskytovatele</string>
   <string name="weather_settings_activity_not_found">Nelze spustit nastavení tohoto poskytovatele</string>
+  <string name="weather_settings_add_weather_provider">Přidat poskytovatele počasí</string>
+  <string name="weather_settings_general_settings_title">Hlavní</string>
+  <string name="weather_settings_providers_title">Poskytovatelé</string>
+  <string name="weather_settings_temp_units_title">Jednotky teploty</string>
+  <string name="weather_settings_temp_celsius">Celsia</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheita</string>
+  <string name="weather_settings_keyword">počasí</string>
   <string name="background_data_access">Přístup k datům na pozadí</string>
   <string name="allow_background_both">Přes mobilní data a Wi\u2011Fi</string>
   <string name="allow_background_wlan">Pouze přes Wi\u2011Fi</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index dfd08d4..081c755 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -984,6 +984,7 @@
   <!-- Weather -->
   <string name="weather_settings_title">Vejr</string>
   <string name="weather_settings_button">Udbyderindstillinger</string>
+  <string name="weather_settings_general_settings_title">Generelt</string>
   <string name="allow_background_none">Ingen adgang</string>
   <string name="mobile_data_alert">Mobildata alarm</string>
   <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 600b613..35c1aa7 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -261,7 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">LED-Einstellungen</string>
   <string name="led_notification_text">Benachrichtigungs-LED durch Einstellungen aktiviert</string>
-  <string name="notification_light_no_apps_summary">Um App-spezifische Einstellungen hinzuzufügen \"%1$s\" aktivieren und \"\u002b\" in der Menüleiste berühren.</string>
+  <string name="notification_light_no_apps_summary">Um App-spezifische Einstellungen hinzuzufügen, \"%1$s\" aktivieren und \"\u002b\" in der Menüleiste berühren.</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-Debugging</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -993,15 +993,22 @@
   <string name="battery_info_status_charging_dock_usb">Laden über USB-Dock</string>
   <string name="restrict_app_wlan_title">WLAN-Nutzung verhindern</string>
   <string name="restrict_app_wlan_summary">Verhindert die Nutzung von WLAN durch die App</string>
-  <string name="restrict_app_cellular_title">Mobile Daten-Nutzung verhindern</string>
+  <string name="restrict_app_cellular_title">Nutzung mobiler Daten verhindern</string>
   <string name="restrict_app_cellular_summary">Verhindert die Nutzung mobiler Daten durch die App</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Wetter</string>
   <string name="weather_settings_no_services_prompt">Keine Wetteranbieterdienste installiert</string>
   <string name="weather_settings_button">Anbieter-Einstellungen</string>
-  <string name="weather_settings_activity_not_found">Das Einstellungsmenü dieses Anbieters konnten nicht gestartet werden</string>
-  <string name="background_data_access">Hintergrunddaten-Zugriff</string>
+  <string name="weather_settings_activity_not_found">Das Einstellungsmenü dieses Anbieters konnte nicht gestartet werden</string>
+  <string name="weather_settings_add_weather_provider">Wetter-Anbieter hinzufügen</string>
+  <string name="weather_settings_general_settings_title">Allgemein</string>
+  <string name="weather_settings_providers_title">Anbieter</string>
+  <string name="weather_settings_temp_units_title">Temperatureinheit</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">Wetter</string>
+  <string name="background_data_access">Datenzugriff im Hintergrund</string>
   <string name="allow_background_both">Über Mobilfunk &amp; WLAN</string>
   <string name="allow_background_wlan">Nur über WLAN</string>
   <string name="allow_background_none">Kein Zugriff</string>
@@ -1015,7 +1022,7 @@
   <string name="restrict_cellular_access_title">Mobilfunk-Datenzugriff beschränken</string>
   <string name="restrict_cellular_access_summary">Datenzugriff aus Mobilfunknetzen deaktivieren</string>
   <string name="restrict_cellular_access_dialog_title">Mobilfunk-Datenzugriff beschränken?</string>
-  <string name="restrict_cellular_access_dialog_summary">Diese Funktion kann verursachen, dass eine App, die Netzzugang benötigt, nicht mehr funktioniert, wenn nur das Mobilfunknetz zur Verfügung steht.\n\nPassendere Einstellungen können Sie in den app-eigenen Einstellungen finden.</string>
+  <string name="restrict_cellular_access_dialog_summary">Diese Funktion kann dazu führen, dass eine App, die Netzzugang benötigt, nicht mehr funktioniert, wenn nur das Mobilfunknetz zur Verfügung steht.\n\nPassendere Einstellungen können Sie in den App-eigenen Einstellungen finden.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netzbetreiber</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 2d436b9..e799e34 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1005,6 +1005,13 @@
   <string name="weather_settings_no_services_prompt">Δεν υπάρχουν εγκατεστημένοι πάροχοι καιρού</string>
   <string name="weather_settings_button">Ρυθμίσεις παρόχου</string>
   <string name="weather_settings_activity_not_found">Δεν είναι δυνατό το άνοιγμα του μενού ρυθμίσεων αυτού του παρόχου</string>
+  <string name="weather_settings_add_weather_provider">Προσθήκη παρόχου καιρού</string>
+  <string name="weather_settings_general_settings_title">Γενικά</string>
+  <string name="weather_settings_providers_title">Πάροχοι</string>
+  <string name="weather_settings_temp_units_title">Μονάδα θερμοκρασίας</string>
+  <string name="weather_settings_temp_celsius">Κελσίου</string>
+  <string name="weather_settings_temp_fahrenheit">Φαρενάιτ</string>
+  <string name="weather_settings_keyword">καιρός</string>
   <string name="background_data_access">Πρόσβαση δεδομένων στο παρασκήνιο</string>
   <string name="allow_background_both">Μέσω δεδομένων κινητής τηλεφωνίας &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Μόνο μέσω Wi\u2011Fi</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 2eac542..c8d107a 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -761,5 +761,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 262bd43..0344221 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -67,9 +67,12 @@
   <!-- Setting checkbox summary for displaying USB debugging notification -->
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_toggle_mobile_data">toggle mobile data</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_toggle_mobile_data">Toggle mobile data</string>
   <!-- App ops permissions -->
   <!-- App ops detail -->
+  <string name="app_ops_disabled_by_optimization">Disabled by battery optimisation</string>
   <!-- App ops menu options -->
   <!-- Hostname setting -->
   <!-- Backlight brightness settings screen -->
@@ -94,6 +97,7 @@
   <!-- Display : Rotation  -->
   <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <string name="live_display_summary">Optimise your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
@@ -151,6 +155,7 @@
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <!-- MSIM SIM status -->
+  <string name="sim_mobile_network_settings_category_title">Mobile network settings</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
@@ -178,6 +183,14 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="restrict_app_cellular_title">Disable app mobile usage</string>
+  <string name="restrict_app_cellular_summary">Prevent app from using mobile data connection</string>
   <!-- Weather -->
+  <string name="allow_background_both">Over mobile data &amp; Wi\u2011Fi</string>
+  <string name="mobile_data_alert">Mobile data alert</string>
+  <string name="restrict_cellular_access_title">Restrict mobile data access</string>
+  <string name="restrict_cellular_access_summary">Disable data access on mobile networks</string>
+  <string name="restrict_cellular_access_dialog_title">Restrict mobile data access?</string>
+  <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 6d1253d..0d784fa 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -893,5 +893,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Charging over dock USB</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index bb5c19f..9e681b6 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -828,5 +828,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Ĝeneralo</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index f1c0ee8..3e7a414 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -165,6 +165,7 @@
   <string name="toggleData">Conexión de datos</string>
   <string name="toggleSync">Sincronización automática</string>
   <string name="toggle2g3g4g">Tipo de red preferido</string>
+  <string name="toggle2g3g4g_msim">Tipo de red preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Código de región Wi\u2011Fi</string>
@@ -260,6 +261,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="notification_light_no_apps_summary">Para añadir el control por aplicación, activar \'%1$s\' y pulsar \'\u002b\' en la barra de menús</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuración en Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -429,6 +431,7 @@
   <string name="app_ops_allowed_count">Permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Denegado <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permitido <xliff:g id="count">%1$s</xliff:g>, denegado <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desactivado por el optimizador de batería</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Mostrar aplicaciones de usuario</string>
   <string name="app_ops_show_system_apps">Mostrar aplicaciones del sistema</string>
@@ -856,6 +859,7 @@
   <string name="menu_hidden_apps_delete">Restablecer</string>
   <string name="menu_hidden_apps_reset_lock">Restablecer patrón de bloqueo</string>
   <string name="protected_apps">Aplicaciones protegidas</string>
+  <string name="protected_apps_summary">Administrar aplicaciones que se ocultan detrás de un bloqueo seguro</string>
   <string name="saving_protected_components">Guardar el estado del componente\u2026</string>
   <string name="pa_login_username_hint">Usuario (correo electrónico)</string>
   <string name="pa_login_password_hint">Contraseña</string>
@@ -987,6 +991,32 @@
   <string name="battery_info_status_charging_dock_ac">Carga en estado AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Cargando en base de USB</string>
+  <string name="restrict_app_wlan_title">Desactivar el uso de la aplicación Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">Evitar que la aplicación utilice la conexión de datos Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Desactivar el uso de datos móviles en la aplicación</string>
+  <string name="restrict_app_cellular_summary">Evitar que la aplicación utilice la conexión de datos móviles</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">El tiempo</string>
+  <string name="weather_settings_no_services_prompt">No hay servicios de proveedores del clima instalados</string>
+  <string name="weather_settings_button">Ajustes del proveedor</string>
+  <string name="weather_settings_activity_not_found">No se puede iniciar el menú de configuración de este proveedor</string>
+  <string name="weather_settings_general_settings_title">General</string>
+  <string name="background_data_access">Acceso a datos en segundo plano</string>
+  <string name="allow_background_both">Sobre datos celulares &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Solo por Wi-Fi</string>
+  <string name="allow_background_none">Sin acceso</string>
+  <string name="mobile_data_alert">Alerta de uso de datos celulares</string>
+  <string name="mobile_data_alert_summary">Notificar cuando la aplicación utilice una cantidad significativa de datos</string>
+  <string name="data_usage_menu_enable_data_alerts">Activar las alertas de uso de datos</string>
+  <string name="data_usage_menu_disable_data_alerts">Desactivar las alertas de uso de datos</string>
+  <string name="data_usage_menu_reset_stats">Restablecer los datos estadísticos</string>
+  <string name="reset_data_stats_msg">Esto borrará todos los datos información de seguimiento</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restringir el acceso de datos móviles</string>
+  <string name="restrict_cellular_access_summary">Desactivar el acceso de datos en redes móviles</string>
+  <string name="restrict_cellular_access_dialog_title">¿Restringir el acceso de datos móviles?</string>
+  <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de funcionar cuando haya solo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de red</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d0e4f31..6abbe7a 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustes de luz</string>
   <string name="led_notification_text">Luz LED activada por ajustes</string>
+  <string name="notification_light_no_apps_summary">Para agregar control por aplicación, activa \'%1$s\' y pulsa \'\u002b\' en la barra de menús</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuración de Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -430,6 +431,7 @@
   <string name="app_ops_allowed_count">Permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Denegado <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permitido <xliff:g id="count">%1$s</xliff:g>, denegado <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desactivado por el optimizador de batería</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Aplicaciones de usuario</string>
   <string name="app_ops_show_system_apps">Aplicaciones de sistema</string>
@@ -995,5 +997,26 @@
   <string name="restrict_app_cellular_summary">Prevenir que la aplicación utilice conexión de datos</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Clima</string>
+  <string name="weather_settings_no_services_prompt">No hay servicios de proveedores de clima instalados</string>
+  <string name="weather_settings_button">Ajustes de proveedor</string>
+  <string name="weather_settings_activity_not_found">No se puede iniciar el menú de configuración de este proveedor</string>
+  <string name="weather_settings_general_settings_title">General</string>
+  <string name="background_data_access">Acceso a datos en segundo plano</string>
+  <string name="allow_background_both">Sobre datos celulares y Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Solo por Wi-Fi</string>
+  <string name="allow_background_none">Sin acceso</string>
+  <string name="mobile_data_alert">Alerta de uso de datos móviles</string>
+  <string name="mobile_data_alert_summary">Notificar cuando la aplicación utilice una cantidad significativa de datos</string>
+  <string name="data_usage_menu_enable_data_alerts">Activar las alertas de uso de datos</string>
+  <string name="data_usage_menu_disable_data_alerts">Desactivar las alertas de uso de datos</string>
+  <string name="data_usage_menu_reset_stats">Restablecer los datos estadísticos</string>
+  <string name="reset_data_stats_msg">Esto borrará todos los datos de información de seguimiento</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restringir el acceso de datos móviles</string>
+  <string name="restrict_cellular_access_summary">Desactivar el acceso de datos en redes móviles</string>
+  <string name="restrict_cellular_access_dialog_title">¿Restringir el acceso de datos móviles?</string>
+  <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de trabajar cuando hayan sólo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de red</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index ac65f93..e475aaa 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -868,5 +868,6 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Laen üle doki USB</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Üldine</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 5b95b5b..5416731 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">Ez da eguraldi hornitzailerik instalatu</string>
   <string name="weather_settings_button">Hornitzailearen ezarpenak</string>
   <string name="weather_settings_activity_not_found">Ezin izan da hornitzaile honen ezarpen menua abiatu</string>
+  <string name="weather_settings_add_weather_provider">Gehitu eguraldi hornitzailea</string>
+  <string name="weather_settings_general_settings_title">Orokorra</string>
+  <string name="weather_settings_providers_title">Hornitzaileak</string>
+  <string name="weather_settings_temp_units_title">Tenperatura unitatea</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">eguraldia</string>
   <string name="background_data_access">Bigarren planoko datuetara sarbidea</string>
   <string name="allow_background_both">Datu mugikorrak eta Wi\u2011Fi bidez</string>
   <string name="allow_background_wlan">Wi\u2011Fi bidez besterik ez</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index adb8d02..c267f71 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -876,5 +876,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">در حال شارژ در داک یواس‌بی</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">عمومي</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 22b0622..ac264e9 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">Säätarjoajapalveluita ei asennettu</string>
   <string name="weather_settings_button">Tarjoajan asetukset</string>
   <string name="weather_settings_activity_not_found">Tämän palveluntarjoajan asetusvalikon avaaminen ei onnistu</string>
+  <string name="weather_settings_add_weather_provider">Lisää sääpalveluntarjoaja</string>
+  <string name="weather_settings_general_settings_title">Yleiset</string>
+  <string name="weather_settings_providers_title">Palveluntarjoajat</string>
+  <string name="weather_settings_temp_units_title">Lämpötilan yksikkö</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">sää</string>
   <string name="background_data_access">Taustatiedonsiirron käyttö</string>
   <string name="allow_background_both">Mobiiliverkon &amp; Wi\u2011Fin yli</string>
   <string name="allow_background_wlan">Vain Wi\u2011Fin yli</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 6ba04ba..0460cb5 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -166,6 +166,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="toggleData">Connexion aux données mobiles</string>
   <string name="toggleSync">Synchro automatique des données</string>
   <string name="toggle2g3g4g">Type de réseau préféré</string>
+  <string name="toggle2g3g4g_msim">Type de réseau préféré (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Code région Wi\u2011Fi</string>
@@ -261,6 +262,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Paramètres du voyant</string>
   <string name="led_notification_text">LED activée par les paramètres</string>
+  <string name="notification_light_no_apps_summary">Pour ajouter la gestion par application, activer \'%1$s\' et appuyer sur \'\u002b\' dans la barre de menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Débogage Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -430,6 +432,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_ops_allowed_count">Autorisé <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Refusé <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Autorisé <xliff:g id="count">%1$s</xliff:g>, refusé <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Désactivé pour l\'optimisation de la batterie</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Voir l\'utilisateur des applications</string>
   <string name="app_ops_show_system_apps">Afficher les applications système</string>
@@ -857,6 +860,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="menu_hidden_apps_delete">Réinitialiser</string>
   <string name="menu_hidden_apps_reset_lock">Réinitialiser schéma de déverrouillage</string>
   <string name="protected_apps">Applications protégées</string>
+  <string name="protected_apps_summary">Gérer quelles applications sont protégées par un verrou de sécurité</string>
   <string name="saving_protected_components">Enregistrement de l\'état du composant\u2026</string>
   <string name="pa_login_username_hint">Nom d\'utilisateur (e-mail)</string>
   <string name="pa_login_password_hint">Mot de passe</string>
@@ -988,6 +992,38 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="battery_info_status_charging_dock_ac">Chargement sur secteur du dock</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Chargement par l\'USB du dock</string>
+  <string name="restrict_app_wlan_title">Désactiver l\'utilisation du Wi\u2011Fi par cette application</string>
+  <string name="restrict_app_wlan_summary">Empêcher l\'application d\'utiliser la Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Désactiver l\'utilisation des données mobiles par cette application</string>
+  <string name="restrict_app_cellular_summary">Empêcher l\'application d\'utiliser les données mobiles</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Météo</string>
+  <string name="weather_settings_no_services_prompt">Aucun fournisseur de services météorologiques installé</string>
+  <string name="weather_settings_button">Paramètres du fournisseur</string>
+  <string name="weather_settings_activity_not_found">Impossible de lancer le menu de paramètres pour ce fournisseur</string>
+  <string name="weather_settings_add_weather_provider">Ajouter un fournisseur de météo</string>
+  <string name="weather_settings_general_settings_title">Général</string>
+  <string name="weather_settings_providers_title">Fournisseurs</string>
+  <string name="weather_settings_temp_units_title">Unité de température</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">météo</string>
+  <string name="background_data_access">Accès aux données en arrière-plan</string>
+  <string name="allow_background_both">Données mobiles et Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Seulement en Wi\u2011Fi</string>
+  <string name="allow_background_none">Pas d\'accès</string>
+  <string name="mobile_data_alert">Alerte de données mobiles</string>
+  <string name="mobile_data_alert_summary">Avertir lorsqu\'une appli utilise une quantité importante de données</string>
+  <string name="data_usage_menu_enable_data_alerts">Activer les alertes d\'utilisation de données</string>
+  <string name="data_usage_menu_disable_data_alerts">Désactiver les alertes d\'utilisation de données</string>
+  <string name="data_usage_menu_reset_stats">Réinitialiser les statistiques des données</string>
+  <string name="reset_data_stats_msg">Cela effacera toutes les informations, passées et présentes, de suivi des données</string>
+  <string name="reset_stats_confirm">Confirmer</string>
+  <string name="restrict_cellular_access_title">Restreindre l\'accès aux données mobiles</string>
+  <string name="restrict_cellular_access_summary">Désactiver l\'accès aux données sur les réseaux mobiles</string>
+  <string name="restrict_cellular_access_dialog_title">Restreindre l\'accès aux données mobiles ?</string>
+  <string name="restrict_cellular_access_dialog_summary">Cette fonctionnalité peut empêcher le fonctionnement d\'une appli dépendante d\'un accès au réseau lorsque seuls des réseaux mobiles sont disponibles.\n\nVous pouvez trouver des options plus appropriées de gestion de l\'utilisation des données dans les paramètres disponibles dans cette appli.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Opérateurs réseau</string>
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 2b13c6e..318e3dc 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -990,5 +990,6 @@
   <string name="battery_info_status_charging_dock_usb">ડૉક USB પર ચાર્જિંગ થાય છે</string>
   <string name="privacy_guard_internet_category">ઈન્ટરનેટ</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">સામાન્ય</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 004d43d..39bd234 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -841,5 +841,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक यूएसबी पर चार्ज हो रहा है</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 62be801..33f3377 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1002,6 +1002,13 @@
   <string name="weather_settings_no_services_prompt">Nema instaliranih usluga davatelja vremenske prognoze</string>
   <string name="weather_settings_button">Postavke davatelja</string>
   <string name="weather_settings_activity_not_found">Nije moguće otvoriti izbornik postavki ovog davatelja usluga</string>
+  <string name="weather_settings_add_weather_provider">Dodaj pružatelja vremenske prognoze</string>
+  <string name="weather_settings_general_settings_title">Općenito</string>
+  <string name="weather_settings_providers_title">Pružatelji</string>
+  <string name="weather_settings_temp_units_title">Jedinica temperature</string>
+  <string name="weather_settings_temp_celsius">Celzij</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">vrijeme</string>
   <string name="background_data_access">Pristup pozadinskim podacima</string>
   <string name="allow_background_both">Preko mobilnih mreža i Wi-Fi-ja</string>
   <string name="allow_background_wlan">Samo preko Wi-Fi-ja</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 18c44b9..94d2da2 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -990,5 +990,6 @@
   <string name="battery_info_status_charging_dock_usb">Töltés dokkolón (USB)</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Általános</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index fb08980..f3e3a95 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -164,7 +164,7 @@
   <string name="toggleData">Sambungan data</string>
   <string name="toggleSync">Otomatis sinkronkan data</string>
   <string name="toggle2g3g4g">Jenis jaringan pilihan</string>
-  <string name="toggle2g3g4g_msim">Jenis jaringan yang dipilih (%1$s)</string>
+  <string name="toggle2g3g4g_msim">Jenis jaringan pilihan (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Kode wilayah Wi\u2011Fi</string>
@@ -260,6 +260,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Pengaturan cahaya</string>
   <string name="led_notification_text">Lampu LED yang diaktifkan oleh pengaturan</string>
+  <string name="notification_light_no_apps_summary">Untuk menambahkan kontrol pada setiap aplikasi, aktifkan \'%1$s\' dan tekan \'\u002b\' pada bilah menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Perbaikan galat fungsi Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -989,29 +990,38 @@
   <string name="battery_info_status_charging_dock_ac">Mengisi daya dengan dok AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Mengisi melalui dok USB</string>
-  <string name="restrict_app_wlan_title">Nonaktifkan aplikasi pada penggunaan Wi\u2011Fi</string>
-  <string name="restrict_app_wlan_summary">Mencegah aplikasi menggunakan sambungan data Wi\u2011Fi</string>
-  <string name="restrict_app_cellular_title">Nonaktifkan penggunaan data seluler pada aplikasi</string>
-  <string name="restrict_app_cellular_summary">Mencegah aplikasi menggunakan koneksi data seluler</string>
+  <string name="restrict_app_wlan_title">Nonaktifkan penggunaan Wi\u2011Fi oleh aplikasi</string>
+  <string name="restrict_app_wlan_summary">Cegah aplikasi menggunakan koneksi data Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Nonaktifkan penggunaan data seluler oleh aplikasi</string>
+  <string name="restrict_app_cellular_summary">Cegah aplikasi menggunakan koneksi data seluler</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Cuaca</string>
-  <string name="weather_settings_no_services_prompt">Penyedia layanan cuaca tidak diinstal</string>
+  <string name="weather_settings_no_services_prompt">Layanan penyedia cuaca belum diinstal</string>
   <string name="weather_settings_button">Pengaturan penyedia</string>
+  <string name="weather_settings_activity_not_found">Tidak dapat membuka menu pengaturan untuk penyedia ini</string>
+  <string name="weather_settings_add_weather_provider">Tambahkan penyedia cuaca</string>
+  <string name="weather_settings_general_settings_title">Umum</string>
+  <string name="weather_settings_providers_title">Penyedia</string>
+  <string name="weather_settings_temp_units_title">Satuan temperatur</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">cuaca</string>
   <string name="background_data_access">Akses data latar belakang</string>
   <string name="allow_background_both">Melalui data seluler &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Hanya melalui Wi\u2011Fi</string>
   <string name="allow_background_none">Tidak ada akses</string>
   <string name="mobile_data_alert">Lansiran data seluler</string>
-  <string name="mobile_data_alert_summary">Beritahu ketika aplikasi menggunakan sejumlah data besar</string>
-  <string name="data_usage_menu_enable_data_alerts">Aktifkan peringatan penggunaan data</string>
-  <string name="data_usage_menu_disable_data_alerts">Nonaktifkan peringatan penggunaan data</string>
-  <string name="data_usage_menu_reset_stats">Atur kembali statistik data</string>
-  <string name="reset_data_stats_msg">Ini akan menghapus semua informasi pelacakan data masa lalu dan kini</string>
-  <string name="reset_stats_confirm">Pastikan</string>
+  <string name="mobile_data_alert_summary">Beri tahu ketika aplikasi menggunakan data dalam jumlah besar</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktifkan lansiran penggunaan data</string>
+  <string name="data_usage_menu_disable_data_alerts">Nonaktifkan lansiran penggunaan data</string>
+  <string name="data_usage_menu_reset_stats">Atur ulang statistik data</string>
+  <string name="reset_data_stats_msg">Ini akan menghapus semua informasi pelacakan dari dahulu sampai sekarang</string>
+  <string name="reset_stats_confirm">Konfirmasi</string>
   <string name="restrict_cellular_access_title">Batasi akses data seluler</string>
   <string name="restrict_cellular_access_summary">Nonaktifkan akses data pada jaringan seluler</string>
   <string name="restrict_cellular_access_dialog_title">Batasi akses data seluler?</string>
   <string name="restrict_cellular_access_dialog_summary">Fitur ini dapat menyebabkan sebuah aplikasi yang bergantung pada akses jaringan untuk berhenti bekerja apabila hanya jaringan seluler yang tersedia.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih tepat dalam Pengaturan yang tersedia dalam aplikasi.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operator jaringan</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 428ff42..7d55a74 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1003,6 +1003,13 @@
   <string name="weather_settings_no_services_prompt">Nessun provider meteo installato</string>
   <string name="weather_settings_button">Impostazioni provider</string>
   <string name="weather_settings_activity_not_found">Impossibile aprire il menu d\'impostazioni di questo provider</string>
+  <string name="weather_settings_add_weather_provider">Aggiungi un provider meteo</string>
+  <string name="weather_settings_general_settings_title">Generale</string>
+  <string name="weather_settings_providers_title">Provider</string>
+  <string name="weather_settings_temp_units_title">Unità di temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">meteo</string>
   <string name="background_data_access">Accesso dati in background</string>
   <string name="allow_background_both">Con dati mobili &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Solo su Wi\u2011Fi</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index b8a6b21..0075e3b 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -261,7 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">הגדרות נורית</string>
   <string name="led_notification_text">נורית LED מופעלת בהגדרות</string>
-  <string name="notification_light_no_apps_summary">כדי להוסיף בקרה ברמת יישום בודד, הפעילו את \"%1$s\" ולחצו על \"\u002b\" בשורת התפריטים</string>
+  <string name="notification_light_no_apps_summary">כדי להוסיף בקרה ברמת יישום בודד, הפעל את \"%1$s\" ולחץ על \"\u002b\" בסרגל התפריטים</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">איתור באגים של אנדרואיד</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -859,7 +859,7 @@
   <string name="menu_hidden_apps_delete">איפוס</string>
   <string name="menu_hidden_apps_reset_lock">איפוס נעילת דפוס</string>
   <string name="protected_apps">יישומים מוגנים</string>
-  <string name="protected_apps_summary">נהל אילו יישומים מוחבאים מאחורי נעילה מאובטחת</string>
+  <string name="protected_apps_summary">נהל אילו יישומים מוסתרים מאחורי נעילה מאובטחת</string>
   <string name="saving_protected_components">שמירת מצב רכיב\u2026</string>
   <string name="pa_login_username_hint">שם משתמש (דוא\"ל)</string>
   <string name="pa_login_password_hint">סיסמה</string>
@@ -992,27 +992,35 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">מטעין דרך חיבור USB</string>
   <string name="restrict_app_wlan_title">השבת את שימוש היישום ב- Wi\u2011Fi</string>
-  <string name="restrict_app_wlan_summary">מונע מיישום מלהשתמש בחיבור נתוני Wi\u2011Fi</string>
+  <string name="restrict_app_wlan_summary">מונע שימוש של יישום בחיבור נתוני Wi\u2011Fi</string>
   <string name="restrict_app_cellular_title">השבת את שימוש היישום באינטרנט סלולרי</string>
-  <string name="restrict_app_cellular_summary">מונע מיישום מלהשתמש בחיבור נתונים סלולריים</string>
+  <string name="restrict_app_cellular_summary">מונע שימוש של יישום בחיבור נתונים סלולריים</string>
   <string name="privacy_guard_internet_category">אינטרנט</string>
   <!-- Weather -->
   <string name="weather_settings_title">מזג אוויר</string>
   <string name="weather_settings_no_services_prompt">לא מותקנים שירותי ספקי מזג אוויר</string>
   <string name="weather_settings_button">הגדרות ספק</string>
+  <string name="weather_settings_activity_not_found">לא ניתן להפעיל את תפריט ההגדרות של ספק זה</string>
+  <string name="weather_settings_add_weather_provider">הוסף ספק מזג אוויר</string>
+  <string name="weather_settings_general_settings_title">כללי</string>
+  <string name="weather_settings_providers_title">ספקים</string>
+  <string name="weather_settings_temp_units_title">יחידת טמפרטורה</string>
+  <string name="weather_settings_temp_celsius">צלזיוס</string>
+  <string name="weather_settings_temp_fahrenheit">פרנהייט</string>
+  <string name="weather_settings_keyword">מזג אוויר</string>
   <string name="background_data_access">גישה לנתוני רקע</string>
   <string name="allow_background_both">מעל נתונים סלולריים ו- Wi\u2011Fi</string>
   <string name="allow_background_wlan">רק מעל Wi\u2011Fi</string>
   <string name="allow_background_none">אין גישה</string>
   <string name="mobile_data_alert">התראת נתונים סלולריים</string>
   <string name="mobile_data_alert_summary">מתריע כאשר יישום משתמש בכמות נתונים משמעותית</string>
-  <string name="data_usage_menu_enable_data_alerts">הפעל התראות שימוש נתונים</string>
-  <string name="data_usage_menu_disable_data_alerts">השבתת התראות שימוש נתונים</string>
+  <string name="data_usage_menu_enable_data_alerts">הפעל התראות שימוש בנתונים</string>
+  <string name="data_usage_menu_disable_data_alerts">השבת התראות שימוש בנתונים</string>
   <string name="data_usage_menu_reset_stats">איפוס סטטיסטיקות נתונים</string>
   <string name="reset_data_stats_msg">פעולה זו תנקה את כל המידע שנאסף בהווה ובעבר על מעקב אחר נתונים</string>
   <string name="reset_stats_confirm">אישור</string>
   <string name="restrict_cellular_access_title">הגבל גישה לנתונים סלולריים</string>
-  <string name="restrict_cellular_access_summary">השבתת גישה לנתונים ברשתות סלולריות</string>
+  <string name="restrict_cellular_access_summary">השבת גישה לנתונים ברשתות סלולריות</string>
   <string name="restrict_cellular_access_dialog_title">להגביל גישה לנתונים סלולריים?</string>
   <string name="restrict_cellular_access_dialog_summary">תכונה זו עלולה לגרום להפסקת פעולתו של יישום התלוי בגישה לרשת כאשר קיימת זמינות לרשתות סלולריות בלבד.\n\nתוכל למצוא פקדים מתאימים יותר לשימוש בנתונים, בהגדרות הזמינות בתוך היישום.</string>
   <!-- Label for settings shortcut: carrier selection -->
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 2bcd944..b02476e 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USBでホルダーを充電しています</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">全般</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 2ab126e..21ea370 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -990,5 +990,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ಡಾಕ್ ಯು‍ಎಸ್‍ಬಿಯ ಮೂಲಕ ಚಾರ್ಜ್ ಮಾಡಲಾಗುತ್ತಿದೆ</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">ಸಾಮಾನ್ಯ</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 042377e..1fe59af 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -164,6 +164,7 @@
   <string name="toggleData">데이터통신 연결</string>
   <string name="toggleSync">자동 동기화 데이터</string>
   <string name="toggle2g3g4g">선호하는 통신 유형</string>
+  <string name="toggle2g3g4g_msim">선호하는 통신 유형</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi 지역 코드</string>
@@ -259,6 +260,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">조명 설정</string>
   <string name="led_notification_text">설정 앱이 LED 전등을 활성화함</string>
+  <string name="notification_light_no_apps_summary">앱 별 제어를 추가하려면, \'%1$s\'을(를) 활성화하고 메뉴 바에서 \'\u002b\'를 누르세요</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">안드로이드 디버깅</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -428,6 +430,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> 허용</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> 거부</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> 허용됨, <xliff:g id="count">%2$s</xliff:g> 거부됨</string>
+  <string name="app_ops_disabled_by_optimization">배터리 최적화에 의해 비활성화됨</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">사용자 애플리케이션 표시</string>
   <string name="app_ops_show_system_apps">내장 애플리케이션 표시</string>
@@ -855,6 +858,7 @@
   <string name="menu_hidden_apps_delete">초기화</string>
   <string name="menu_hidden_apps_reset_lock">패턴 잠금 초기화</string>
   <string name="protected_apps">보호된 애플리케이션</string>
+  <string name="protected_apps_summary">보안 잠금 사용시 숨겨질 앱 선택</string>
   <string name="saving_protected_components">구성요소 상태 저장\u2026</string>
   <string name="pa_login_username_hint">사용자 이름 (이메일)</string>
   <string name="pa_login_password_hint">비밀번호</string>
@@ -890,6 +894,8 @@
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP 전화번호</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">중복된 APN</string>
+  <string name="duplicate_apn_error_message">이 APN이 이미 존재합니다. 삭제하거나 매개 변수를 변경하세요.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">비활성화 됨</string>
   <string name="sim_missing">SIM 카드가 없거나 잘못되었습니다</string>
@@ -984,6 +990,32 @@
   <string name="battery_info_status_charging_dock_ac">독 AC로 충전중</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">독 USB로 충전중</string>
+  <string name="restrict_app_wlan_title">앱의 Wi\u2011Fi 사용 끄기</string>
+  <string name="restrict_app_wlan_summary">앱이 Wi\u2011Fi 데이터 연결을 사용하지 않도록 설정</string>
+  <string name="restrict_app_cellular_title">앱의 모바일 데이터 사용 끄기</string>
+  <string name="restrict_app_cellular_summary">앱이 모바일 데이터 연결을 하지 않도록 설정</string>
+  <string name="privacy_guard_internet_category">인터넷</string>
   <!-- Weather -->
+  <string name="weather_settings_title">날씨</string>
+  <string name="weather_settings_no_services_prompt">날씨 제공자 서비스 설치되지 않음</string>
+  <string name="weather_settings_button">제공자 설정</string>
+  <string name="weather_settings_activity_not_found">이 제공자의 설정 메뉴를 열 수 없습니다</string>
+  <string name="weather_settings_general_settings_title">일반</string>
+  <string name="background_data_access">백그라운드 데이터 사용</string>
+  <string name="allow_background_both">셀룰러 데이터와 Wi\u2011Fi를 통해</string>
+  <string name="allow_background_wlan">Wi\u2011Fi에서만</string>
+  <string name="allow_background_none">허용하지 않음</string>
+  <string name="mobile_data_alert">셀룰러 데이터 경고</string>
+  <string name="mobile_data_alert_summary">앱이 많은 데이터를 사용할 때 알림</string>
+  <string name="data_usage_menu_enable_data_alerts">데이터 사용량 경고 켜기</string>
+  <string name="data_usage_menu_disable_data_alerts">데이터 사용량 경고 끄기</string>
+  <string name="data_usage_menu_reset_stats">데이터 통계 초기화</string>
+  <string name="reset_data_stats_msg">과거와 현재의 데이터 정보를 모두 삭제합니다</string>
+  <string name="reset_stats_confirm">확인</string>
+  <string name="restrict_cellular_access_title">셀룰러 데이터 사용 제한</string>
+  <string name="restrict_cellular_access_summary">셀룰러 네트워크에서 데이터 사용을 끄기</string>
+  <string name="restrict_cellular_access_dialog_title">셀룰러 데이터 사용을 제한하시겠습니까?</string>
+  <string name="restrict_cellular_access_dialog_summary">이 기능은 셀룰러 네트워크만 사용할 때 네트워크 연결이 필요한 앱의 정상적인 작동을 방해할 수 있습니다.\n\n앱의 설정에서 데이터 사용량을 조절할 수 있는 설정을 찾을 수 있습니다.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">네트워크 영업자</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index e57e93b..4c6d64e 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -762,5 +762,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">گشتی</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f03dfc9..f96178b 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -871,5 +871,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Luede mam USB-Dock</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Allgemeng</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 3478c75..7684c4e 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -876,5 +876,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Įkraunama per USB doką</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Bendra</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index e042eb0..4aba444 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -548,5 +548,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Vispārīgi</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index c09a9ed..370916f 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -989,5 +989,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USB ഡോക്ക് മുഖേന ചാര്‍ജ് ചെയ്യുന്നു</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">പൊതുവായത്</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 6efd23f..91e7379 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">डॉक USB वर चार्ज करत आहे</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index a81d96b..a08c888 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -105,6 +105,7 @@
   <string name="rename_dialog_hint">Angi profilnavn</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Tilbakestill</string>
+  <string name="profile_reset_message">Slette alle brukeropprettede profiler og app grupper og gjenopprette dem til standard?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Fjerne denne appen?</string>
   <!-- Profile network mode -->
@@ -164,6 +165,7 @@
   <string name="toggleData">Datatilkobling</string>
   <string name="toggleSync">Auto-synk data</string>
   <string name="toggle2g3g4g">Foretrukket nettverkstype</string>
+  <string name="toggle2g3g4g_msim">Foretrukket nettverkstype (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Wi\u2011Fi-regionskode</string>
@@ -252,12 +254,14 @@
   <string name="notification_light_missed_call_title">Tapt anrop</string>
   <string name="notification_light_voicemail_title">Talepostkasse</string>
   <string name="notification_light_screen_on">Lys med skjermen på</string>
+  <string name="notification_light_zen_mode">Lys i Ikke Forstyrr-modus</string>
   <string name="notification_light_use_multiple_leds">Flere lysdioder</string>
   <string name="keywords_lights_brightness_level">dim lysdioder lysstyrke</string>
   <string name="notification_light_automagic">Velg farger automatisk</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Lys innstillinger</string>
   <string name="led_notification_text">LED lyset aktiveres av innstillingene</string>
+  <string name="notification_light_no_apps_summary">For å legge til per-app kontroll, må du aktivere \'%1$s\' og trykke \'\u002b\' på meny-linjen</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android feilsøking</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -290,6 +294,7 @@
   <string name="app_ops_summaries_read_calendar">les kalender</string>
   <string name="app_ops_summaries_modify_calendar">endre kalender</string>
   <string name="app_ops_summaries_wifi_scan">Wi-Fi skanning</string>
+  <string name="app_ops_summaries_notification">varsling/toast</string>
   <string name="app_ops_summaries_cell_scan">Celle skann</string>
   <string name="app_ops_summaries_call_phone">ring telefon</string>
   <string name="app_ops_summaries_read_sms">les SMS</string>
@@ -321,14 +326,21 @@
   <string name="app_ops_summaries_keep_awake">hold våken</string>
   <string name="app_ops_summaries_monitor_location">skjerm plassering</string>
   <string name="app_ops_summaries_monitor_high_power_location">overvåk kraftkrevende plassering</string>
+  <string name="app_ops_summaries_get_usage_stats">få brukstatistikker</string>
   <string name="app_ops_summaries_mute_unmute_microphone">Demp/fjern demping mikrofon</string>
   <string name="app_ops_summaries_toast_window">vise toastmeldinger</string>
   <string name="app_ops_summaries_project_media">Prosjekt media</string>
   <string name="app_ops_summaries_activate_vpn">aktiver VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">skrive bakgrunn</string>
+  <string name="app_ops_summaries_assist_structure">hjelpestruktur</string>
+  <string name="app_ops_summaries_assist_screenshot">hjelpeskjermbilde</string>
+  <string name="app_ops_summaries_read_phone_state">lese telefontilstand</string>
   <string name="app_ops_summaries_add_voicemail">legg til mobilsvar</string>
   <string name="app_ops_summaries_use_sip">bruk SIP</string>
   <string name="app_ops_summaries_make_call">foreta anrop</string>
   <string name="app_ops_summaries_use_fingerprint">bruk fingeravtrykk</string>
+  <string name="app_ops_summaries_use_body_sensors">bruke enhetssensorer</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">lese cellekringkastinger</string>
   <string name="app_ops_summaries_read_external_storage">lese ekstern lagring</string>
   <string name="app_ops_summaries_write_external_storage">skriv til ekstern lagring</string>
   <string name="app_ops_summaries_turn_screen_on">slå skjermen på</string>
@@ -932,6 +944,7 @@
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minutter</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Levende skjermlås</string>
   <!-- Live lock screen summary -->
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Innstillinger</string>
@@ -950,6 +963,20 @@
   <string name="battery_info_status_charging_dock_ac">Lader på dokk AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Lader via dokk-USB</string>
+  <string name="privacy_guard_internet_category">Internett</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Vær</string>
+  <string name="weather_settings_general_settings_title">Generelt</string>
+  <string name="allow_background_wlan">Bare over Wi\u2011Fi</string>
+  <string name="allow_background_none">Ingen tilgang</string>
+  <string name="mobile_data_alert">Mobildata varsel</string>
+  <string name="data_usage_menu_reset_stats">Nullstill data statistikker</string>
+  <string name="reset_data_stats_msg">Dette vil fjerne alt av tidligere og nåværende datasporing innformasjon</string>
+  <string name="reset_stats_confirm">Bekreft</string>
+  <string name="restrict_cellular_access_title">Begrense mobildata tilgang</string>
+  <string name="restrict_cellular_access_summary">Deaktiver datatilgang på mobilnettverk</string>
+  <string name="restrict_cellular_access_dialog_title">Begrense mobildata tilgang?</string>
+  <string name="restrict_cellular_access_dialog_summary">Denne funksjonen kan forårsake at en app som avhenger av nettverkstilgang slutter å virke når bare mobilnettverk er tilgjengelig.\n\nDu finner mer hensiktsmessig databruk kontrolleringsinnstillinger tilgjengelig i appens innstillinger.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Nettverksoperatører</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index c267923..a51ee12 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -991,5 +991,6 @@
   <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Algemeen</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index c2925a9..24888e5 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">ଡକ୍‍ USBରେ ଚାର୍ଜିଂ</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">ସାଧାରଣ</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index ea57c8a..c9814ee 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -997,6 +997,14 @@
   <string name="weather_settings_title">Pogoda</string>
   <string name="weather_settings_no_services_prompt">Nie zainstalowano usług dostawcy pogody</string>
   <string name="weather_settings_button">Ustawienia dostawcy</string>
+  <string name="weather_settings_activity_not_found">Nie można uruchomić menu ustawień tego dostawcy</string>
+  <string name="weather_settings_add_weather_provider">Dodaj dostawcę pogody</string>
+  <string name="weather_settings_general_settings_title">Ogólne</string>
+  <string name="weather_settings_providers_title">Dostawcy</string>
+  <string name="weather_settings_temp_units_title">Jednostka temperatury</string>
+  <string name="weather_settings_temp_celsius">Stopnie Celsjusza</string>
+  <string name="weather_settings_temp_fahrenheit">Stopnie Fahrenheita</string>
+  <string name="weather_settings_keyword">pogoda</string>
   <string name="background_data_access">Dostęp do danych w tle</string>
   <string name="allow_background_both">Dane mobilne &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Tylko przez Wi\u2011Fi</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 46d241b..e654319 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -17,6 +17,10 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="one">Você agora está a <xliff:g id="step_count">%1$d </xliff:g> passo de ativar as configurações de desenvolvimento.</item>
+    <item quantity="other">Você agora está a <xliff:g id="step_count">%1$d </xliff:g> passos de ativar as configurações de desenvolvimento.</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Você ativou as configurações de desenvolvedor!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
@@ -990,14 +994,21 @@
   <string name="restrict_app_wlan_title">Impedir o uso de Wi\u2011Fi no app</string>
   <string name="restrict_app_wlan_summary">Impedir que o app use a conexão de dados de Wi\u2011Fi</string>
   <string name="restrict_app_cellular_title">Impedir que o aplicativo use a rede de celular</string>
-  <string name="restrict_app_cellular_summary">Impedir que este aplicativo use a conexão de dados celular</string>
+  <string name="restrict_app_cellular_summary">Impedir que este aplicativo use a conexão de dados móveis</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Clima</string>
   <string name="weather_settings_no_services_prompt">Não há provedor de previsão do tempo instalado</string>
   <string name="weather_settings_button">Configurações do provedor</string>
   <string name="weather_settings_activity_not_found">Não foi possível iniciar o menu de configurações deste provedor</string>
-  <string name="background_data_access">Acesso aos dados em 2º plano</string>
+  <string name="weather_settings_add_weather_provider">Adicionar provedor de previsão do tempo</string>
+  <string name="weather_settings_general_settings_title">Geral</string>
+  <string name="weather_settings_providers_title">Provedores</string>
+  <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">tempo</string>
+  <string name="background_data_access">Acesso aos dados em segundo plano</string>
   <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
   <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
   <string name="allow_background_none">Sem acesso</string>
@@ -1006,7 +1017,7 @@
   <string name="data_usage_menu_enable_data_alerts">Ativar alertas de uso de dados</string>
   <string name="data_usage_menu_disable_data_alerts">Desativar os alertas de uso de dados</string>
   <string name="data_usage_menu_reset_stats">Redefinir as estatísticas de dados</string>
-  <string name="reset_data_stats_msg">Isto irá limpar todas as informações de rastreamento de dados</string>
+  <string name="reset_data_stats_msg">Isto irá apagar todas as informações de rastreamento de dados</string>
   <string name="reset_stats_confirm">Confirmar</string>
   <string name="restrict_cellular_access_title">Restringir o acesso de dados móveis</string>
   <string name="restrict_cellular_access_summary">Desativar o acesso de dados em redes móveis</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 2e31be1..e640d51 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1001,6 +1001,13 @@
   <string name="weather_settings_no_services_prompt">Não há serviços de provedor de meteorologia instalados</string>
   <string name="weather_settings_button">Definições do provedor</string>
   <string name="weather_settings_activity_not_found">Não é possível iniciar o menu de definições deste provedor</string>
+  <string name="weather_settings_add_weather_provider">Adicionar provedor de meteorologia</string>
+  <string name="weather_settings_general_settings_title">Geral</string>
+  <string name="weather_settings_providers_title">Provedores</string>
+  <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">meteorologia</string>
   <string name="background_data_access">Acesso aos dados em 2º plano</string>
   <string name="allow_background_both">Através dos dados móveis e Wi\u2011Fi</string>
   <string name="allow_background_wlan">Apenas através de Wi\u2011Fi</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 7995355..e7b2c97 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -912,5 +912,6 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vremea</string>
+  <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index fab43ff..1bf2cde 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -262,6 +262,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Индикатор событий</string>
   <string name="led_notification_text">Светодиод включен в настройках</string>
+  <string name="notification_light_no_apps_summary">Чтобы разрешить управление приложениями, включите «%1$s» и нажмите «\u002b» в строке меню.</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Режим отладки</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -431,6 +432,7 @@
   <string name="app_ops_allowed_count">Разрешено <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Запрещено <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Разрешено <xliff:g id="count">%1$s</xliff:g>, запрещено <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Отключено при оптимизации батареи</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Загруженные приложения</string>
   <string name="app_ops_show_system_apps">Системные приложения</string>
@@ -997,5 +999,31 @@
   <string name="privacy_guard_internet_category">Интернет</string>
   <!-- Weather -->
   <string name="weather_settings_title">Погода</string>
+  <string name="weather_settings_no_services_prompt">Нет установленных служб поставщиков погоды</string>
+  <string name="weather_settings_button">Настройки поставщика</string>
+  <string name="weather_settings_activity_not_found">Не удается запустить меню настройки этого поставщика</string>
+  <string name="weather_settings_add_weather_provider">Добавить провайдера погоды</string>
+  <string name="weather_settings_general_settings_title">Общие</string>
+  <string name="weather_settings_providers_title">Провайдеры</string>
+  <string name="weather_settings_temp_units_title">Единица температуры</string>
+  <string name="weather_settings_temp_celsius">По Цельсию</string>
+  <string name="weather_settings_temp_fahrenheit">По Фаренгейту</string>
+  <string name="weather_settings_keyword">погода</string>
+  <string name="background_data_access">Доступ к фоновым данным</string>
+  <string name="allow_background_both">Использовать моб. данные и Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Только через Wi-Fi</string>
+  <string name="allow_background_none">Нет доступа</string>
+  <string name="mobile_data_alert">Предупреждение о передаче моб. данных</string>
+  <string name="mobile_data_alert_summary">Уведомлять, когда приложение использует значительный объём данных</string>
+  <string name="data_usage_menu_enable_data_alerts">Включить предупреждения об использовании данных</string>
+  <string name="data_usage_menu_disable_data_alerts">Выключить предупреждения об использовании данных</string>
+  <string name="data_usage_menu_reset_stats">Сброс статистики</string>
+  <string name="reset_data_stats_msg">Это приведет к очистке всей прошлой и нынешней информации об отслеживании данных</string>
+  <string name="reset_stats_confirm">Подтвердить</string>
+  <string name="restrict_cellular_access_title">Ограничение доступа к данным сотовой связи</string>
+  <string name="restrict_cellular_access_summary">Отключение доступа к данным в сотовых сетях</string>
+  <string name="restrict_cellular_access_dialog_title">Ограничить доступ к данным сотовой связи?</string>
+  <string name="restrict_cellular_access_dialog_summary">Данная функция может приостановить работу приложений, использующих доступ к сети, если будут доступны только мобильные сети.\n\nДополнительные параметры управления использованием данных можно найти в настройках приложения.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Операторы сети</string>
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index d8e869f..59a078b 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -556,5 +556,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">ප්‍රධාන</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index c39e0bf..9a88239 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -876,5 +876,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Nabíjení pomocí USB doku</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Všeobecné</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index f2da787..c2dce99 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1005,6 +1005,13 @@
   <string name="weather_settings_no_services_prompt">Ni nameščene storitve ponudnika vremena</string>
   <string name="weather_settings_button">Nastavitve ponudnika</string>
   <string name="weather_settings_activity_not_found">Menija nastavitev za tega ponudnika ni mogoče zagnati</string>
+  <string name="weather_settings_add_weather_provider">Dodaj ponudnika vremena</string>
+  <string name="weather_settings_general_settings_title">Splošno</string>
+  <string name="weather_settings_providers_title">Ponudniki</string>
+  <string name="weather_settings_temp_units_title">Enote za temperaturo</string>
+  <string name="weather_settings_temp_celsius">Celzij</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">vreme</string>
   <string name="background_data_access">Dostop do podatkov v ozadju</string>
   <string name="allow_background_both">Preko mobilnih podatkov in omr. Wi\u2011Fi</string>
   <string name="allow_background_wlan">Samo preko omr. Wi\u2011Fi</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 9400252..624a73d 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1002,6 +1002,7 @@
   <string name="weather_settings_no_services_prompt">Нема инсталираног добављача услуга временске прогнозе</string>
   <string name="weather_settings_button">Поставке добављача</string>
   <string name="weather_settings_activity_not_found">Није могуће покренути подешавање менија овог добављача</string>
+  <string name="weather_settings_general_settings_title">Опште</string>
   <string name="background_data_access">Приступ подацима у позадини</string>
   <string name="allow_background_both">Преко мрежних података &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Само преко Wi\u2011Fi</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index d60819f..acff276 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -999,6 +999,7 @@ inkluderar en unik identifikation,
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Väder</string>
+  <string name="weather_settings_general_settings_title">Allmänt</string>
   <string name="allow_background_wlan">Endast över Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen åtkomst</string>
   <string name="reset_stats_confirm">Bekräfta</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 3f5b7c0..ea49080 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">டாக் USB மீது சார்ஜ் செய்கிறது</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">பொது</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 96196b8..78ca748 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -988,5 +988,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">డాక్ USB పైన చార్జింగ్ అవుతుంది</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">సాధారణం</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 0d0eef1..5a3ecfc 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1000,6 +1000,7 @@
   <string name="weather_settings_no_services_prompt">ไม่มีผู้ให้บริการข้อมูลสภาพอากาศติดตั้งอยู่</string>
   <string name="weather_settings_button">ตั้งค่าผู้ให้บริการ</string>
   <string name="weather_settings_activity_not_found">ไม่สามารถเปิดการตั้งค่าของผู้ให้บริการนี้ได้</string>
+  <string name="weather_settings_general_settings_title">ทั่วไป</string>
   <string name="background_data_access">เข้าถึงข้อมูลพื้นหลัง</string>
   <string name="allow_background_both">ผ่านข้อมูลโทรศัพท์มือถือ &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">เฉพาะเมื่อใช้ Wi\u2011Fi เท่านั้น</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 84a625a..1c537f2 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -261,6 +261,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Işık ayarları</string>
   <string name="led_notification_text">LED ışık ayarlar tarafından etkinleştirilmiş</string>
+  <string name="notification_light_no_apps_summary">Uygulama denetimi eklemek için \'%1$s\' etkinleştirin ve menü çubuğu üzerindeki \'\u002b\' basın</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android hata ayıklama</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -430,6 +431,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> izin verildi</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> reddedildi</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> izin verildi, <xliff:g id="count">%2$s</xliff:g> reddedildi</string>
+  <string name="app_ops_disabled_by_optimization">Pil optimizasyonu tarafından devre dışı bırakıldı</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Kullanıcı uygulamalarını göster</string>
   <string name="app_ops_show_system_apps">Dahili uygulamaları göster</string>
@@ -995,5 +997,32 @@
   <string name="restrict_app_cellular_summary">Uygulamanın hücresel veri bağlantısını kullanmasını engelle</string>
   <string name="privacy_guard_internet_category">İnternet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Hava durumu</string>
+  <string name="weather_settings_no_services_prompt">Yüklü hava durumu hizmet sağlayıcısı yok</string>
+  <string name="weather_settings_button">Sağlayıcı ayarları</string>
+  <string name="weather_settings_activity_not_found">Bu sağlayıcının ayarlar menüsü açılamadı</string>
+  <string name="weather_settings_add_weather_provider">Hava durumu sağlayıcısı ekle</string>
+  <string name="weather_settings_general_settings_title">Genel</string>
+  <string name="weather_settings_providers_title">Sağlayıcılar</string>
+  <string name="weather_settings_temp_units_title">Sıcaklık birimi</string>
+  <string name="weather_settings_temp_celsius">Santigrat</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenhayt</string>
+  <string name="weather_settings_keyword">hava durumu</string>
+  <string name="background_data_access">Arka plan veri erişimi</string>
+  <string name="allow_background_both">Hücresel veri üzerinden &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Sadece Wi\u2011Fi üzerinden</string>
+  <string name="allow_background_none">Erişim yok</string>
+  <string name="mobile_data_alert">Hücresel veri uyarısı</string>
+  <string name="mobile_data_alert_summary">Uygulama önemli miktarda veri kullanınca bildir</string>
+  <string name="data_usage_menu_enable_data_alerts">Veri kullanımı uyarılarını etkinleştir</string>
+  <string name="data_usage_menu_disable_data_alerts">Veri kullanımı uyarılarını devre dışı bırak</string>
+  <string name="data_usage_menu_reset_stats">Veri istatistiklerini sıfırla</string>
+  <string name="reset_data_stats_msg">Bu geçmişteki ve şimdiki tüm veri izleme bilgilerini temizleyecek</string>
+  <string name="reset_stats_confirm">Onayla</string>
+  <string name="restrict_cellular_access_title">Hücresel veri erişimini sınırla</string>
+  <string name="restrict_cellular_access_summary">Hücresel ağlar üzerinde veri erişimini devre dışı bırak</string>
+  <string name="restrict_cellular_access_dialog_title">Hücresel veri erişimi sınırlansın mı?</string>
+  <string name="restrict_cellular_access_dialog_summary">Bu özellik sadece hücresel ağ kullanılabilirken ağ erişimine bağlı çalışan bir uygulamanın çalışmayı durdurmasına sebep olabilir.\n\nDaha uygun veri kullanım seçeneklerini uygulama içindeki ayarlardan bulabilirsiniz.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Ağ operatörleri</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index e0d5ea7..dd7a7ed 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -995,6 +995,7 @@
   <string name="privacy_guard_internet_category">ئىنتېرنېت</string>
   <!-- Weather -->
   <string name="weather_settings_title">ھاۋارايى</string>
+  <string name="weather_settings_general_settings_title">ئادەتتىكى</string>
   <string name="reset_stats_confirm">جەزملەش</string>
   <string name="restrict_cellular_access_dialog_summary">كۆچمە تورغىلا باغلىنىدىغان ئەھۋالدا، بۇ ئىقتىدار تەگلىك سانلىق مەلۇماتىغا ئېھتىياجلىق پىروگراممىنىڭ خىزمەت قىلىشىنى توختىتىپ قويۇشى مۇمكىن.\n\nسىز شۇ ئەپنىڭ تەمىنلىگەن تەڭشىكىدىن سانلىق مەلۇمات ئېقىمىنى تىزگىنلەيدىغان تېخىمۇ مۇۋاپىق تاللانمىنى تاپالىشىڭىز مۇمكىن.</string>
   <!-- Label for settings shortcut: carrier selection -->
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 6531d29..3e6483a 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -924,5 +924,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Заряджаємось від док-станції по USB</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">Головні</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index ac78d54..2062606 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -164,6 +164,7 @@
   <string name="toggleData">Kết nối dữ liệu</string>
   <string name="toggleSync">Tự động đồng bộ dữ liệu</string>
   <string name="toggle2g3g4g">Loại mạng ưa thích</string>
+  <string name="toggle2g3g4g_msim">Loại mạng ưu tiên (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Mã khu vực Wi\u2011Fi</string>
@@ -259,6 +260,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Cài đặt đèn</string>
   <string name="led_notification_text">Đèn LED được kích hoạt theo cài đặt</string>
+  <string name="notification_light_no_apps_summary">Để thêm cho mỗi quyền kiểm soát ứng dụng, kích hoạt \'%1$s\' và nhấn \'\u002b\' trên thanh menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Gỡ lỗi Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -428,6 +430,7 @@
   <string name="app_ops_allowed_count">Được phép <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Bị từ chối <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Được phép <xliff:g id="count">%1$s</xliff:g>, bị từ chối <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Bị vô hiệu hóa bởi tính năng tối ưu hóa pin</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Hiện ứng dụng người dùng</string>
   <string name="app_ops_show_system_apps">Hiện ứng dụng tích hợp sẵn</string>
@@ -855,6 +858,7 @@
   <string name="menu_hidden_apps_delete">Đặt lại</string>
   <string name="menu_hidden_apps_reset_lock">Đặt lại mẫu hình mở khóa</string>
   <string name="protected_apps">Các ứng dụng được bảo vệ</string>
+  <string name="protected_apps_summary">Quản lý các ứng dụng được ẩn sau khóa an toàn</string>
   <string name="saving_protected_components">Đang lưu trạng thái thành phần\u2026</string>
   <string name="pa_login_username_hint">Tên người dùng (email)</string>
   <string name="pa_login_password_hint">Mật khẩu</string>
@@ -986,6 +990,38 @@
   <string name="battery_info_status_charging_dock_ac">Đang sạc trên AC của đế</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Đang sạc qua USB của đế</string>
+  <string name="restrict_app_wlan_title">Vô hiệu hóa việc sử dụng Wi\u2011Fi ở ứng dụng</string>
+  <string name="restrict_app_wlan_summary">Ngăn không cho ứng dụng sử dụng kết nối dữ liệu Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Vô hiệu hóa việc sử dụng di động ở ứng dụng</string>
+  <string name="restrict_app_cellular_summary">Ngăn không cho ứng dụng sử dụng kết nối dữ liệu di động</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Thời tiết</string>
+  <string name="weather_settings_no_services_prompt">Không có dịch vụ nhà cung cấp thời tiết nào được cài đặt</string>
+  <string name="weather_settings_button">Cài đặt nhà cung cấp</string>
+  <string name="weather_settings_activity_not_found">Không thể khởi động menu cài đặt của nhà cung cấp này</string>
+  <string name="weather_settings_add_weather_provider">Thêm nhà cung cấp thời tiết</string>
+  <string name="weather_settings_general_settings_title">Tổng quát</string>
+  <string name="weather_settings_providers_title">Nhà cung cấp</string>
+  <string name="weather_settings_temp_units_title">Đơn vị nhiệt độ</string>
+  <string name="weather_settings_temp_celsius">Độ C</string>
+  <string name="weather_settings_temp_fahrenheit">Độ F</string>
+  <string name="weather_settings_keyword">thời tiết</string>
+  <string name="background_data_access">Truy cập dữ liệu nền</string>
+  <string name="allow_background_both">Qua dữ liệu di động &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Chỉ qua Wi\u2011Fi</string>
+  <string name="allow_background_none">Không có quyền truy cập</string>
+  <string name="mobile_data_alert">Cảnh báo dữ liệu di động</string>
+  <string name="mobile_data_alert_summary">Thông báo khi ứng dụng sử dụng lượng dữ liệu đáng kể</string>
+  <string name="data_usage_menu_enable_data_alerts">Bật cảnh báo sử dụng dữ liệu</string>
+  <string name="data_usage_menu_disable_data_alerts">Tắt cảnh báo sử dụng dữ liệu</string>
+  <string name="data_usage_menu_reset_stats">Thiết lập lại thống kê dữ liệu</string>
+  <string name="reset_data_stats_msg">Thao tác này sẽ xóa tất cả thông tin theo dõi dữ liệu trong quá khứ và hiện tại</string>
+  <string name="reset_stats_confirm">Xác nhận</string>
+  <string name="restrict_cellular_access_title">Hạn chế truy cập dữ liệu di động</string>
+  <string name="restrict_cellular_access_summary">Vô hiệu hoá quyền truy cập dữ liệu trên mạng di động</string>
+  <string name="restrict_cellular_access_dialog_title">Hạn chế truy cập dữ liệu di động?</string>
+  <string name="restrict_cellular_access_dialog_summary">Tính năng này có thể khiến một ứng dụng phụ thuộc vào việc truy cập mạng ngừng hoạt động khi chỉ sẵn có mạng di động.\n\nBạn có thể tìm thấy các quyền kiểm soát sử dụng dữ liệu thích hợp hơn trong các cài đặt sẵn có trong ứng dụng.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index b3ea4c8..cd2919d 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -998,6 +998,13 @@
   <string name="weather_settings_no_services_prompt">没有安装天气提供商服务</string>
   <string name="weather_settings_button">提供商设置</string>
   <string name="weather_settings_activity_not_found">无法为此提供商启动设置菜单</string>
+  <string name="weather_settings_add_weather_provider">添加天气提供商</string>
+  <string name="weather_settings_general_settings_title">常规</string>
+  <string name="weather_settings_providers_title">提供商</string>
+  <string name="weather_settings_temp_units_title">温度单位</string>
+  <string name="weather_settings_temp_celsius">摄氏</string>
+  <string name="weather_settings_temp_fahrenheit">华氏</string>
+  <string name="weather_settings_keyword">天气</string>
   <string name="background_data_access">后台数据访问</string>
   <string name="allow_background_both">仅通过移动数据 &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">仅通过 Wi\u2011Fi</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 6772025..c5b57dd 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -816,5 +816,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">正在透過 USB 插口充電</string>
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index eff4ceb..6b9467c 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -853,5 +853,6 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
+  <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
-- 
cgit v1.1


From 5ec7c34c2da4a0e2ef8f0f3d0f2bef98eca84089 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Tue, 10 May 2016 16:20:26 -0700
Subject: Automatic translation import

Change-Id: I534298276780b88f87567ab977bd8ce1d1a856e4
Ticket: RM-232
---
 res/values-ar/cm_strings.xml | 5 +----
 res/values-th/cm_strings.xml | 6 ++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index f7ba6ad..890fd43 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1015,10 +1015,7 @@
   <string name="weather_settings_temp_fahrenheit">فهرنهايت</string>
   <string name="weather_settings_keyword">الطقس</string>
   <string name="background_data_access">الوصول إلى بيانات الخلفية</string>
-  <string name="allow_background_both">عبر البيانات الخلوية &amp; Wi\u2011Fi
- 
-Context | Edit Context
-</string>
+  <string name="allow_background_both">عبر البيانات الخلوية &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">فقط على Wi\u2011Fi</string>
   <string name="allow_background_none">لا يوجد وصول</string>
   <string name="mobile_data_alert">تنبيه البيانات الخلوية</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 5a3ecfc..9907cdf 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1000,7 +1000,13 @@
   <string name="weather_settings_no_services_prompt">ไม่มีผู้ให้บริการข้อมูลสภาพอากาศติดตั้งอยู่</string>
   <string name="weather_settings_button">ตั้งค่าผู้ให้บริการ</string>
   <string name="weather_settings_activity_not_found">ไม่สามารถเปิดการตั้งค่าของผู้ให้บริการนี้ได้</string>
+  <string name="weather_settings_add_weather_provider">เพิ่มผู้ให้บริการรายงานสภาพอากาศ</string>
   <string name="weather_settings_general_settings_title">ทั่วไป</string>
+  <string name="weather_settings_providers_title">ผู้ให้บริการ</string>
+  <string name="weather_settings_temp_units_title">หน่วยอุณหภูมิ</string>
+  <string name="weather_settings_temp_celsius">เซลเซียส</string>
+  <string name="weather_settings_temp_fahrenheit">ฟาเรนไฮต์</string>
+  <string name="weather_settings_keyword">สภาพอากาศ</string>
   <string name="background_data_access">เข้าถึงข้อมูลพื้นหลัง</string>
   <string name="allow_background_both">ผ่านข้อมูลโทรศัพท์มือถือ &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">เฉพาะเมื่อใช้ Wi\u2011Fi เท่านั้น</string>
-- 
cgit v1.1


From d48d84a4b49339b2470a23add497337f6d04bfea Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Tue, 10 May 2016 17:16:47 -0700
Subject: Add config to hide/show weather menu

This config controls whether the weather menu
should be displayed in settings

Change-Id: I89502d22cb56496825f497e6b19fce3d8e0a7a3c
TICKET: CYNGNOS-2796
---
 res/values/config.xml                          | 2 ++
 src/com/android/settings/SettingsActivity.java | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 26508b4..b036b89 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -120,4 +120,6 @@
     <!-- When true Live lock screen settings will be positioned at the top -->
     <bool name="config_showLiveLockScreenSettingsFirst">false</bool>
 
+    <!-- When true, weather options will be displayed in settings dashboard -->
+    <bool name="config_showWeatherMenu">true</bool>
 </resources>
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index df197a5..d1aefad 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -1333,8 +1333,11 @@ public class SettingsActivity extends Activity
                         removeTile = true;
                     }
                 } else if (id == R.id.weather_settings) {
+                    final boolean showWeatherMenu = getResources()
+                            .getBoolean(R.bool.config_showWeatherMenu);
+
                     if (!getPackageManager().hasSystemFeature(
-                            CMContextConstants.Features.WEATHER_SERVICES)) {
+                            CMContextConstants.Features.WEATHER_SERVICES) || !showWeatherMenu) {
                         removeTile = true;
                     }
                 }
-- 
cgit v1.1


From d135b55b76afebd8f4f1b595f91a7a3193266520 Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Fri, 6 May 2016 15:54:36 -0700
Subject: Disable cellular networks settings menu if airplane mode is enabled

Cellular networks settings menu will be disabled
if user enables airplane mode

Change-Id: I83d78754918d50c02e19121ffcfb673bb1dc5797
TICKET: CYNGNOS-2697
---
 src/com/android/settings/Utils.java                       |  6 ++++++
 src/com/android/settings/dashboard/DashboardSummary.java  |  8 ++++++++
 src/com/android/settings/dashboard/DashboardTileView.java | 10 +++++++++-
 3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 837c36c..5c58193 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -73,6 +73,7 @@ import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Profile;
 import android.provider.ContactsContract.RawContacts;
+import android.provider.Settings;
 import android.service.persistentdata.PersistentDataBlockManager;
 import android.telephony.ServiceState;
 import android.telephony.TelephonyManager;
@@ -1449,4 +1450,9 @@ public final class Utils {
                     items.get(count - 1));
         }
     }
+
+    public static boolean isAirplaneModeEnabled(Context context) {
+        return Settings.Global.getInt(context.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+    }
 }
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index e01a843..ebd32c1 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -43,6 +43,7 @@ import com.android.settings.HelpUtils;
 import com.android.settings.InstrumentedFragment;
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.Utils;
 import com.android.settings.widget.SwitchBar;
 
 import java.util.List;
@@ -105,6 +106,10 @@ public class DashboardSummary extends InstrumentedFragment {
         filter.addAction(Intent.ACTION_PACKAGE_REPLACED);
         filter.addDataScheme("package");
         getActivity().registerReceiver(mHomePackageReceiver, filter);
+
+        final IntentFilter airplaneModeFilter
+                = new IntentFilter(Intent.ACTION_AIRPLANE_MODE_CHANGED);
+        getActivity().registerReceiver(mHomePackageReceiver, airplaneModeFilter);
     }
 
     @Override
@@ -165,6 +170,9 @@ public class DashboardSummary extends InstrumentedFragment {
 
                 tileView.setTile(tile);
 
+                if (tile.id == R.id.mobile_networks) {
+                    tileView.setEnabledTile(!Utils.isAirplaneModeEnabled(context));
+                }
                 categoryContent.addView(tileView);
             }
 
diff --git a/src/com/android/settings/dashboard/DashboardTileView.java b/src/com/android/settings/dashboard/DashboardTileView.java
index 6790136..50bfabe 100644
--- a/src/com/android/settings/dashboard/DashboardTileView.java
+++ b/src/com/android/settings/dashboard/DashboardTileView.java
@@ -150,5 +150,13 @@ public class DashboardTileView extends FrameLayout implements View.OnClickListen
         return mSwitch;
     }
 
-
+    public void setEnabledTile(boolean enabled) {
+        mImageView.setAlpha(enabled ? 1f : Utils.DISABLED_ALPHA);
+        mTitleTextView.setEnabled(enabled);
+        mStatusTextView.setEnabled(enabled);
+        mSwitch.setEnabled(enabled);
+        mSwitch.setClickable(enabled);
+        setFocusable(enabled);
+        setEnabled(enabled);
+    }
 }
-- 
cgit v1.1


From c15b40696b535c39615a34017f648f601573b0e0 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Wed, 11 May 2016 19:27:30 -0700
Subject: Settings : Filter livelockscreen, button for secondary users

Secondary users should not be able to configure either of those.

OPO-696

Change-Id: I43409c090fb12df576c29297fb506c70e6583bce
---
 src/com/android/settings/ButtonSettings.java   | 16 ++++++++--------
 src/com/android/settings/SecuritySettings.java |  2 +-
 src/com/android/settings/SettingsActivity.java |  1 -
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java
index 09c9b7d..109d7dc 100644
--- a/src/com/android/settings/ButtonSettings.java
+++ b/src/com/android/settings/ButtonSettings.java
@@ -407,8 +407,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
         try {
             // Only show the navigation bar category on devices that have a navigation bar
             // unless we are forcing it via development settings
-            boolean forceNavbar = CMSettings.Secure.getInt(getContentResolver(),
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
+            boolean forceNavbar = CMSettings.Global.getInt(getContentResolver(),
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
             boolean hasNavBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar()
                     || forceNavbar;
 
@@ -628,13 +628,13 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
     }
 
     private static void writeDisableNavkeysOption(Context context, boolean enabled) {
-        CMSettings.Secure.putInt(context.getContentResolver(),
-                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
+        CMSettings.Global.putInt(context.getContentResolver(),
+                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
     }
 
     private void updateDisableNavkeysOption() {
-        boolean enabled = CMSettings.Secure.getInt(getActivity().getContentResolver(),
-                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
+        boolean enabled = CMSettings.Global.getInt(getActivity().getContentResolver(),
+                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
 
         mDisableNavigationKeys.setChecked(enabled);
     }
@@ -687,8 +687,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
             return;
         }
 
-        writeDisableNavkeysOption(context, CMSettings.Secure.getInt(context.getContentResolver(),
-                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0);
+        writeDisableNavkeysOption(context, CMSettings.Global.getInt(context.getContentResolver(),
+                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0) != 0);
     }
 
 
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index cc46ba7..6337800 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -348,7 +348,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
             // Add live lock screen preference if supported
             PreferenceGroup generalCategory = (PreferenceGroup)
                     root.findPreference(KEY_GENERAL_CATEGORY);
-            if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null) {
+            if (pm.hasSystemFeature(LIVE_LOCK_SCREEN_FEATURE) && generalCategory != null && Utils.isUserOwner()) {
                 boolean moveToTop = getResources().getBoolean(
                         R.bool.config_showLiveLockScreenSettingsFirst);
 
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index d1aefad..a68005a 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -298,7 +298,6 @@ public class SettingsActivity extends Activity
             R.id.home_settings,
             R.id.dashboard,
             R.id.privacy_settings_cyanogenmod,
-            R.id.button_settings
     };
 
     private static final String[] ENTRY_FRAGMENTS = {
-- 
cgit v1.1


From fe6c6f31fc807aa221fa6f46d12d303dfe411d24 Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Wed, 11 May 2016 16:58:54 -0700
Subject: Profiles: Disable notification item if ringtone & notification
 volumes are linked

The notification item will be disabled if the notification and
ringtone volumes are linked. This is to keep consistency with the
sound settings

Change-Id: Ibbe7612eae5e9b7b18d63450ab8331f02becf5ca
TICKET: CYNGNOS-958
---
 .../settings/profiles/actions/item/VolumeStreamItem.java    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
index 9bcf2ef..f4d76c7 100644
--- a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
+++ b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
@@ -17,6 +17,7 @@ package com.android.settings.profiles.actions.item;
 
 import android.content.Context;
 import android.media.AudioManager;
+import android.provider.Settings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -30,6 +31,7 @@ import com.android.settings.profiles.actions.ItemListAdapter;
 public class VolumeStreamItem implements Item {
     private int mStreamId;
     private StreamSettings mStreamSettings;
+    private boolean mEnabled;
 
     public VolumeStreamItem(int streamId, StreamSettings streamSettings) {
         mStreamId = streamId;
@@ -43,7 +45,7 @@ public class VolumeStreamItem implements Item {
 
     @Override
     public boolean isEnabled() {
-        return true;
+        return mEnabled;
     }
 
     @Override
@@ -72,6 +74,15 @@ public class VolumeStreamItem implements Item {
             desc.setText(context.getString(R.string.profile_action_none));
         }
 
+        final boolean volumeLinkNotification = Settings.Secure.getInt(context
+                .getContentResolver(), Settings.Secure.VOLUME_LINK_NOTIFICATION, 1) == 1;
+        mEnabled = true;
+        if (mStreamId == AudioManager.STREAM_NOTIFICATION && volumeLinkNotification) {
+            mEnabled = false;
+            text.setEnabled(false);
+            desc.setEnabled(false);
+        }
+
         return view;
     }
 
-- 
cgit v1.1


From 056e52cdde269b75beed195814b27e4d5fef19c2 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Fri, 13 May 2016 23:36:56 +0300
Subject: Cleanup cm_arrays

* Remove unused resources
* Set untranslatables
* Convert remaining arrays to string references

Change-Id: I8ae61eb81e0148e8b6954ebc46960348bf35044c
---
 res/values/cm_arrays.xml  | 92 +++++++++++++++++------------------------------
 res/values/cm_strings.xml | 17 +++++++++
 2 files changed, 50 insertions(+), 59 deletions(-)

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index c1aa849..c439175 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -30,20 +30,6 @@
         <item>3</item>
     </string-array>
 
-    <!-- Profile mode options. -->
-    <string-array name="profile_entries">
-        <item>On</item>
-        <item>Off</item>
-        <item>No override</item>
-    </string-array>
-
-    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-    <string-array name="profile_values" translatable="false">
-        <item>OVERRIDE</item>
-        <item>SUPPRESS</item>
-        <item>DEFAULT</item>
-    </string-array>
-
     <!-- Profile lock mode summaries. Do not translate. -->
     <string-array name="profile_lockmode_entries" translatable="false">
         <item>@string/profile_action_system</item>
@@ -98,18 +84,12 @@
         <item>2</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_entries">
+    <string-array name="profile_action_generic_connection_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_disable</item>
         <item>@string/profile_action_enable</item>
     </string-array>
 
-    <string-array name="profile_action_generic_connection_values">
-        <item>-1</item>
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
     <string-array name="profile_doze_entries" translatable="false">
         <item>@string/profile_action_none</item>
         <item>@string/profile_action_enable</item>
@@ -123,23 +103,17 @@
     </string-array>
 
     <!-- Profile mode options. -->
-     <string-array name="profile_entries" translatable="false">
-         <item>@string/profile_entries_on</item>
-         <item>@string/profile_entries_off</item>
-         <item>@string/profile_entries_no_override</item>
-     </string-array>
-
-     <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
-     <string-array name="profile_values" translatable="false">
-         <item>OVERRIDE</item>
-         <item>SUPPRESS</item>
-         <item>DEFAULT</item>
-     </string-array>
+    <string-array name="profile_entries" translatable="false">
+        <item>@string/profile_entries_on</item>
+        <item>@string/profile_entries_off</item>
+        <item>@string/profile_entries_no_override</item>
+    </string-array>
 
-    <string-array name="trigger_page_title">
-        <item>WiFi</item>
-        <item>Bluetooth</item>
-        <item>NFC</item>
+    <!-- Values for vibrate_entries matching constants in SoundSettings. Do not translate. -->
+    <string-array name="profile_values" translatable="false">
+        <item>OVERRIDE</item>
+        <item>SUPPRESS</item>
+        <item>DEFAULT</item>
     </string-array>
 
     <!-- Values for the notification light pulse spinners -->
@@ -348,7 +322,7 @@
     </string-array>
 
     <!-- App ops permissions -->
-    <string-array name="app_ops_permissions">
+    <string-array name="app_ops_permissions" translatable="false">
         <item>@string/app_ops_permissions_allowed</item>
         <item>@string/app_ops_permissions_ignored</item>
         <item>@string/app_ops_permissions_always_ask</item>
@@ -377,10 +351,10 @@
     </string-array>
 
     <!-- Values for screen color  -->
-    <string-array name="screen_color_setting">
-        <item>Standard</item>
-        <item>Vivid</item>
-        <item>Custom</item>
+    <string-array name="screen_color_setting" translatable="false">
+        <item>@string/screen_color_standard</item>
+        <item>@string/screen_color_vivid</item>
+        <item>@string/screen_color_custom</item>
     </string-array>
 
     <!-- Stylus Gestures -->
@@ -528,19 +502,19 @@
     </string-array>
 
     <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi region code. -->
-    <string-array name="wifi_countrycode_entries">
-        <item>United States</item>
-        <item>Canada, Taiwan</item>
-        <item>Germany</item>
-        <item>Europe</item>
-        <item>Japan, Russia</item>
-        <item>Australia</item>
-        <item>China</item>
-        <item>Korea</item>
-        <item>South Africa, Turkey</item>
-        <item>Israel, Singapore</item>
-        <item>Brazil</item>
-        <item>India</item>
+    <string-array name="wifi_countrycode_entries" translatable="false">
+        <item>@string/wifi_countrycode_us</item>
+        <item>@string/wifi_countrycode_ca</item>
+        <item>@string/wifi_countrycode_de</item>
+        <item>@string/wifi_countrycode_gb</item>
+        <item>@string/wifi_countrycode_jp</item>
+        <item>@string/wifi_countrycode_au</item>
+        <item>@string/wifi_countrycode_cn</item>
+        <item>@string/wifi_countrycode_kr</item>
+        <item>@string/wifi_countrycode_tr</item>
+        <item>@string/wifi_countrycode_sg</item>
+        <item>@string/wifi_countrycode_br</item>
+        <item>@string/wifi_countrycode_in</item>
     </string-array>
 
     <string-array name="wifi_countrycode_values" translatable="false">
@@ -586,10 +560,10 @@
         <item>600000</item>
     </string-array>
 
-    <string-array name="background_data_access_choices">
-        <item>Over mobile data &amp; WiFi</item>
-        <item>Only over WiFi</item>
-        <item>No access</item>
+    <string-array name="background_data_access_choices" translatable="false">
+        <item>@string/allow_background_both</item>
+        <item>@string/allow_background_wlan</item>
+        <item>@string/allow_background_none</item>
     </string-array>
 
     <!-- Weather temperature -->
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 1c61579..27ca707 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -207,6 +207,19 @@
     <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
     <string name="wifi_setting_countrycode_error">There was a problem setting the region code.</string>
 
+    <string name="wifi_countrycode_us">United States</string>
+    <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+    <string name="wifi_countrycode_de">Germany</string>
+    <string name="wifi_countrycode_gb">Europe</string>
+    <string name="wifi_countrycode_jp">Japan, Russia</string>
+    <string name="wifi_countrycode_au">Australia</string>
+    <string name="wifi_countrycode_cn">China</string>
+    <string name="wifi_countrycode_kr">Korea</string>
+    <string name="wifi_countrycode_tr">South Africa, Turkey</string>
+    <string name="wifi_countrycode_sg">Israel, Singapore</string>
+    <string name="wifi_countrycode_br">Brazil</string>
+    <string name="wifi_countrycode_in">India</string>
+
     <!-- Profiles -->
     <string name="profile_menu_delete_title">Delete</string>
     <string name="profile_action_none">Leave unchanged</string>
@@ -658,6 +671,10 @@
     <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
     <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
 
+    <string name="screen_color_standard">Standard</string>
+    <string name="screen_color_vivid">Vivid</string>
+    <string name="screen_color_custom">Custom</string>
+
     <!-- LiveDisplay -->
     <string name="live_display_title" translatable="false">LiveDisplay</string>
     <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
-- 
cgit v1.1


From e05c0dc5bd47aa1ef09026e320f9ed571c7c71f9 Mon Sep 17 00:00:00 2001
From: Arvin Quilao <arquilao@gmail.com>
Date: Tue, 3 May 2016 10:19:04 +0800
Subject: Use correct icon for sim card

Instead of storage/sdcard icon, use the correct
vector drawable sim card icon.
Change-Id: I8349eae870b774671e635aabfb42b2b455ff1cd3
---
 res/drawable/ic_settings_sim.xml                   | 36 +++++++++++++---------
 .../settings/search/SearchIndexableResources.java  |  2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/res/drawable/ic_settings_sim.xml b/res/drawable/ic_settings_sim.xml
index d2b9d2f..5d1dce4 100644
--- a/res/drawable/ic_settings_sim.xml
+++ b/res/drawable/ic_settings_sim.xml
@@ -1,21 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     Copyright (C) 2015 The Android Open Source Project
+    Copyright (c) 2016 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
+    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
+        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.
+    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.
 -->
-
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/ic_sim_sd"
-    android:tint="?android:attr/colorAccent" />
-
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+    <path
+        android:fillColor="?android:attr/colorAccent"
+        android:pathData="M19.99,4c0,-1.1 -0.89,-2 -1.99,-2h-8L4,8v12c0,1.1 0.9,2 2,2h12.01c1.1,0
+                          1.99,-0.9 1.99,-2l-0.01,-16zM9,19L7,19v-2h2v2zM17,19h-2v-2h2v2zM9,15L7,
+                          15v-4h2v4zM13,19h-2v-4h2v4zM13,13h-2v-2h2v2zM17,15h-2v-4h2v4z"/>
+</vector>
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index afd48ae..683aaec 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -101,7 +101,7 @@ public final class SearchIndexableResources {
                         Ranking.getRankForClassName(SimSettings.class.getName()),
                         NO_DATA_RES_ID,
                         SimSettings.class.getName(),
-                        R.drawable.ic_sim_sd));
+                        R.drawable.ic_settings_sim));
 
         sResMap.put(DataUsageSummary.class.getName(),
                 new SearchIndexableResource(
-- 
cgit v1.1


From 203e6d58f40e66da3ba09cc264cab243a5b17314 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Sat, 14 May 2016 11:18:01 +0200
Subject: Automatic translation import

Change-Id: I7ee9dc842c846c2177383128a5a13e9fbb69b63c
---
 res/values-ast-rES/cm_strings.xml | 56 +++++++++++++++++++++++++++++++++++++++
 res/values-bg/cm_strings.xml      |  6 ++---
 res/values-nl/cm_strings.xml      |  2 ++
 res/values-ru/cm_strings.xml      |  2 --
 res/values-sr/cm_strings.xml      |  1 +
 5 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 351b489..1d0d6ca 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -47,6 +47,7 @@
   <!-- About phone screen, Device name -->
   <string name="device_name">Nome del preséu</string>
   <!-- About phone screen, CyanogenMod Api Level -->
+  <string name="mod_api_level">Nivel d\'API CyanogenMod</string>
   <string name="mod_api_level_default">Desconocida</string>
   <!-- About phone screen, build date -->
   <string name="build_date">Data de compilación</string>
@@ -101,6 +102,7 @@
   <string name="rename_dialog_hint">Introduz el nome del perfil</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Restablecer</string>
+  <string name="profile_reset_message">¿Desaniciar tolos perfiles y grupos d\'aplicaciones creaos y reafitar valores?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">¿Desaniciar esta aplicación?</string>
   <!-- Profile network mode -->
@@ -250,6 +252,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="notification_light_use_multiple_leds">Múltiples LEDs</string>
   <string name="keywords_lights_brightness_level">amatagar el rellumu de los leds</string>
   <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Axustes de lluz</string>
+  <string name="notification_light_no_apps_summary">P\'amestar control d\'aplicaciones, activa «%1$s» y primi «\u002b» na barra de menú</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuración Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -281,6 +285,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_summaries_modify_call_log">camudar el rexistru de llamaes</string>
   <string name="app_ops_summaries_read_calendar">lleer calendariu</string>
   <string name="app_ops_summaries_modify_calendar">modificar calendariu</string>
+  <string name="app_ops_summaries_wifi_scan">Escanéu Wi-Fi</string>
   <string name="app_ops_summaries_cell_scan">guetar redes</string>
   <string name="app_ops_summaries_call_phone">Llamar per teléfonu</string>
   <string name="app_ops_summaries_read_sms">lleer SMS</string>
@@ -352,6 +357,15 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_labels_toast_window">Amosar notificaciones emerxentes</string>
   <string name="app_ops_labels_project_media">Proyeutu Media</string>
   <string name="app_ops_labels_activate_vpn">Activar VPN</string>
+  <string name="app_ops_labels_use_sip">Usar SIP</string>
+  <string name="app_ops_labels_make_call">Facer llamada</string>
+  <string name="app_ops_labels_use_fingerprint">Usar buelga</string>
+  <string name="app_ops_labels_turn_screen_on">Prender pantalla</string>
+  <string name="app_ops_labels_get_accounts">Consiguir cuentes</string>
+  <string name="app_ops_labels_toggle_wifi">Alternar Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Alternar bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Aniciar nel arranque</string>
+  <string name="app_ops_labels_toggle_nfc">Alternar NFC</string>
   <string name="app_ops_labels_superuser">Accesu alministrativu</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Permitíu</string>
@@ -516,7 +530,11 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="live_display_color_profile_natural_title">Natural</string>
   <string name="live_display_color_profile_dynamic_title">Dinámicu</string>
   <string name="live_display_color_profile_cinema_title">Cine</string>
+  <string name="live_display_color_profile_cinema_summary">Reproducción de color perfeuta pa videu</string>
   <string name="live_display_color_profile_astronomy_title">Astronomía</string>
+  <string name="live_display_color_profile_photography_title">Fotografía</string>
+  <string name="live_display_color_profile_photography_summary">Reproducción de color perfeuta pa semeyes</string>
+  <string name="live_display_color_profile_basic_summary">Usa la pantalla ensin calibrar</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seleutor d\'iconu</string>
   <string name="ime_switcher_notify_summary">Amosar l\'iconu de seleición del métodu d\'entrada</string>
@@ -620,6 +638,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="status_bar_battery_percentage_text_inside">Dientro l\'iconu</string>
   <string name="status_bar_battery_percentage_text_next">Al llau del iconu</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">Iconos de barra d\'estáu</string>
+  <string name="status_bar_icons_summary">Contola qu\'iconos de barra d\'estáu s\'amuesen</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Bloquiar eventos táctiles</string>
   <string name="edge_gesture_service_summary">Nun unviar a les aplicaciones eventos táctiles de la barra d\'estáu y de navegación</string>
@@ -654,12 +674,15 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Amosar visualizador de música</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_summary">Calca p\'habilitar la pantalla de bloquéu</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Habilitóse la pantalla de bloquéu!</string>
   <!-- Battery saver -->
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">Habilitar los perfiles por aplicación</string>
   <string name="autoperf_summary">Escoyer automáticamente\'l mou de batería afayadizu pa delles aplicaciones</string>
   <string name="perf_profile_title">Mou batería</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Apps aniciaes nel arranque</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Tonu de notificación</string>
   <!-- Advanced reboot options -->
@@ -752,14 +775,20 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="menu_hidden_apps_delete">Reaniciar</string>
   <string name="menu_hidden_apps_reset_lock">Reanicia\'l patrón de bloquéu</string>
   <string name="protected_apps">Apps protexíes</string>
+  <string name="protected_apps_summary">Xestiona qu\'aplicaciones s\'anubren darrera d\'un bloquéu de seguranza</string>
   <string name="saving_protected_components">Guardando l\'estáu del componente\u2026</string>
   <string name="pa_login_username_hint">Nome d\'usuariu (corréu-e)</string>
   <string name="pa_login_password_hint">Contraseña</string>
   <string name="pa_login_submit_button">Aniciar sesión</string>
   <string name="pa_login_checking_password">Comprobando cuenta\u2026</string>
   <string name="pa_login_incorrect_login">Conexón incorreuta</string>
+  <string name="pa_pattern_or_fingerprint_header">Tien de dibuxase un patrón o usar una buelga pa desbloquiar</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Collaboradores</string>
+  <string name="contributor_info_msg">
+        <![CDATA[<b>Nome:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
+                 <b>Nomatu:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
+                 <b>Unvios:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Soníos</string>
   <string name="notification_manager">Avisos</string>
   <string name="lockscreen_settings">Pantalla de bloquéu</string>
@@ -770,18 +799,31 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="title_general">Xeneral</string>
   <string name="advanced">Avanzáu</string>
   <string name="link_volume_option_title">Enllazar volume de llamada y notificaciones</string>
+  <string name="lcd_density_prompt_message">Quiciabes delles aplicaciones nun furrulen nun DPI non estándar.\n\nEsto reaniciará\'l to preséu.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">Númberu teléfonu PPP d\'APN</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> ta <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">deshabilitada</string>
   <string name="sim_missing">ausente o defeutuosa</string>
+  <string name="sim_enabler_need_disable_sim">Desactivaráse la tarxeta SIM. ¿Quies siguir?</string>
+  <string name="sim_enabler_will_disable_sim_title">Atención</string>
   <string name="sim_enabler_airplane_on">Nun pue facese la operación entrín el mou avión tea activáu.</string>
   <string name="sim_enabler_in_call">Nun pue facese la operación entrín teas llamando.</string>
   <string name="sim_enabler_both_inactive">Nun puen deshabilitase toles tarxetes SIM</string>
+  <string name="sim_enabler_enabling">Activando\u2026</string>
+  <string name="sim_enabler_disabling">Desactivando\u2026</string>
+  <string name="sub_activate_success">Activóse la SIM.</string>
+  <string name="sub_activate_failed">Falló l\'activación.</string>
+  <string name="sub_deactivate_success">Desactivóse la SIM.</string>
+  <string name="sub_deactivate_failed">Falló la desactivación.</string>
   <string name="primary_sub_select_title">Soscripción 3G/LTE por defeutu</string>
   <!-- MSIM SIM status -->
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">recordatorios</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -792,8 +834,10 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="ic_code_model">Modelu: %1$s</string>
   <string name="ic_code_full">IC: %1$s</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Tiempu d\'usu:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- Factory reset strings -->
@@ -803,9 +847,13 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">Enxamás</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minutu</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Habilita y configura les pantalles de bloquéu animaes</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Axustes</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
@@ -817,7 +865,15 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="restrict_app_wlan_summary">Evita que l\'aplicación use la conexón de datos Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_summary">Evita que l\'aplicación use conexón de datos móviles</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Xeneral</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="mobile_data_alert_summary">Avisa cuando l\'aplicación use una cantidá grande de datos</string>
+  <string name="restrict_cellular_access_summary">Deshabilita l\'accesu de datos en redes móviles</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de rede</string>
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 48156c5..cd8d374 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1001,7 +1001,7 @@
   <string name="weather_settings_no_services_prompt">Няма инсталиран доставчик на време</string>
   <string name="weather_settings_button">Настройки на доставчика</string>
   <string name="weather_settings_activity_not_found">Неуспешно стартиране на меню \"Настройки\" на този доставчик</string>
-  <string name="weather_settings_add_weather_provider">Добавяне на доставчик на време</string>
+  <string name="weather_settings_add_weather_provider">Добавяне на доставчик</string>
   <string name="weather_settings_general_settings_title">Общи</string>
   <string name="weather_settings_providers_title">Доставчици</string>
   <string name="weather_settings_temp_units_title">Температурни единици</string>
@@ -1016,8 +1016,8 @@
   <string name="mobile_data_alert_summary">Уведоми, когато приложението използва значително количество данни</string>
   <string name="data_usage_menu_enable_data_alerts">Разреши предупреждения за използване на данни</string>
   <string name="data_usage_menu_disable_data_alerts">Забрани предупреждения за използване на данни</string>
-  <string name="data_usage_menu_reset_stats">Статистиката на батерията ще бъде нулирана</string>
-  <string name="reset_data_stats_msg">Това ще изчисти всички минали и настоящи данни за проследяване</string>
+  <string name="data_usage_menu_reset_stats">Нулиране на мобилните данни</string>
+  <string name="reset_data_stats_msg">Това ще изчисти всички събрани статистичиски данни</string>
   <string name="reset_stats_confirm">Потвърдете</string>
   <string name="restrict_cellular_access_title">Ограничи достъпа до мобилни данни</string>
   <string name="restrict_cellular_access_summary">Забрани достъпа до данни на клетъчни мрежи</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index a51ee12..27d49c6 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -992,5 +992,7 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Algemeen</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 1bf2cde..38a1e52 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1006,8 +1006,6 @@
   <string name="weather_settings_general_settings_title">Общие</string>
   <string name="weather_settings_providers_title">Провайдеры</string>
   <string name="weather_settings_temp_units_title">Единица температуры</string>
-  <string name="weather_settings_temp_celsius">По Цельсию</string>
-  <string name="weather_settings_temp_fahrenheit">По Фаренгейту</string>
   <string name="weather_settings_keyword">погода</string>
   <string name="background_data_access">Доступ к фоновым данным</string>
   <string name="allow_background_both">Использовать моб. данные и Wi\u2011Fi</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 624a73d..683ccb6 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1003,6 +1003,7 @@
   <string name="weather_settings_button">Поставке добављача</string>
   <string name="weather_settings_activity_not_found">Није могуће покренути подешавање менија овог добављача</string>
   <string name="weather_settings_general_settings_title">Опште</string>
+  <string name="weather_settings_keyword">време</string>
   <string name="background_data_access">Приступ подацима у позадини</string>
   <string name="allow_background_both">Преко мрежних података &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Само преко Wi\u2011Fi</string>
-- 
cgit v1.1


From aca99cc325b82be46caa4685e3fb2e0fa99bf38e Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Sun, 15 May 2016 02:47:33 +0200
Subject: Automatic translation import

Change-Id: Ibe9208e0bacb2af41239bc770df6b1b87df67264
---
 res/values-af/cm_strings.xml      | 15 +++++++++++++++
 res/values-ar/cm_strings.xml      | 15 +++++++++++++++
 res/values-as-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-ast-rES/cm_strings.xml | 15 +++++++++++++++
 res/values-az-rAZ/cm_strings.xml  | 15 +++++++++++++++
 res/values-be/cm_strings.xml      | 15 +++++++++++++++
 res/values-bg/cm_strings.xml      | 15 +++++++++++++++
 res/values-bn-rBD/cm_strings.xml  |  1 +
 res/values-ca/cm_strings.xml      | 15 +++++++++++++++
 res/values-cs/cm_strings.xml      | 15 +++++++++++++++
 res/values-da/cm_strings.xml      | 15 +++++++++++++++
 res/values-de/cm_strings.xml      | 15 +++++++++++++++
 res/values-el/cm_strings.xml      | 15 +++++++++++++++
 res/values-en-rAU/cm_strings.xml  |  3 +++
 res/values-en-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-eo/cm_strings.xml      | 15 +++++++++++++++
 res/values-es-rUS/cm_strings.xml  | 15 +++++++++++++++
 res/values-es/cm_strings.xml      | 15 +++++++++++++++
 res/values-et-rEE/cm_strings.xml  | 15 +++++++++++++++
 res/values-eu-rES/cm_strings.xml  | 15 +++++++++++++++
 res/values-fa/cm_strings.xml      | 15 +++++++++++++++
 res/values-fi/cm_strings.xml      | 15 +++++++++++++++
 res/values-fr/cm_strings.xml      | 15 +++++++++++++++
 res/values-gu-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-hi/cm_strings.xml      | 15 +++++++++++++++
 res/values-hr/cm_strings.xml      | 15 +++++++++++++++
 res/values-hu/cm_strings.xml      | 15 +++++++++++++++
 res/values-in/cm_strings.xml      | 15 +++++++++++++++
 res/values-it/cm_strings.xml      | 15 +++++++++++++++
 res/values-iw/cm_strings.xml      | 15 +++++++++++++++
 res/values-ja/cm_strings.xml      | 15 +++++++++++++++
 res/values-kn-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-ko/cm_strings.xml      | 15 +++++++++++++++
 res/values-ku/cm_strings.xml      |  3 +++
 res/values-lb/cm_strings.xml      | 15 +++++++++++++++
 res/values-lt/cm_strings.xml      | 15 +++++++++++++++
 res/values-lv/cm_strings.xml      |  1 +
 res/values-ml-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-mr-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-nb/cm_strings.xml      | 15 +++++++++++++++
 res/values-nl/cm_strings.xml      | 15 +++++++++++++++
 res/values-or-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-pl/cm_strings.xml      | 15 +++++++++++++++
 res/values-pt-rBR/cm_strings.xml  | 15 +++++++++++++++
 res/values-pt-rPT/cm_strings.xml  | 15 +++++++++++++++
 res/values-ro/cm_strings.xml      | 15 +++++++++++++++
 res/values-ru/cm_strings.xml      | 15 +++++++++++++++
 res/values-si-rLK/cm_strings.xml  |  1 +
 res/values-sk/cm_strings.xml      | 15 +++++++++++++++
 res/values-sl/cm_strings.xml      | 15 +++++++++++++++
 res/values-sr/cm_strings.xml      | 15 +++++++++++++++
 res/values-sv/cm_strings.xml      | 15 +++++++++++++++
 res/values-ta-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-te-rIN/cm_strings.xml  | 15 +++++++++++++++
 res/values-th/cm_strings.xml      | 15 +++++++++++++++
 res/values-tr/cm_strings.xml      | 15 +++++++++++++++
 res/values-ug/cm_strings.xml      | 15 +++++++++++++++
 res/values-uk/cm_strings.xml      | 15 +++++++++++++++
 res/values-vi/cm_strings.xml      | 15 +++++++++++++++
 res/values-zh-rCN/cm_strings.xml  | 15 +++++++++++++++
 res/values-zh-rHK/cm_strings.xml  | 15 +++++++++++++++
 res/values-zh-rTW/cm_strings.xml  | 15 +++++++++++++++
 62 files changed, 864 insertions(+)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 313b064..fad3101 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Spesifiseer die streek-kode vir Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Daar was a probleem om die streek kode te verander.</string>
+  <string name="wifi_countrycode_us">Verenigde State</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Duitsland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Rusland</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Sjina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Suid Afrika, Turkye</string>
+  <string name="wifi_countrycode_sg">Israel, Singapoer</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Verwyder</string>
   <string name="profile_action_none">Laat onveranderd</string>
@@ -572,6 +584,9 @@
   <string name="saturation_str">Versadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standaard</string>
+  <string name="screen_color_vivid">Lewendig</string>
+  <string name="screen_color_custom">Persoonlik</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimaliseer jou skerm gebaseer op die tyd van die dag en die omringende omstandighede om leesbaarheid te verbeter en verminder oogspanning</string>
   <string name="live_display_mode">Skerm modus</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 890fd43..2cdffac 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -177,6 +177,18 @@
   <string name="wifi_setting_countrycode_summary">تحديد رمز الواي فاي للمنطقة</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">هناك مشكلة في تحديد رمز المنطقة.</string>
+  <string name="wifi_countrycode_us">الولايات المتحدة</string>
+  <string name="wifi_countrycode_ca">كندا، تايوان</string>
+  <string name="wifi_countrycode_de">ألمانيا</string>
+  <string name="wifi_countrycode_gb">أوروبا</string>
+  <string name="wifi_countrycode_jp">اليابان، روسيا</string>
+  <string name="wifi_countrycode_au">أستراليا</string>
+  <string name="wifi_countrycode_cn">الصين</string>
+  <string name="wifi_countrycode_kr">كوريا</string>
+  <string name="wifi_countrycode_tr">جنوب أفريقيا وتركيا</string>
+  <string name="wifi_countrycode_sg">إسرائيل، سنغافورة</string>
+  <string name="wifi_countrycode_br">البرازيل</string>
+  <string name="wifi_countrycode_in">الهند</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">حذف</string>
   <string name="profile_action_none">يبقى دون تغيير</string>
@@ -578,6 +590,9 @@
   <string name="saturation_str">التشبع: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">التباين: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">الكثافة: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">قياسى</string>
+  <string name="screen_color_vivid">حي</string>
+  <string name="screen_color_custom">مخصص</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">تحسين الشاشة بحسب الوقت من اليوم والظروف المحيطة لتسهيل القراءة وتقليل إجهاد العين</string>
   <string name="live_display_mode">نمط العرض</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 83e7f9d..8063d5d 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">ৱাই\u2011ফাই ৰ বাবে অঞ্চল কোড নিৰ্দিষ্ট কৰক</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">অঞ্চল কোড ছেটিং কৰাত এটা সমস্যা হৈছিল</string>
+  <string name="wifi_countrycode_us">যুক্তৰাষ্ট্ৰ</string>
+  <string name="wifi_countrycode_ca">কানাডা, টাইৱান</string>
+  <string name="wifi_countrycode_de">জাৰ্মানী</string>
+  <string name="wifi_countrycode_gb">ইউৰোপ</string>
+  <string name="wifi_countrycode_jp">জাপান, ৰাছিয়া</string>
+  <string name="wifi_countrycode_au">অষ্ট্ৰেলিয়া</string>
+  <string name="wifi_countrycode_cn">চীন</string>
+  <string name="wifi_countrycode_kr">কোৰিয়া</string>
+  <string name="wifi_countrycode_tr">দক্ষিণ আফ্ৰিকা, তুৰ্কী</string>
+  <string name="wifi_countrycode_sg">ইজৰাইল, চিংগাপুৰ</string>
+  <string name="wifi_countrycode_br">ব্ৰাজিল</string>
+  <string name="wifi_countrycode_in">ভাৰত</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">মচি দিয়া</string>
   <string name="profile_action_none">অপৰিবৰ্তিত ৰাখক</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">ৰঙৰ গাঢ়তা: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বিষমতা: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্ৰতা: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">ষ্টেণ্ডাৰ্ড</string>
+  <string name="screen_color_vivid">উজ্জ্বল</string>
+  <string name="screen_color_custom">কাষ্টম</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">পঠনযোগ্যতা আৰু চকুৰ ওপৰত চাপ হ্ৰাস কৰিবলৈ দিনৰ সময়ৰ আধাৰত আপোনাৰ স্ক্ৰীণ আৰু পাৰিপাৰ্শ্বিক অৱস্থা অপ্টিমাইজ কৰক</string>
   <string name="live_display_mode">প্রদর্শন মোড</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 1d0d6ca..63cd04d 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -168,6 +168,18 @@
   <string name="wifi_setting_countrycode_summary">Especificar el códigu de rexón pa Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Hebo un fallu al afitar el códigu de rexón.</string>
+  <string name="wifi_countrycode_us">Estaos Xuníos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwán</string>
+  <string name="wifi_countrycode_de">Alemaña</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Xapón, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sudáfrica, Tuquía</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Desaniciar</string>
   <string name="profile_action_none">Dexar ensin cambeos</string>
@@ -517,6 +529,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidá: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Estándar</string>
+  <string name="screen_color_vivid">Intensu</string>
+  <string name="screen_color_custom">Por defeutu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiza la to pantalla basándose na hora\'l día y les condiciones ambientales p\'ameyorar la llexibilidá y amenorgar el cansanciu de güeyos</string>
   <string name="live_display_color_temperature_title">Temperatura de color</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index e005120..518270f 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -163,6 +163,18 @@
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi üçün bölgə kodu daxil edin</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_countrycode_us">Birləşmiş Ştatlar</string>
+  <string name="wifi_countrycode_ca">Kanada, Tayvan</string>
+  <string name="wifi_countrycode_de">Almaniya</string>
+  <string name="wifi_countrycode_gb">Avropa</string>
+  <string name="wifi_countrycode_jp">Yaponiya, Rusiya</string>
+  <string name="wifi_countrycode_au">Avstraliya</string>
+  <string name="wifi_countrycode_cn">Çin</string>
+  <string name="wifi_countrycode_kr">Koreya</string>
+  <string name="wifi_countrycode_tr">Cənubi Afrika, Türkiyə</string>
+  <string name="wifi_countrycode_sg">İsrail, Sinqapur</string>
+  <string name="wifi_countrycode_br">Braziliya</string>
+  <string name="wifi_countrycode_in">Hindistan</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Sil</string>
   <string name="profile_action_none">Dəyişdirmədən tərk et</string>
@@ -472,6 +484,9 @@
   <string name="saturation_str">Doydurma: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Təzad: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Gərginlik: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standart</string>
+  <string name="screen_color_vivid">Canlı</string>
+  <string name="screen_color_custom">Xüsusi</string>
   <!-- LiveDisplay -->
   <string name="live_display_day">Gündüz</string>
   <string name="live_display_night">Gecə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 64342b4..a6adad9 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Пакажыце код рэгіёну Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Пры наладзе кода рэгіёна Wi-Fi паўстала памылка.</string>
+  <string name="wifi_countrycode_us">ЗША</string>
+  <string name="wifi_countrycode_ca">Канада, Тайвань</string>
+  <string name="wifi_countrycode_de">Германія</string>
+  <string name="wifi_countrycode_gb">Еўропа</string>
+  <string name="wifi_countrycode_jp">Японія, Расія</string>
+  <string name="wifi_countrycode_au">Аўстралія</string>
+  <string name="wifi_countrycode_cn">Кітай</string>
+  <string name="wifi_countrycode_kr">Карэя</string>
+  <string name="wifi_countrycode_tr">Паўднёвая Афрыка, Турцыя</string>
+  <string name="wifi_countrycode_sg">Ізраіль, Сінгапур</string>
+  <string name="wifi_countrycode_br">Бразілія</string>
+  <string name="wifi_countrycode_in">Індыя</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Выдаліць</string>
   <string name="profile_action_none">Пакінуць без змянення</string>
@@ -568,6 +580,9 @@
   <string name="saturation_str">Насычанасць: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Кантраснасць: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтэнсіўнасць: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Стандартны</string>
+  <string name="screen_color_vivid">Яскравы</string>
+  <string name="screen_color_custom">Уласная</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Падладжваць экран на аснове часу сутак і асвятлення, каб палепшыць чытальнасць і зменшыць стомленасць вачэй</string>
   <string name="live_display_mode">Рэжым экрана</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index cd8d374..186fc7c 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Укажете кода на региона за Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Възникна проблем при настройката на кода на региона.</string>
+  <string name="wifi_countrycode_us">САЩ</string>
+  <string name="wifi_countrycode_ca">Канада, Тайван</string>
+  <string name="wifi_countrycode_de">Германия</string>
+  <string name="wifi_countrycode_gb">Европа</string>
+  <string name="wifi_countrycode_jp">Япония, Русия</string>
+  <string name="wifi_countrycode_au">Австралия</string>
+  <string name="wifi_countrycode_cn">Китай</string>
+  <string name="wifi_countrycode_kr">Корея</string>
+  <string name="wifi_countrycode_tr">Южна Африка, Турция</string>
+  <string name="wifi_countrycode_sg">Израел, Сингапур</string>
+  <string name="wifi_countrycode_br">Бразилия</string>
+  <string name="wifi_countrycode_in">Индия</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Изтриване</string>
   <string name="profile_action_none">Остави непроменен</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Наситеност: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
+  <string name="screen_color_standard">Стандартен</string>
+  <string name="screen_color_vivid">Ярък</string>
+  <string name="screen_color_custom">По избор</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизира настройките на екрана, въз основа на времето от деня и условията на околната среда за да се подобри четливостта и да намали умората на очите</string>
   <string name="live_display_mode">Режим на екрана</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 8c1e923..44e6c77 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -391,6 +391,7 @@
   <string name="saturation_str">সম্পৃক্তিঃ <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বৈপরীত্যঃ <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্রতাঃ <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_custom">পছন্দসই</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index f8a3341..e29dff8 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Especifica el codi de regió per al Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Hi ha un problema al establir el codi de regió.</string>
+  <string name="wifi_countrycode_us">Estats Units</string>
+  <string name="wifi_countrycode_ca">Canadà, Taiwan</string>
+  <string name="wifi_countrycode_de">Alemanya</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Rússia</string>
+  <string name="wifi_countrycode_au">Austràlia</string>
+  <string name="wifi_countrycode_cn">Xina</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sud-àfrica, Turquia</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">Índia</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Esborra</string>
   <string name="profile_action_none">Deixa sense canvis</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturació: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitat: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Estàndard</string>
+  <string name="screen_color_vivid">Viva</string>
+  <string name="screen_color_custom">Personalitzat</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimitza la teva pantalla basant-se en l\'hora del dia i les condicions ambientals per millorar la llegibilitat i reduir la fatiga ocular</string>
   <string name="live_display_mode">Mode de pantalla</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 0f3c83e..24ed282 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -174,6 +174,18 @@
   <string name="wifi_setting_countrycode_summary">Zadejte kód regionu Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Při nastavení kódu regionu došlo k problému.</string>
+  <string name="wifi_countrycode_us">Spojené státy</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Německo</string>
+  <string name="wifi_countrycode_gb">Evropa</string>
+  <string name="wifi_countrycode_jp">Japonsko, Rusko</string>
+  <string name="wifi_countrycode_au">Austrálie</string>
+  <string name="wifi_countrycode_cn">Čína</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Jižní Afrika, Turecko</string>
+  <string name="wifi_countrycode_sg">Izrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brazílie</string>
+  <string name="wifi_countrycode_in">Indie</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Smazat</string>
   <string name="profile_action_none">Ponechat nezměněné</string>
@@ -575,6 +587,9 @@
   <string name="saturation_str">Sytost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standardní</string>
+  <string name="screen_color_vivid">Živé</string>
+  <string name="screen_color_custom">Vlastní</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovat obrazovku podle denní doby a okolních podmínek pro lepší čitelnost a snížení namáhání očí</string>
   <string name="live_display_mode">Režim zobrazení</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 081c755..dd17d6b 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Angiv regionskoden for Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Der opstod et problem med indstillingen af regionskoden.</string>
+  <string name="wifi_countrycode_us">USA</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Tyskland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Rusland</string>
+  <string name="wifi_countrycode_au">Australien</string>
+  <string name="wifi_countrycode_cn">Kina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Sydafrika, Tyrkiet</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brasilien</string>
+  <string name="wifi_countrycode_in">Indien</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Slet</string>
   <string name="profile_action_none">Efterlad uændret</string>
@@ -568,6 +580,9 @@
   <string name="saturation_str">Farvemætning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Levende</string>
+  <string name="screen_color_custom">Egen</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimér din skærm baseret på tidspunktet på dagen, samt omgivelserne, for at forbedre læsbarheden og nedsætte anstrengelsen af øjnene</string>
   <string name="live_display_mode">Visningstilstand</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 35c1aa7..3482514 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">WLAN-Ländercode festlegen</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Beim Festlegen des WLAN-Ländercodes ist ein Problem aufgetreten.</string>
+  <string name="wifi_countrycode_us">USA</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Deutschland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Russland</string>
+  <string name="wifi_countrycode_au">Australien</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Südafrika, Türkei</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasilien</string>
+  <string name="wifi_countrycode_in">Indien</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Löschen</string>
   <string name="profile_action_none">Unverändert lassen</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Sättigung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensität: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Lebhaft</string>
+  <string name="screen_color_custom">Benutzerdefiniert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiert Ihren Bildschirm basierend auf der Tageszeit und den Umgebungsbedingungen, um die Lesbarkeit zu verbessern und die Ermüdung der Augen zu mildern</string>
   <string name="live_display_mode">Bildschirmmodus</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index e799e34..e0ecab5 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Προσδιορίστε τον κωδικό περιοχής για το Wi-Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Πρόβλημα κατά τη ρύθμιση του κωδικού περιοχής.</string>
+  <string name="wifi_countrycode_us">Ηνωμένες Πολιτείες</string>
+  <string name="wifi_countrycode_ca">Καναδάς, Ταϊβάν</string>
+  <string name="wifi_countrycode_de">Γερμανία</string>
+  <string name="wifi_countrycode_gb">Ευρώπη</string>
+  <string name="wifi_countrycode_jp">Ιαπωνία, Ρωσία</string>
+  <string name="wifi_countrycode_au">Αυστραλία</string>
+  <string name="wifi_countrycode_cn">Κίνα</string>
+  <string name="wifi_countrycode_kr">Κορέα</string>
+  <string name="wifi_countrycode_tr">Νότια Αφρική, Τουρκία</string>
+  <string name="wifi_countrycode_sg">Ισραήλ, Σιγκαπούρη</string>
+  <string name="wifi_countrycode_br">Βραζιλία</string>
+  <string name="wifi_countrycode_in">Ινδία</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Διαγραφή</string>
   <string name="profile_action_none">Να μη γίνει αλλαγή</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Κορεσμός: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Αντίθεση: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Ένταση: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Κανονικό</string>
+  <string name="screen_color_vivid">Ζωντανό</string>
+  <string name="screen_color_custom">Προσαρμοσμένο</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Βελτιστοποίηση της οθόνης σας με βάση την ώρα της ημέρας και τις συνθήκες περιβάλλοντος για βελτίωση της αναγνωσιμότητας και μείωση της καταπόνησης των ματιών</string>
   <string name="live_display_mode">Λειτουργία οθόνης</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index c8d107a..edfcd59 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -485,6 +485,9 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Vivid</string>
+  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 0d784fa..7d5e118 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Specify the region code for Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">There was a problem setting the region code.</string>
+  <string name="wifi_countrycode_us">United States</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Germany</string>
+  <string name="wifi_countrycode_gb">Europe</string>
+  <string name="wifi_countrycode_jp">Japan, Russia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">South Africa, Turkey</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brazil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Delete</string>
   <string name="profile_action_none">Leave unchanged</string>
@@ -515,6 +527,9 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Vivid</string>
+  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 9e681b6..f28d4e3 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">Precizigi vifian regionan kodon</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Problemo okazis dum ŝaltado de regiona kodo.</string>
+  <string name="wifi_countrycode_us">Usono</string>
+  <string name="wifi_countrycode_ca">Kanado, Tajvano</string>
+  <string name="wifi_countrycode_de">Germanio</string>
+  <string name="wifi_countrycode_gb">Eŭropo</string>
+  <string name="wifi_countrycode_jp">Japanio, Rusio</string>
+  <string name="wifi_countrycode_au">Aŭstralio</string>
+  <string name="wifi_countrycode_cn">Ĉinio</string>
+  <string name="wifi_countrycode_kr">Koreujo</string>
+  <string name="wifi_countrycode_tr">Sudafriko, Turkio</string>
+  <string name="wifi_countrycode_sg">Israelo, Singapuro</string>
+  <string name="wifi_countrycode_br">Brazilo</string>
+  <string name="wifi_countrycode_in">Barato</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Foriga klavo</string>
   <string name="profile_action_none">Nuligi la ŝanĝojn</string>
@@ -498,6 +510,9 @@
   <string name="saturation_str">Satureco: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenseco: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Normala</string>
+  <string name="screen_color_vivid">Viva</string>
+  <string name="screen_color_custom">Propra</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimumigi vian ekranon laŭ la horo kaj la ĉirkaŭaĵa etoso por plibonigi la legebecon kaj malhelpi okulan malkomforton</string>
   <string name="live_display_mode">Vidiga reĝimo</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 3e7a414..f41921b 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Especificar el código de región para Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ocurrió un error al establecer el código de región.</string>
+  <string name="wifi_countrycode_us">Estados Unidos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwán</string>
+  <string name="wifi_countrycode_de">Alemania</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japón, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sudáfrica, Turquía</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Eliminar</string>
   <string name="profile_action_none">Dejar sin cambios</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Estándar</string>
+  <string name="screen_color_vivid">Intenso</string>
+  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 6abbe7a..9bfe6df 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Especificar el código de región Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ocurrió un error al establecer el código de región.</string>
+  <string name="wifi_countrycode_us">Estados Unidos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwán</string>
+  <string name="wifi_countrycode_de">Alemania</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japón, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sudáfrica, Turquía</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Eliminar</string>
   <string name="profile_action_none">Dejar sin cambios</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Estándar</string>
+  <string name="screen_color_vivid">Intenso</string>
+  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index e475aaa..74badf8 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">Täpsusta  Wi\u2011Fi regioonikoodi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ilmnes probleem piirkonna koodi salvestamisel.</string>
+  <string name="wifi_countrycode_us">Ameerika Ühendriigid</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Saksamaa</string>
+  <string name="wifi_countrycode_gb">Euroopa</string>
+  <string name="wifi_countrycode_jp">Jaapan, Venemaa</string>
+  <string name="wifi_countrycode_au">Austraalia</string>
+  <string name="wifi_countrycode_cn">Hiina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Lõuna-Aafrika, Türgi</string>
+  <string name="wifi_countrycode_sg">Iisrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brasiilia</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Kustuta</string>
   <string name="profile_action_none">Jäta muutmata</string>
@@ -506,6 +518,9 @@
   <string name="saturation_str">Küllastus: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiivsus: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Ergas</string>
+  <string name="screen_color_custom">Kohandatud</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiseeri oma ekraan vastavalt päeva ajale ja ümbritsevatele tingimustele, et parandada loetavust ning vähendada silmade pinget</string>
   <string name="live_display_mode">Ekraani režiim</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 5416731..9d4fe2d 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Zehaztu Wi\u2011Fi lurralde kodea</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Arazo bat egon da lurralde kodea ezartzean.</string>
+  <string name="wifi_countrycode_us">Estatu Batuak</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Alemania</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japonia, Errusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Txina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Hego Afrika, Turkia</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Ezabatu</string>
   <string name="profile_action_none">Laga aldatu gabe</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturazioa:<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastea:<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intentsitatea:<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Estandarra</string>
+  <string name="screen_color_vivid">Bizia</string>
+  <string name="screen_color_custom">Lehenetsia</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizatu zure pantaila eguneko orduaren eta inguruneko baldintzen arabera irakurgarritasuna hobetzeko eta begien nekea gutxiagotzeko</string>
   <string name="live_display_mode">Pantaila modua</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index c267f71..cf500f6 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">تعیین کد منطقه‌ای برای وای‌فای</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">مشکلی در تنظیم کد منطقه‌ای وجود داشت.</string>
+  <string name="wifi_countrycode_us">ایالات متحده آمریکا</string>
+  <string name="wifi_countrycode_ca">کانادا، تایوان</string>
+  <string name="wifi_countrycode_de">آلمان</string>
+  <string name="wifi_countrycode_gb">اروپا</string>
+  <string name="wifi_countrycode_jp">ژاپن، روسیه</string>
+  <string name="wifi_countrycode_au">استرالیا</string>
+  <string name="wifi_countrycode_cn">چین</string>
+  <string name="wifi_countrycode_kr">کره جنوبی</string>
+  <string name="wifi_countrycode_tr">آفریقای جنوبی، ترکیه</string>
+  <string name="wifi_countrycode_sg">اسرائیل، سنگاپور</string>
+  <string name="wifi_countrycode_br">برزیل</string>
+  <string name="wifi_countrycode_in">هند</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">حذف</string>
   <string name="profile_action_none">تغییر ندادن</string>
@@ -507,6 +519,9 @@
   <string name="saturation_str">اشباع: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">شدت رنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">استاندارد</string>
+  <string name="screen_color_vivid">واضح</string>
+  <string name="screen_color_custom">شخصی</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">بهینه کردن صفحه بر اساس ساعات روز و شرایط محیطی برای افزایش خوانایی و کاهش خستگی چشم</string>
   <string name="live_display_mode">حالت نمایش</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index ac264e9..1fff8ed 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Aseta Wi\u2011Fin aluekoodi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ongelma aluekoodia asetettaessa.</string>
+  <string name="wifi_countrycode_us">Yhdysvallat</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Saksa</string>
+  <string name="wifi_countrycode_gb">Eurooppa</string>
+  <string name="wifi_countrycode_jp">Japani, Venäjä</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Kiina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Etelä-Afrikka, Turkki</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brasilia</string>
+  <string name="wifi_countrycode_in">Intia</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Poista</string>
   <string name="profile_action_none">Ei muutoksia</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Kylläisyys: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasti: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteetti: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standardi</string>
+  <string name="screen_color_vivid">Eloisa</string>
+  <string name="screen_color_custom">Mukautettu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimoi näyttösi kellonajan ja ympäristöolosuhteiden perusteella parantaaksesi luettavuutta ja vähentääksesi silmien rasitusta</string>
   <string name="live_display_mode">Näyttötila</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 0460cb5..3d7407d 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -174,6 +174,18 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="wifi_setting_countrycode_summary">Indiquer le code région pour le Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Problème lors du réglage du code région.</string>
+  <string name="wifi_countrycode_us">États-Unis</string>
+  <string name="wifi_countrycode_ca">Canada, Taïwan</string>
+  <string name="wifi_countrycode_de">Allemagne</string>
+  <string name="wifi_countrycode_gb">Europe</string>
+  <string name="wifi_countrycode_jp">Japon, Russie</string>
+  <string name="wifi_countrycode_au">Australie</string>
+  <string name="wifi_countrycode_cn">Chine</string>
+  <string name="wifi_countrycode_kr">Corée</string>
+  <string name="wifi_countrycode_tr">Afrique du Sud, Turquie</string>
+  <string name="wifi_countrycode_sg">Israël, Singapour</string>
+  <string name="wifi_countrycode_br">Brésil</string>
+  <string name="wifi_countrycode_in">Inde</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Supprimer</string>
   <string name="profile_action_none">Annuler les modifications</string>
@@ -575,6 +587,9 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="saturation_str">Saturation : <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste : <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensité : <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Vive</string>
+  <string name="screen_color_custom">Personnalisée</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiser votre écran en fonction de l\'heure et des conditions ambiantes pour améliorer la lisibilité et réduire la fatigue oculaire</string>
   <string name="live_display_mode">Mode d\'affichage</string>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 318e3dc..a51f4b8 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi માટે પ્રાંત કોડ વિશિષ્ટપણે જણાવો</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">પ્રાંત કોડ સેટ કરવામાં સમસ્યા થઈ.</string>
+  <string name="wifi_countrycode_us">યુનાઇટેડ સ્ટેટ્સ</string>
+  <string name="wifi_countrycode_ca">કૅનેડા, તાઇવાન</string>
+  <string name="wifi_countrycode_de">જર્મની</string>
+  <string name="wifi_countrycode_gb">યુરોપ</string>
+  <string name="wifi_countrycode_jp">જાપાન, રશિયા</string>
+  <string name="wifi_countrycode_au">ઓસ્ટ્રેલિયા</string>
+  <string name="wifi_countrycode_cn">ચીન</string>
+  <string name="wifi_countrycode_kr">કોરિયા</string>
+  <string name="wifi_countrycode_tr">દક્ષિણ આફ્રિકા, તુર્કી</string>
+  <string name="wifi_countrycode_sg">ઇઝરાયલ, સિંગાપોર</string>
+  <string name="wifi_countrycode_br">બ્રાઝીલ</string>
+  <string name="wifi_countrycode_in">ભારત</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">હટાવો</string>
   <string name="profile_action_none">અપરિવર્તિત રહેવા દો</string>
@@ -572,6 +584,9 @@
   <string name="saturation_str">સંતૃપ્તિ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">કૉન્ટ્રાસ્ટ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ઉત્કટતા: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">પ્રમાણભૂત</string>
+  <string name="screen_color_vivid">વિવિધ</string>
+  <string name="screen_color_custom">કસ્ટમ</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">વાંચન ક્ષમતામાં સુધારો લાવવા અને આંખો પરનો તાણ ઘટાડવા દિવસનો સમય અને વ્યાપક હવામાનનાં આધારે તમારા સ્ક્રીનને અનુકૂળ બનાવો</string>
   <string name="live_display_mode">પ્રદર્શન મોડ</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 39bd234..ee2ad6e 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">वाईफाई के लिए क्षेत्र कोड निर्दिष्ट करें</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">क्षेत्र कोड को सेटअप करते समय समस्या आई।</string>
+  <string name="wifi_countrycode_us">अमरीका</string>
+  <string name="wifi_countrycode_ca">कनाडा, ताइवान</string>
+  <string name="wifi_countrycode_de">जर्मनी</string>
+  <string name="wifi_countrycode_gb">यूरोप</string>
+  <string name="wifi_countrycode_jp">जापान, रूस</string>
+  <string name="wifi_countrycode_au">ऑस्ट्रेलिया</string>
+  <string name="wifi_countrycode_cn">चीन</string>
+  <string name="wifi_countrycode_kr">कोरिया</string>
+  <string name="wifi_countrycode_tr">दक्षिण अफ़्रीका, तुर्की</string>
+  <string name="wifi_countrycode_sg">इजराइल, सिंगापुर</string>
+  <string name="wifi_countrycode_br">ब्राज़ील</string>
+  <string name="wifi_countrycode_in">भारत</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">हटाएँ</string>
   <string name="profile_action_none">अपरिवर्तित छोड़ें</string>
@@ -504,6 +516,9 @@
   <string name="saturation_str">संतृप्ति: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">कोंट्रास्ट: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">मानक</string>
+  <string name="screen_color_vivid">सस्पष्ट</string>
+  <string name="screen_color_custom">मनपसंद</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">दिन के समय और परिवेशी स्थितियों के अनुसार स्क्रीन को इष्टतमीकृत करें ताकि पठनीयता बढ़ें और आँखों पर कम दबाव पड़े</string>
   <string name="live_display_mode">डिस्प्ले मोड</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 33f3377..e68b0e9 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -174,6 +174,18 @@
   <string name="wifi_setting_countrycode_summary">Navedite šifru regije za Wi‑Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Došlo je do problema prilikom postavljanja regionalnog koda.</string>
+  <string name="wifi_countrycode_us">Sjedinjene Američke Države</string>
+  <string name="wifi_countrycode_ca">Kanada, Tajvan</string>
+  <string name="wifi_countrycode_de">Njemačka</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Rusija</string>
+  <string name="wifi_countrycode_au">Australija</string>
+  <string name="wifi_countrycode_cn">Kina</string>
+  <string name="wifi_countrycode_kr">Koreja</string>
+  <string name="wifi_countrycode_tr">Južna Afrika, Turska</string>
+  <string name="wifi_countrycode_sg">Izrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brazil</string>
+  <string name="wifi_countrycode_in">Indija</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Obriši</string>
   <string name="profile_action_none">Ostavi nepromijenjeno</string>
@@ -575,6 +587,9 @@
   <string name="saturation_str">Zasićenost: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Intenzitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standardno</string>
+  <string name="screen_color_vivid">Živopisno</string>
+  <string name="screen_color_custom">Prilagođeno</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Prilagodi zaslon prema dobu dana i okolini za poboljšanje čitljivosti i smanjenju naprezanja očiju</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 94d2da2..a56a73e 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi régió kód megadása</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Hiba történt a régiókód beállítása közben.</string>
+  <string name="wifi_countrycode_us">Amerikai Egyesült Államok</string>
+  <string name="wifi_countrycode_ca">Kanada, Tajvan</string>
+  <string name="wifi_countrycode_de">Németország</string>
+  <string name="wifi_countrycode_gb">Európa</string>
+  <string name="wifi_countrycode_jp">Japán, Oroszország</string>
+  <string name="wifi_countrycode_au">Ausztrália</string>
+  <string name="wifi_countrycode_cn">Kína</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Dél-afrikai Köztársaság, Törökország</string>
+  <string name="wifi_countrycode_sg">Izrael, Szingapúr</string>
+  <string name="wifi_countrycode_br">Brazília</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Törlés</string>
   <string name="profile_action_none">Változatlanul hagy</string>
@@ -572,6 +584,9 @@
   <string name="saturation_str">Telítettség: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontraszt: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzitás: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Hagyományos</string>
+  <string name="screen_color_vivid">Élénk</string>
+  <string name="screen_color_custom">Egyéni</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizálja a képernyőt a napszaknak és a fényviszonyoknak megfelelően, javítva az olvashatóságot és csökkentve a szemek terhelését</string>
   <string name="live_display_mode">Képernyő mód</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index f3e3a95..1f21561 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Tentukan kode wilayah untuk Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ada masalah saat mengatur kode wilayah.</string>
+  <string name="wifi_countrycode_us">Amerika</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Jerman</string>
+  <string name="wifi_countrycode_gb">Eropa</string>
+  <string name="wifi_countrycode_jp">Jepang, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Tiongkok</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Afrika Selatan, Turki</string>
+  <string name="wifi_countrycode_sg">Israel, Singapura</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Hapus</string>
   <string name="profile_action_none">Tinggalkan tanpa perubahan</string>
@@ -573,6 +585,9 @@
   <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standar</string>
+  <string name="screen_color_vivid">Jelas</string>
+  <string name="screen_color_custom">Khusus</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ruangan untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
   <string name="live_display_mode">Modus tampilan</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 7d55a74..f274b53 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Specifica il codice regione per il Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Problema nell\'impostazione del codice regione.</string>
+  <string name="wifi_countrycode_us">Stati Uniti</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Germania</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Giappone, Russia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Cina</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sud Africa, Turchia</string>
+  <string name="wifi_countrycode_sg">Israele, Singapore</string>
+  <string name="wifi_countrycode_br">Brasile</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Elimina</string>
   <string name="profile_action_none">Lascia invariato</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturazione: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensità: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Vivido</string>
+  <string name="screen_color_custom">Personalizzato</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Ottimizza lo schermo in base all\'ora del giorno e alle condizioni ambientali per migliorare la leggibilità e ridurre l\'affaticamento degli occhi</string>
   <string name="live_display_mode">Modalità display</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 0075e3b..74119de 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">ציין קוד אזור עבור Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">אירעה שגיאה בהגדרת הקוד האזורי.</string>
+  <string name="wifi_countrycode_us">ארצות הברית</string>
+  <string name="wifi_countrycode_ca">קנדה, טאיוואן</string>
+  <string name="wifi_countrycode_de">גרמניה</string>
+  <string name="wifi_countrycode_gb">אירופה</string>
+  <string name="wifi_countrycode_jp">יפן, רוסיה</string>
+  <string name="wifi_countrycode_au">אוסטרליה</string>
+  <string name="wifi_countrycode_cn">סין</string>
+  <string name="wifi_countrycode_kr">קוריאה</string>
+  <string name="wifi_countrycode_tr">דרום אפריקה, טורקיה</string>
+  <string name="wifi_countrycode_sg">ישראל, סינגפור</string>
+  <string name="wifi_countrycode_br">ברזיל</string>
+  <string name="wifi_countrycode_in">הודו</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">מחק</string>
   <string name="profile_action_none">השאר ללא שינוי</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">רוויה: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ניגודיות: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">עוצמה: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">רגיל</string>
+  <string name="screen_color_vivid">חי (Vivid)</string>
+  <string name="screen_color_custom">מותאם אישית</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">התאם את מסך מכשירך בהתאם לשעה ולתנאי הסביבה על מנת לשפר את נוחות הקריאה ולהפחית את עייפות העין</string>
   <string name="live_display_mode">מצב תצוגה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index b02476e..2701feb 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fiの地域コードを指定する</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">地域コードの設定中に問題が発生しました。</string>
+  <string name="wifi_countrycode_us">アメリカ合衆国</string>
+  <string name="wifi_countrycode_ca">カナダ、台湾</string>
+  <string name="wifi_countrycode_de">ドイツ</string>
+  <string name="wifi_countrycode_gb">ヨーロッパ</string>
+  <string name="wifi_countrycode_jp">日本、ロシア</string>
+  <string name="wifi_countrycode_au">オーストラリア</string>
+  <string name="wifi_countrycode_cn">中国</string>
+  <string name="wifi_countrycode_kr">韓国</string>
+  <string name="wifi_countrycode_tr">南アフリカ共和国、トルコ</string>
+  <string name="wifi_countrycode_sg">イスラエル、シンガポール</string>
+  <string name="wifi_countrycode_br">ブラジル</string>
+  <string name="wifi_countrycode_in">インド</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">削除</string>
   <string name="profile_action_none">変更しない</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">彩度: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">コントラスト: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">スタンダード</string>
+  <string name="screen_color_vivid">ビビッド</string>
+  <string name="screen_color_custom">カスタム</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">画面を見やすく目を疲れにくくするために時間と周囲の環境に合わせて画面を最適化する</string>
   <string name="live_display_mode">ディスプレイのモード</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 21ea370..033e4a5 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">ವೈ\u2011ಫೈ‍ಗಾಗಿ ಪ್ರದೇಶ ಕೋಡ್ ಸೂಚಿಸಿ</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">ಪ್ರದೇಶ ಕೋಡ್ ಹೊಂದಿಸುವಲ್ಲಿ ಒಂದು ದೋಷವಿದೆ.</string>
+  <string name="wifi_countrycode_us">ಯುನೈಟೆಡ್ ಸ್ಟೇಟ್ಸ್</string>
+  <string name="wifi_countrycode_ca">ಕೆನಡಾ, ತೈವಾನ್</string>
+  <string name="wifi_countrycode_de">ಜರ್ಮನಿ</string>
+  <string name="wifi_countrycode_gb">ಯುರೋಪ್</string>
+  <string name="wifi_countrycode_jp">ಜಪಾನ್, ರಷ್ಯಾ</string>
+  <string name="wifi_countrycode_au">ಆಸ್ಟ್ರೇಲಿಯಾ</string>
+  <string name="wifi_countrycode_cn">ಚೀನಾ</string>
+  <string name="wifi_countrycode_kr">ಕೋರಿಯಾ</string>
+  <string name="wifi_countrycode_tr">ದಕ್ಷಿಣ ಆಫ್ರಿಕಾ, ಟರ್ಕಿ</string>
+  <string name="wifi_countrycode_sg">ಇಸ್ರೇಲ್, ಸಿಂಗಪುರ್</string>
+  <string name="wifi_countrycode_br">ಬ್ರೆಜಿಲ್</string>
+  <string name="wifi_countrycode_in">ಭಾರತ</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ಅಳಿಸು</string>
   <string name="profile_action_none">ಬದಲಾಯಿಸದೆ ಹಾಗೇ ಬಿಡು</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">ಸ್ಯಾಚುರೇಶನ್: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ಕಾಂಟ್ರಾಸ್ಟ್: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ತೀವ್ರತೆ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">ಸ್ಟಾಂಡರ್ಡ್</string>
+  <string name="screen_color_vivid">ಎದ್ದುಕಾಣುವ</string>
+  <string name="screen_color_custom">ಕಸ್ಟಮ್</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ದಿನದ ಸಮಯ ಮತ್ತು ಆಂಬಿಯೆಂಟ್ ಪರಿಸ್ಥಿತಿಯನ್ನು ಆಧಾರಿಸಿ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡುವುದರ ಮೂಲಕ ವಾಚನೀಯತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದರೊಂದಿಗೆ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
   <string name="live_display_mode">ಪ್ರದರ್ಶನ ಮೋಡ್</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 1fe59af..8d38844 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi 지역 코드를 지정하기</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">지역 코드 설정에 문제가 발생했습니다.</string>
+  <string name="wifi_countrycode_us">미국</string>
+  <string name="wifi_countrycode_ca">캐나다, 대만</string>
+  <string name="wifi_countrycode_de">독일</string>
+  <string name="wifi_countrycode_gb">유럽</string>
+  <string name="wifi_countrycode_jp">일본, 러시아</string>
+  <string name="wifi_countrycode_au">호주</string>
+  <string name="wifi_countrycode_cn">중국</string>
+  <string name="wifi_countrycode_kr">대한민국</string>
+  <string name="wifi_countrycode_tr">남아프리카, 터키</string>
+  <string name="wifi_countrycode_sg">이스라엘, 싱가포르</string>
+  <string name="wifi_countrycode_br">브라질</string>
+  <string name="wifi_countrycode_in">인도</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">삭제</string>
   <string name="profile_action_none">변경하지 않음</string>
@@ -573,6 +585,9 @@
   <string name="saturation_str">채도: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">대비: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">강도: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">표준</string>
+  <string name="screen_color_vivid">생생하게</string>
+  <string name="screen_color_custom">사용자 지정</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">가독성을 향상시키고 눈의 피로를 줄이기 위해 주변 환경과 시간에 따라 화면을 최적화</string>
   <string name="live_display_mode">디스플레이 모드</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 4c6d64e..b4a6e35 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -484,6 +484,9 @@
   <string name="saturation_str">تێریی ڕەنگ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کۆنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">توندێتیی ڕەنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">پێوانەی</string>
+  <string name="screen_color_vivid">زیرەکی</string>
+  <string name="screen_color_custom">درووستکراو</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">پاشینەسازی لەسەر شاشەکەت  بەندە بە کاتی ڕۆژ وە مەرجی چاکسازی بۆ خوێندنەوەی و کەمکردنەوەی چاوسوین</string>
   <string name="live_display_mode">پیشاندانی بار</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f96178b..e8dd1eb 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -170,6 +170,18 @@
   <string name="wifi_setting_countrycode_summary">WLAN-Lännercode festleeën</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Beim Festleeë vum WLAN-Lännercode ass e Problem opgetrueden.</string>
+  <string name="wifi_countrycode_us">Vereenegt Staate vun Amerika</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Däitschland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Russland</string>
+  <string name="wifi_countrycode_au">Australien</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Südafrika, Tierkei</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasilien</string>
+  <string name="wifi_countrycode_in">Indien</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Läschen</string>
   <string name="profile_action_none">Onverännert loossen</string>
@@ -509,6 +521,9 @@
   <string name="saturation_str">Sättegung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitéit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Lieweg</string>
+  <string name="screen_color_custom">Ugepasst</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optiméiert däi Schierm andeem s e sech op der Dageszäit an den Ëmgéigendskonditioune baséiert, fir d\'Liesbarkeet ze verbesseren an d\'Ermiddung vun den Aen ze reduzéieren</string>
   <string name="live_display_mode">Schiermmodus</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 7684c4e..d0d5ec0 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -171,6 +171,18 @@
   <string name="wifi_setting_countrycode_summary">Nurodyti „Wi-Fi“ regiono kodą</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Iškilo problema nustatant regiono kodą.</string>
+  <string name="wifi_countrycode_us">Jungtinės Amerikos Valstijos</string>
+  <string name="wifi_countrycode_ca">Kanada, Taivanas</string>
+  <string name="wifi_countrycode_de">Vokietija</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japonija, Rusija</string>
+  <string name="wifi_countrycode_au">Australija</string>
+  <string name="wifi_countrycode_cn">Kinija</string>
+  <string name="wifi_countrycode_kr">Korėja</string>
+  <string name="wifi_countrycode_tr">Pietų Afrika, Turkija</string>
+  <string name="wifi_countrycode_sg">Izraelis, Singapūras</string>
+  <string name="wifi_countrycode_br">Brazilija</string>
+  <string name="wifi_countrycode_in">Indija</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Ištrinti</string>
   <string name="profile_action_none">Palikti nepakeistą</string>
@@ -509,6 +521,9 @@
   <string name="saturation_str">Saturacija: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastas: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensyvumas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standartinis</string>
+  <string name="screen_color_vivid">Ryškus</string>
+  <string name="screen_color_custom">Priskirtas</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizuoti ekraną remiantis paros metu ir aplinkos sąlygomis, siekiant pagerinti įskaitomumą ir sumažinti akių įtampą</string>
   <string name="live_display_mode">Rodymo režimas</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 4aba444..81f79e5 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -383,6 +383,7 @@
   <string name="saturation_str">Piesātinājums: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasts: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Spilgtums: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_custom">Pielāgots</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 370916f..cf75cba 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi മേഖലാ കോഡ് വ്യക്തമാക്കുക</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">മേഖല കോഡ് സജ്ജമാക്കുന്നതിൽ ഒരു പ്രശ്നമുണ്ടായി.</string>
+  <string name="wifi_countrycode_us">യുണൈറ്റഡ് സ്റ്റേറ്റ്സ്</string>
+  <string name="wifi_countrycode_ca">കാനഡ, തായ്‌വാന്‍</string>
+  <string name="wifi_countrycode_de">ജർമ്മനി</string>
+  <string name="wifi_countrycode_gb">യൂറോപ്പ്</string>
+  <string name="wifi_countrycode_jp">ജപ്പാൻ, റഷ്യ</string>
+  <string name="wifi_countrycode_au">ആസ്ട്രേലിയ</string>
+  <string name="wifi_countrycode_cn">ചൈന</string>
+  <string name="wifi_countrycode_kr">കൊറിയ</string>
+  <string name="wifi_countrycode_tr">സൌത്ത് ആഫ്രിക്ക, തുർക്കി</string>
+  <string name="wifi_countrycode_sg">ഇസ്രായേൽ, സിംഗപ്പൂർ</string>
+  <string name="wifi_countrycode_br">ബ്രസീൽ</string>
+  <string name="wifi_countrycode_in">ഇന്ത്യ</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ഇല്ലാതാക്കുക</string>
   <string name="profile_action_none">മാറ്റം വരുത്താതെ വിടുക</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">സാച്ചുറേഷൻ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ദൃശ്യതീവ്രത: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">തീവ്രത: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">അടിസ്ഥാനം</string>
+  <string name="screen_color_vivid">ഉജ്ജ്വലം</string>
+  <string name="screen_color_custom">ഇഷ്‌ടാനുസൃതം</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">വായനാക്ഷമത മെച്ചപ്പെടുത്തുന്നതിനും കണ്ണുകളുടെ സമ്മര്‍ദ്ദം കുറയ്ക്കാനും സമയത്തിന്‍റെയും ചുറ്റുപാടിന്റെ സാഹചര്യത്തിന്റെയും അടിസ്ഥാനത്തില്‍ നിങ്ങളുടെ സ്ക്രീന്‍ ഒപ്റ്റിമൈസ് ചെയ്യുക.</string>
   <string name="live_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 91e7379..af00e54 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fiसाठी प्रदेश कोड नमूद करा</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">प्रदेश कोड सेट करण्यात समस्या आली.</string>
+  <string name="wifi_countrycode_us">युनायटेड स्टेट्स</string>
+  <string name="wifi_countrycode_ca">कॅनडा, तैवान</string>
+  <string name="wifi_countrycode_de">जर्मनी</string>
+  <string name="wifi_countrycode_gb">युरोप</string>
+  <string name="wifi_countrycode_jp">जपान, रशिया</string>
+  <string name="wifi_countrycode_au">ऑस्ट्रेलिया</string>
+  <string name="wifi_countrycode_cn">चीन</string>
+  <string name="wifi_countrycode_kr">कोरिया</string>
+  <string name="wifi_countrycode_tr">दक्षिण आफ्रिका, तुर्की</string>
+  <string name="wifi_countrycode_sg">इज्राईल, सिंगापूर</string>
+  <string name="wifi_countrycode_br">ब्राझिल</string>
+  <string name="wifi_countrycode_in">भारत</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">हटवायचे?</string>
   <string name="profile_action_none">न बदलले ठेवा</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">संपृक्तता: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">वैधर्म्य: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">मानक</string>
+  <string name="screen_color_vivid">स्पष्ट</string>
+  <string name="screen_color_custom">सानुकूल</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">वाचनीयता सुधारण्यासाठी आणि डोळ्यांवरील ताण कमी करण्यासाठी दिवसाची वेळ आणि आसपासची स्थिती यानुसार तुमचा स्क्रीन अनुकूल करा</string>
   <string name="live_display_mode">प्रदर्शन मोड</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index a08c888..bdbaea3 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Angi regionskoden for Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Det oppsto et problem med å stille inn regionskoden.</string>
+  <string name="wifi_countrycode_us">USA</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Tyskland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Russland</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Kina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Sør-Afrika, Tyrkia</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Slett</string>
   <string name="profile_action_none">La stå uendret</string>
@@ -561,6 +573,9 @@
   <string name="saturation_str">Metning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Levende</string>
+  <string name="screen_color_custom">Egendefinert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalisere skjermen basert på tidspunkt på dagen og omgivelsesforhold å forbedre lesbarhet og redusere belastningen på øynene</string>
   <string name="live_display_mode">Visningsmodus</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 27d49c6..89e153e 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Regiocode opgeven voor wifi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Kan regiocode niet instellen.</string>
+  <string name="wifi_countrycode_us">Verenigde Staten</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Duitsland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Rusland</string>
+  <string name="wifi_countrycode_au">Australië</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Zuid-Afrika, Turkije</string>
+  <string name="wifi_countrycode_sg">Israël, Singapore</string>
+  <string name="wifi_countrycode_br">Brazilië</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Verwijderen</string>
   <string name="profile_action_none">Niet wijzigen</string>
@@ -572,6 +584,9 @@
   <string name="saturation_str">Verzadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standaard</string>
+  <string name="screen_color_vivid">Levendig</string>
+  <string name="screen_color_custom">Aangepast</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Uw scherm optimaliseren aan de hand van tijdstip op de dag en lichtomstandigheden om de leesbaarheid te verbeteren en oogvermoeidheid te verminderen</string>
   <string name="live_display_mode">Weergavemodus</string>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 24888e5..889da83 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi ପାଇଁ ଅଞ୍ଚଳ କୋଡ୍‍ ବିନିର୍ଦ୍ଦିଷ୍ଟ କରନ୍ତୁ</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">ଅଞ୍ଚଳ କୋଡ୍‍ ସେଟ୍‍ କରିବାରେ ଏକ ତ୍ରୁଟି ରହିଛି</string>
+  <string name="wifi_countrycode_us">ଯୁକ୍ତରାଷ୍ଟ୍ର ଆମେରିକା</string>
+  <string name="wifi_countrycode_ca">କାନାଡା, ତାଇୱାନ୍‍</string>
+  <string name="wifi_countrycode_de">ଜର୍‍ମାନୀ</string>
+  <string name="wifi_countrycode_gb">ଇଉରୋପ</string>
+  <string name="wifi_countrycode_jp">ଜାପାନ୍‍, ଋଷିଆ</string>
+  <string name="wifi_countrycode_au">ଅଷ୍ଟ୍ରେଲିଆ</string>
+  <string name="wifi_countrycode_cn">ଚୀନ୍‍</string>
+  <string name="wifi_countrycode_kr">କୋରିଆ</string>
+  <string name="wifi_countrycode_tr">ଦ‍କ୍ଷିଣ ଆଫ୍ରିକା, ତୁର୍କୀ</string>
+  <string name="wifi_countrycode_sg">ଇସ୍ରାଏଲ୍‍, ସିଙ୍ଗାପୁର</string>
+  <string name="wifi_countrycode_br">ବ୍ରାଜିଲ୍‍</string>
+  <string name="wifi_countrycode_in">ଭାରତ</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ବିଲୋପ କରନ୍ତୁ</string>
   <string name="profile_action_none">ପରିବର୍ତ୍ତନ ନ କରି ଛାଡିଦିଅନ୍ତୁ</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">ସାଚୁରେସନ୍‍: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">କଣ୍ଟ୍ରାଷ୍ଟ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ତୀବ୍ରତା: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">ମାନାଙ୍କ</string>
+  <string name="screen_color_vivid">ଭିଭିଦ</string>
+  <string name="screen_color_custom">କଷ୍ଟମ୍</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ରିଡେବିଲିଟି ବୃଦ୍ଧି କରିବା ପାଇଁ ଓ ୱ୍ୱିଷ୍ଟ୍ରେନ୍‍ ହ୍ରାସ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଦିନର ସମୟ ଓ ଆମ୍ବିଏଣ୍ଟ ସର୍ତ୍ତାବଳି ଉପରେ ନିଭର କରି ଅପ୍ଟିମାଇଜ୍‍ କରନ୍ତୁ</string>
   <string name="live_display_mode">ଡିସ୍‍ପ୍ଲେ ମୋଡ୍‍</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index c9814ee..5017145 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">Określ kod regionu Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Wystąpił problem podczas ustawiania kodu regionu.</string>
+  <string name="wifi_countrycode_us">Stany Zjednoczone</string>
+  <string name="wifi_countrycode_ca">Kanada, Tajwan</string>
+  <string name="wifi_countrycode_de">Niemcy</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japonia, Rosja</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">Chiny</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Republika Południowej Afryki, Turcja</string>
+  <string name="wifi_countrycode_sg">Izrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brazylia</string>
+  <string name="wifi_countrycode_in">Indie</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Usuń</string>
   <string name="profile_action_none">Pozostaw bez zmian</string>
@@ -569,6 +581,9 @@
   <string name="saturation_str">Nasycenie: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensywność: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standardowo</string>
+  <string name="screen_color_vivid">Żywy</string>
+  <string name="screen_color_custom">Własna</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optymalizuj swój ekran bazując na porze dnia i warunkach panujących w otoczeniu, aby zwiększyć czytelność i zmniejszyć uczucie zmęczenia oczu</string>
   <string name="live_display_mode">Tryb wyświetlania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index e654319..c67fa9d 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Especifique o código de região para Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Houve um problema ao definir o código de região.</string>
+  <string name="wifi_countrycode_us">Estados Unidos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwan</string>
+  <string name="wifi_countrycode_de">Alemanha</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japão, Rússia</string>
+  <string name="wifi_countrycode_au">Austrália</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Coréia</string>
+  <string name="wifi_countrycode_tr">África do Sul, Turquia</string>
+  <string name="wifi_countrycode_sg">Israel, Cingapura</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">Índia</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Apagar</string>
   <string name="profile_action_none">Deixar inalterado</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Padrão</string>
+  <string name="screen_color_vivid">Vívido</string>
+  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza sua tela com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir o cansaço visual</string>
   <string name="live_display_mode">Modo da tela</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index e640d51..1636fac 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Especificar o código de região do Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Ocorreu um problema a definir o código de região.</string>
+  <string name="wifi_countrycode_us">Estados Unidos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwan</string>
+  <string name="wifi_countrycode_de">Alemanha</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japão, Rússia</string>
+  <string name="wifi_countrycode_au">Austrália</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Coreia</string>
+  <string name="wifi_countrycode_tr">África do Sul, Turquia</string>
+  <string name="wifi_countrycode_sg">Israel, Singapura</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">Índia</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Eliminar</string>
   <string name="profile_action_none">Deixar inalterado</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Padrão</string>
+  <string name="screen_color_vivid">Brilhante</string>
+  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza o ecrã com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir a fadiga ocular</string>
   <string name="live_display_mode">Modo de exibição</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e7b2c97..61a6208 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -166,6 +166,18 @@
   <string name="wifi_setting_countrycode_summary">Specificați codul de regiune pentru Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">A intervenit o problemă la setarea codului de regiune.</string>
+  <string name="wifi_countrycode_us">Statele Unite</string>
+  <string name="wifi_countrycode_ca">Canada, Taiwan</string>
+  <string name="wifi_countrycode_de">Germania</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japonia, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Coreea</string>
+  <string name="wifi_countrycode_tr">Africa de Sud, Turcia</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brazilia</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Ștergeți</string>
   <string name="profile_action_none">Lasă neschimbat</string>
@@ -543,6 +555,9 @@
   <string name="saturation_str">Saturația: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrastul: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitatea: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Viu</string>
+  <string name="screen_color_custom">Particularizat</string>
   <!-- LiveDisplay -->
   <string name="live_display_mode">Mod de afișare</string>
   <string name="live_display_color_temperature_title">Temperatura culorii</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 38a1e52..559c310 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -174,6 +174,18 @@
   <string name="wifi_setting_countrycode_summary">Укажите код региона Wi-Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">При настройке кода региона Wi-Fi возникли неполадки.</string>
+  <string name="wifi_countrycode_us">США</string>
+  <string name="wifi_countrycode_ca">Канада, Тайвань</string>
+  <string name="wifi_countrycode_de">Германия</string>
+  <string name="wifi_countrycode_gb">Европа</string>
+  <string name="wifi_countrycode_jp">Япония, Россия</string>
+  <string name="wifi_countrycode_au">Австралия</string>
+  <string name="wifi_countrycode_cn">Китай</string>
+  <string name="wifi_countrycode_kr">Республика Корея</string>
+  <string name="wifi_countrycode_tr">Южная Африка, Турция</string>
+  <string name="wifi_countrycode_sg">Израиль, Сингапур</string>
+  <string name="wifi_countrycode_br">Бразилия</string>
+  <string name="wifi_countrycode_in">Индия</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Удалить</string>
   <string name="profile_action_none">Оставить без изменений</string>
@@ -575,6 +587,9 @@
   <string name="saturation_str">Насыщенность: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контрастность: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интенсивность: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Стандартный</string>
+  <string name="screen_color_vivid">Яркий</string>
+  <string name="screen_color_custom">Не задано</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Подстраивать экран на основе времени суток и освещения, чтобы повысить удобочитаемость и снизить нагрузку на глаза</string>
   <string name="live_display_mode">Режим экрана</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 59a078b..5c5306b 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -391,6 +391,7 @@
   <string name="saturation_str">සන්තෘප්තිය: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ප්‍රභේදනය: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">තීව්‍රතාව: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_custom">රිසිවූ</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 9a88239..43010a5 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -171,6 +171,18 @@
   <string name="wifi_setting_countrycode_summary">Zadať kód oblasti pre Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Vyskytol sa problém pri nastavovaní kódu oblasti.</string>
+  <string name="wifi_countrycode_us">Spojené štáty</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Nemecko</string>
+  <string name="wifi_countrycode_gb">Európa</string>
+  <string name="wifi_countrycode_jp">Japonsko, Rusko</string>
+  <string name="wifi_countrycode_au">Austrália</string>
+  <string name="wifi_countrycode_cn">Čína</string>
+  <string name="wifi_countrycode_kr">Kórea</string>
+  <string name="wifi_countrycode_tr">Južná Afrika, Turecko</string>
+  <string name="wifi_countrycode_sg">Izrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brazília</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Vymazať</string>
   <string name="profile_action_none">Ponechať nezmenené</string>
@@ -509,6 +521,9 @@
   <string name="saturation_str">Sýtosť: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Štandardná</string>
+  <string name="screen_color_vivid">Sýta</string>
+  <string name="screen_color_custom">Vlastná</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovať vašu obrazovku na základe dennej doby a podmienok okolia na zlepšenie čitateľnosti a zníženie únavy očí</string>
   <string name="live_display_mode">Režim zobrazenia</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index c2dce99..2fb02fb 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -175,6 +175,18 @@
   <string name="wifi_setting_countrycode_summary">Določite območno kodo za Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Pri nastavitvi območne kode je prišlo do težave.</string>
+  <string name="wifi_countrycode_us">Združene države</string>
+  <string name="wifi_countrycode_ca">Kanada, Tajvan</string>
+  <string name="wifi_countrycode_de">Nemčija</string>
+  <string name="wifi_countrycode_gb">Evropa</string>
+  <string name="wifi_countrycode_jp">Japonska, Rusija</string>
+  <string name="wifi_countrycode_au">Avstralija</string>
+  <string name="wifi_countrycode_cn">Kitajska</string>
+  <string name="wifi_countrycode_kr">Koreja</string>
+  <string name="wifi_countrycode_tr">Južna Afrika, Turčija</string>
+  <string name="wifi_countrycode_sg">Izrael, Singapur</string>
+  <string name="wifi_countrycode_br">Brazilija</string>
+  <string name="wifi_countrycode_in">Indija</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Izbriši</string>
   <string name="profile_action_none">Pusti nespremenjeno</string>
@@ -576,6 +588,9 @@
   <string name="saturation_str">Nasičenost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Jakost: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Običajno</string>
+  <string name="screen_color_vivid">Živahno</string>
+  <string name="screen_color_custom">Po meri</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiziraj zaslon glede na čas dneva in pogoje okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 683ccb6..b1a6774 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -174,6 +174,18 @@
   <string name="wifi_setting_countrycode_summary">Одреди регионални код за Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Дошло је до проблема подешавања регионалног кода.</string>
+  <string name="wifi_countrycode_us">Сједињене Државе</string>
+  <string name="wifi_countrycode_ca">Канада, Тајван</string>
+  <string name="wifi_countrycode_de">Немачка</string>
+  <string name="wifi_countrycode_gb">Европа</string>
+  <string name="wifi_countrycode_jp">Јапан, Русија</string>
+  <string name="wifi_countrycode_au">Аустралија</string>
+  <string name="wifi_countrycode_cn">Кина</string>
+  <string name="wifi_countrycode_kr">Кореа</string>
+  <string name="wifi_countrycode_tr">Јужна Африка, Турска</string>
+  <string name="wifi_countrycode_sg">Израел, Сингапур</string>
+  <string name="wifi_countrycode_br">Бразил</string>
+  <string name="wifi_countrycode_in">Индија</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Избриши</string>
   <string name="profile_action_none">Остави непромењено</string>
@@ -575,6 +587,9 @@
   <string name="saturation_str">Засићење: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Стандардно</string>
+  <string name="screen_color_vivid">Живописно</string>
+  <string name="screen_color_custom">Прилагођено</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизуј екран у складу са дневним и просторним приликама да побољшаш читљивост и умањиш замарање очију</string>
   <string name="live_display_mode">Режим екрана</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index acff276..00fad60 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Ange regionskoden för Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Det uppstod ett problem vid inställningen av regionskoden.</string>
+  <string name="wifi_countrycode_us">USA</string>
+  <string name="wifi_countrycode_ca">Kanada, Taiwan</string>
+  <string name="wifi_countrycode_de">Tyskland</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Japan, Ryssland</string>
+  <string name="wifi_countrycode_au">Australien</string>
+  <string name="wifi_countrycode_cn">Kina</string>
+  <string name="wifi_countrycode_kr">Korea</string>
+  <string name="wifi_countrycode_tr">Sydafrika, Turkiet</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brasilien</string>
+  <string name="wifi_countrycode_in">Indien</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Ta bort</string>
   <string name="profile_action_none">Lämna oförändrad</string>
@@ -572,6 +584,9 @@
   <string name="saturation_str">Mättnad: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standard</string>
+  <string name="screen_color_vivid">Levande</string>
+  <string name="screen_color_custom">Anpassad</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimera din skärm baserad på dygnets tidpunkt och omgivande förhållanden för att förbättra läsbarhet och minska belastningen på ögonen</string>
   <string name="live_display_mode">Visningsläge</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ea49080..7ffeebe 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fiக்கான பிராந்திய குறியீட்டை குறிப்பிடு</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">பிராந்திய குறியீட்டை அமைப்பதில் ஒரு பிரச்சனை உள்ளது.</string>
+  <string name="wifi_countrycode_us">யுனைட்டெட் ஸ்டேட்ஸ்</string>
+  <string name="wifi_countrycode_ca">கனடா, தாய்வான்</string>
+  <string name="wifi_countrycode_de">ஜெர்மனி</string>
+  <string name="wifi_countrycode_gb">ஐரோப்பா</string>
+  <string name="wifi_countrycode_jp">ஜப்பான், ரஷ்யா</string>
+  <string name="wifi_countrycode_au">ஆஸ்திரேலியா</string>
+  <string name="wifi_countrycode_cn">சீனா</string>
+  <string name="wifi_countrycode_kr">கொரியா</string>
+  <string name="wifi_countrycode_tr">தென் ஆப்பிரிக்கா, துருக்கி</string>
+  <string name="wifi_countrycode_sg">இஸ்ரவேல், சிங்கப்பூர்</string>
+  <string name="wifi_countrycode_br">பிரேசில்</string>
+  <string name="wifi_countrycode_in">இந்தியா</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">நீக்கு</string>
   <string name="profile_action_none">மாற்றாமல் விடு</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">சாச்சுரேசன்: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">கான்டிராஸ்ட்: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">இன்டென்சிட்டி: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">நிலையான</string>
+  <string name="screen_color_vivid">தெளிவு</string>
+  <string name="screen_color_custom">தனிப்பயன்</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">வாசிக்கும்தன்மையை மேம்படுத்தவும் கண்ணுக்கு சிரமத்தை குறைக்கவும் நாளின் நேரத்தையும் சுற்றுச்சூழல் நிலைமைகளையும் பொருத்து உங்கள் திரையை உகந்ததாக்குங்கள்</string>
   <string name="live_display_mode">காட்சி முறை</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 78ca748..4f0f647 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fiకు ప్రాంతం కోడును పేర్కొనుము</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">ప్రాంతం కోడును సెట్ చేయడంలో సమస్య ఉంది.</string>
+  <string name="wifi_countrycode_us">సంయుక్త రాష్ట్రాలు</string>
+  <string name="wifi_countrycode_ca">కెనడా, తైవాన్</string>
+  <string name="wifi_countrycode_de">జెర్మనీ</string>
+  <string name="wifi_countrycode_gb">యూరోప్</string>
+  <string name="wifi_countrycode_jp">జపాన్, రష్యా</string>
+  <string name="wifi_countrycode_au">ఆస్ట్రేలియా</string>
+  <string name="wifi_countrycode_cn">చైనా</string>
+  <string name="wifi_countrycode_kr">కొరియా</string>
+  <string name="wifi_countrycode_tr">దక్షిణ ఆఫ్రికా, టర్కీ</string>
+  <string name="wifi_countrycode_sg">ఇజ్రాయెల్, సింగపూర్</string>
+  <string name="wifi_countrycode_br">బ్రెజిల్</string>
+  <string name="wifi_countrycode_in">భారతదేశం</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">తొలగించు</string>
   <string name="profile_action_none">మార్పు చేయకుండా వదిలివేయి</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">సంతృప్తత: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">వర్ణ వ్యత్యాసం: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">తీవ్రత: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">ప్రామాణిక</string>
+  <string name="screen_color_vivid">ప్రకాశవంతమైన</string>
+  <string name="screen_color_custom">అనుకూలం</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">చదవడానికి అనుకూలంగా ఉండే విధంగా మరియు కళ్ళ పైన ఒత్తిడిని తగ్గించేందుకు రోజు యొక్క సమయం మరియు పరిసర పరిస్థితులను బట్టి సమయాన్ని సెట్ చేయండి</string>
   <string name="live_display_mode">ప్రదర్శిత మోడ్</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 9907cdf..ae68567 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">ระบุรหัสภูมิภาคสำหรับ Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">มีปัญหาขณะตั้งรหัสภูมิภาค</string>
+  <string name="wifi_countrycode_us">สหรัฐอเมริกา</string>
+  <string name="wifi_countrycode_ca">แคนาดา ไต้หวัน</string>
+  <string name="wifi_countrycode_de">เยอรมันนี</string>
+  <string name="wifi_countrycode_gb">ยุโรป</string>
+  <string name="wifi_countrycode_jp">ญี่ปุ่น, รัสเซีย</string>
+  <string name="wifi_countrycode_au">ออสเตรเลีย</string>
+  <string name="wifi_countrycode_cn">จีน</string>
+  <string name="wifi_countrycode_kr">เกาหลี</string>
+  <string name="wifi_countrycode_tr">แอฟริกาใต้ ตุรกี</string>
+  <string name="wifi_countrycode_sg">อิสราเอล สิงคโปร์</string>
+  <string name="wifi_countrycode_br">บราซิล</string>
+  <string name="wifi_countrycode_in">อินเดีย</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ลบ</string>
   <string name="profile_action_none">ไม่บันทึกการเปลี่ยนแปลง</string>
@@ -573,6 +585,9 @@
   <string name="saturation_str">ความอิ่มตัว: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ความเข้มจาง: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ความเข้มข้น: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">มาตราฐาน</string>
+  <string name="screen_color_vivid">สดใส</string>
+  <string name="screen_color_custom">กำหนดเอง</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ปรับหน้าความสว่างหน้าจอตามเวลาและแสงโดยรอบเพื่อทำให้อ่านได้ง่ายขึ้นและลดอาการปวดตา</string>
   <string name="live_display_mode">รูปแบบการแสดงผล</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 1c537f2..c42355b 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi için bölge kodunu girin</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Bölge kodunu ayarlarken sorun oluştu.</string>
+  <string name="wifi_countrycode_us">Birleşik Devletler</string>
+  <string name="wifi_countrycode_ca">Kanada, Tayvan</string>
+  <string name="wifi_countrycode_de">Almanya</string>
+  <string name="wifi_countrycode_gb">Avrupa</string>
+  <string name="wifi_countrycode_jp">Japonya, Rusya</string>
+  <string name="wifi_countrycode_au">Avustralya</string>
+  <string name="wifi_countrycode_cn">Çin</string>
+  <string name="wifi_countrycode_kr">Kore</string>
+  <string name="wifi_countrycode_tr">Güney Afrika, Türkiye</string>
+  <string name="wifi_countrycode_sg">İsrail, Singapur</string>
+  <string name="wifi_countrycode_br">Brezilya</string>
+  <string name="wifi_countrycode_in">Hindistan</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Sil</string>
   <string name="profile_action_none">Değiştirme</string>
@@ -574,6 +586,9 @@
   <string name="saturation_str">Doygunluk: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Zıtlık: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Yoğunluk: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Standart</string>
+  <string name="screen_color_vivid">Canlı</string>
+  <string name="screen_color_custom">Özel</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Okunabilirliği artırmak ve göz yorgunluğu azaltmak için gün ve ortam koşulları zamanına bağlı olarak ekranı iyileştirir</string>
   <string name="live_display_mode">Görüntü modu</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index dd7a7ed..a45326e 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Wi\u2011Fi ئۈچۈن رايون كودى بېكىتىڭ</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">رايون كودىنى تەڭشىگەندە مەسىلە كۆرۈلدى.</string>
+  <string name="wifi_countrycode_us">ئامېرىكا قوشما شتاتلىرى</string>
+  <string name="wifi_countrycode_ca">كانادا، تەيۋەن</string>
+  <string name="wifi_countrycode_de">گېرمانىيە</string>
+  <string name="wifi_countrycode_gb">ياۋروپا</string>
+  <string name="wifi_countrycode_jp">ياپونىيە، رۇسىيە</string>
+  <string name="wifi_countrycode_au">ئاۋسترالىيە</string>
+  <string name="wifi_countrycode_cn">جۇڭگو</string>
+  <string name="wifi_countrycode_kr">كورېيە</string>
+  <string name="wifi_countrycode_tr">جەنۇبى ئافرىقا، تۈركىيە</string>
+  <string name="wifi_countrycode_sg">ئىسرائىلىيە، سىنگاپور</string>
+  <string name="wifi_countrycode_br">بىرازىلىيە</string>
+  <string name="wifi_countrycode_in">ھىندىستان</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">ئۆچۈر</string>
   <string name="profile_action_none">ئۆزگەرتمەي قالدۇر</string>
@@ -571,6 +583,9 @@
   <string name="saturation_str">تويۇنۇشچانلىقى: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ئاق-قارىلىقى: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">يورۇقلۇقى: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">ئۆلچەملىك</string>
+  <string name="screen_color_vivid">جانلىق</string>
+  <string name="screen_color_custom">ئىختىيارىي</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ۋاقىت ۋە مۇھىت شەرتى ئاساسىدا ئېكرانىڭىزنى ئەلالاشتۇرۇپ ئوقۇشچانلىقنى ياخشىلاپ كۆز چارچاشنى تۆۋەنلىتىدۇ</string>
   <string name="live_display_mode">كۆرسىتىش ھالىتى</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 3e6483a..957d3cc 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -173,6 +173,18 @@
   <string name="wifi_setting_countrycode_summary">Вкажіть код регіону для Wi-Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Під час налаштування коду регіону Wi-Fi виникла помилка.</string>
+  <string name="wifi_countrycode_us">США</string>
+  <string name="wifi_countrycode_ca">Канада, Тайвань</string>
+  <string name="wifi_countrycode_de">Німеччина</string>
+  <string name="wifi_countrycode_gb">Європа</string>
+  <string name="wifi_countrycode_jp">Японія, Росія</string>
+  <string name="wifi_countrycode_au">Австралія</string>
+  <string name="wifi_countrycode_cn">Китай</string>
+  <string name="wifi_countrycode_kr">Корея</string>
+  <string name="wifi_countrycode_tr">Південно-Африканська Республіка, Туреччина</string>
+  <string name="wifi_countrycode_sg">Ізраїль, Сінгапур</string>
+  <string name="wifi_countrycode_br">Бразилія</string>
+  <string name="wifi_countrycode_in">Індія</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Видалити</string>
   <string name="profile_action_none">Залишити без змін</string>
@@ -557,6 +569,9 @@
   <string name="saturation_str">Насиченість: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтенсивність: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">Стандартний</string>
+  <string name="screen_color_vivid">Яскравий</string>
+  <string name="screen_color_custom">Не заданий</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Налаштовувати екран залежно від часу доби і умов освітлення для підвищення зручності читання і зменшення втоми очей</string>
   <string name="live_display_mode">Режим екрану</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 2062606..5a78e6a 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -172,6 +172,18 @@
   <string name="wifi_setting_countrycode_summary">Chỉ định mã vùng cho Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">Đã có vấn đề thiết lập mã vùng.</string>
+  <string name="wifi_countrycode_us">Hoa Kỳ</string>
+  <string name="wifi_countrycode_ca">Canada, Đài Loan</string>
+  <string name="wifi_countrycode_de">Đức</string>
+  <string name="wifi_countrycode_gb">Châu Âu</string>
+  <string name="wifi_countrycode_jp">Nhật Bản, Nga</string>
+  <string name="wifi_countrycode_au">Úc</string>
+  <string name="wifi_countrycode_cn">Trung Quốc</string>
+  <string name="wifi_countrycode_kr">Hàn Quốc</string>
+  <string name="wifi_countrycode_tr">Nam Phi, Thổ Nhĩ Kỳ</string>
+  <string name="wifi_countrycode_sg">Israel, Singapore</string>
+  <string name="wifi_countrycode_br">Brazil</string>
+  <string name="wifi_countrycode_in">Ấn Độ</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Xóa</string>
   <string name="profile_action_none">Giữ nguyên</string>
@@ -573,6 +585,9 @@
   <string name="saturation_str">Độ bão hòa: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Độ tương phản: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Cường độ: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
+  <string name="screen_color_standard">Chuẩn</string>
+  <string name="screen_color_vivid">Sống động</string>
+  <string name="screen_color_custom">Tùy chỉnh</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Tối ưu hóa màn hình dựa trên điều kiện môi trường và thời gian trong ngày để cải thiện khả năng đọc và giảm mỏi mắt</string>
   <string name="live_display_mode">Chế độ hiển thị</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index cd2919d..ca79553 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -169,6 +169,18 @@
   <string name="wifi_setting_countrycode_summary">为 Wi\u2011Fi 指定区域码</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">设置区域码时遇到了问题。</string>
+  <string name="wifi_countrycode_us">美国</string>
+  <string name="wifi_countrycode_ca">加拿大，台湾</string>
+  <string name="wifi_countrycode_de">德国</string>
+  <string name="wifi_countrycode_gb">欧洲</string>
+  <string name="wifi_countrycode_jp">日本，俄罗斯</string>
+  <string name="wifi_countrycode_au">澳大利亚</string>
+  <string name="wifi_countrycode_cn">中国</string>
+  <string name="wifi_countrycode_kr">韩国</string>
+  <string name="wifi_countrycode_tr">南非，土耳其</string>
+  <string name="wifi_countrycode_sg">以色列，新加坡</string>
+  <string name="wifi_countrycode_br">巴西</string>
+  <string name="wifi_countrycode_in">印度</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">删除</string>
   <string name="profile_action_none">保持不变</string>
@@ -570,6 +582,9 @@
   <string name="saturation_str">饱和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">对比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">强度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">标准</string>
+  <string name="screen_color_vivid">鲜艳</string>
+  <string name="screen_color_custom">自定义</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基于时间和环境条件来优化您的屏幕以改善可读性和减少眼睛疲劳</string>
   <string name="live_display_mode">显示模式</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index c5b57dd..d6814cf 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -151,6 +151,18 @@
   <string name="wifi_setting_countrycode_summary">指定 Wi\u2011Fi 區域代碼</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
   <string name="wifi_setting_countrycode_error">設定區域代碼時遇到了問題。</string>
+  <string name="wifi_countrycode_us">美國</string>
+  <string name="wifi_countrycode_ca">加拿大、台灣</string>
+  <string name="wifi_countrycode_de">德國</string>
+  <string name="wifi_countrycode_gb">歐洲</string>
+  <string name="wifi_countrycode_jp">日本、俄羅斯</string>
+  <string name="wifi_countrycode_au">澳洲</string>
+  <string name="wifi_countrycode_cn">中國</string>
+  <string name="wifi_countrycode_kr">韓國</string>
+  <string name="wifi_countrycode_tr">南非、土耳其</string>
+  <string name="wifi_countrycode_sg">以色列、新加坡</string>
+  <string name="wifi_countrycode_br">巴西</string>
+  <string name="wifi_countrycode_in">印度</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">刪除</string>
   <string name="profile_action_none">保持不變</string>
@@ -476,6 +488,9 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">標準</string>
+  <string name="screen_color_vivid">鮮明</string>
+  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">您可根據每日時間和環境條件來優化螢幕顯示，以提升可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 6b9467c..2ee4e2c 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -167,6 +167,18 @@
   <!-- Wi-Fi region code -->
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_countrycode_us">美國</string>
+  <string name="wifi_countrycode_ca">加拿大，台灣</string>
+  <string name="wifi_countrycode_de">德國</string>
+  <string name="wifi_countrycode_gb">歐洲</string>
+  <string name="wifi_countrycode_jp">日本，俄羅斯</string>
+  <string name="wifi_countrycode_au">澳洲</string>
+  <string name="wifi_countrycode_cn">中國</string>
+  <string name="wifi_countrycode_kr">南韓</string>
+  <string name="wifi_countrycode_tr">南非，土耳其</string>
+  <string name="wifi_countrycode_sg">以色列，新加坡</string>
+  <string name="wifi_countrycode_br">巴西</string>
+  <string name="wifi_countrycode_in">印度</string>
   <!-- Profiles -->
   <string name="profile_menu_delete_title">刪除</string>
   <string name="profile_action_none">保持不變</string>
@@ -513,6 +525,9 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">亮度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
+  <string name="screen_color_standard">標準</string>
+  <string name="screen_color_vivid">鮮豔</string>
+  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基於日夜和環境條件調整您的螢幕色溫，以改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
-- 
cgit v1.1


From a44bfb5a396056e22825f4989eee47b90b7bbc14 Mon Sep 17 00:00:00 2001
From: luca020400 <luca.stefani.ge1@gmail.com>
Date: Tue, 10 May 2016 22:56:23 +0200
Subject: Settings: Move vibrator value restore to onActivityStop

Change-Id: Ia35f1dcffd86c8c2717e68cd91537d652ecfa982
---
 src/com/android/settings/hardware/VibratorIntensity.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/hardware/VibratorIntensity.java b/src/com/android/settings/hardware/VibratorIntensity.java
index c17c376..a778f36 100644
--- a/src/com/android/settings/hardware/VibratorIntensity.java
+++ b/src/com/android/settings/hardware/VibratorIntensity.java
@@ -42,7 +42,7 @@ import cyanogenmod.providers.CMSettings;
 import com.android.settings.R;
 
 public class VibratorIntensity extends DialogPreference implements
-        SeekBar.OnSeekBarChangeListener {
+        SeekBar.OnSeekBarChangeListener, PreferenceManager.OnActivityStopListener {
     private static final String PREF_NAME = "vibrator_intensity";
     private SeekBar mSeekBar;
     private TextView mValue;
@@ -122,6 +122,8 @@ public class VibratorIntensity extends DialogPreference implements
         mSeekBar.setOnSeekBarChangeListener(this);
         mSeekBar.setMax(mMaxValue - mMinValue);
         mSeekBar.setProgress(mOriginalValue - mMinValue);
+
+        getPreferenceManager().registerOnActivityStopListener(this);
     }
 
     @Override
@@ -156,6 +158,13 @@ public class VibratorIntensity extends DialogPreference implements
             CMSettings.Secure.putInt(getContext().getContentResolver(),
                     CMSettings.Secure.VIBRATOR_INTENSITY, mOriginalValue);
         }
+
+        getPreferenceManager().unregisterOnActivityStopListener(this);
+    }
+
+    @Override
+    public void onActivityStop() {
+        mHardware.setVibratorIntensity(mOriginalValue);
     }
 
     public static void restore(Context context) {
@@ -198,7 +207,6 @@ public class VibratorIntensity extends DialogPreference implements
         mHardware.setVibratorIntensity(seekBar.getProgress() + mMinValue);
         Vibrator vib = (Vibrator) getContext().getSystemService(Context.VIBRATOR_SERVICE);
         vib.vibrate(200);
-        mHardware.setVibratorIntensity(mOriginalValue);
     }
 
     private static int intensityToPercent(int minValue, int maxValue, int value) {
-- 
cgit v1.1


From d10f6950c4321409d35476b934f09241b4a1b345 Mon Sep 17 00:00:00 2001
From: Kamaljeet Maini <kmaini@cyngn.com>
Date: Tue, 10 May 2016 16:25:17 -0700
Subject: Close "Protected apps" activity during power cycle

Protected apps activity in Settings is accessed after entering
correct pattern. If user turns off/on the phone while Protected
apps is in foreground, the user must enter pattern again before
using the Protected apps.

Added code in onPause method to close the Protected apps activity
if the user has already been authorized and there is no screen
orientation change.

Change-Id: Ie36ac0f54cce62228f6d0d56fef2e1f24096a803
Issue-Id: FEIJ-491
---
 .../settings/applications/ProtectedAppsActivity.java      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/applications/ProtectedAppsActivity.java b/src/com/android/settings/applications/ProtectedAppsActivity.java
index 5089f19..7156c92 100644
--- a/src/com/android/settings/applications/ProtectedAppsActivity.java
+++ b/src/com/android/settings/applications/ProtectedAppsActivity.java
@@ -72,6 +72,7 @@ public class ProtectedAppsActivity extends Activity {
     private boolean mWaitUserAuth = false;
     private boolean mUserIsAuth = false;
     private Intent mTargetIntent;
+    private int mOrientation;
 
     private HashSet<ComponentName> mProtectedApps = new HashSet<ComponentName>();
 
@@ -105,6 +106,7 @@ public class ProtectedAppsActivity extends Activity {
         } else {
             if (!mUserIsAuth) {
                 // Require unlock
+                mWaitUserAuth = true;
                 Intent lockPattern = new Intent(this, LockPatternActivity.class);
                 startActivityForResult(lockPattern, REQ_ENTER_PATTERN);
             } else {
@@ -114,6 +116,7 @@ public class ProtectedAppsActivity extends Activity {
                 }
             }
         }
+        mOrientation = getResources().getConfiguration().orientation;
     }
 
     @Override
@@ -167,8 +170,10 @@ public class ProtectedAppsActivity extends Activity {
     public void onPause() {
         super.onPause();
 
-        // Don't stick around
-        if (mWaitUserAuth && !mUserIsAuth) {
+        // Close this app to prevent unauthorized access when
+        // 1) not waiting for authorization and
+        // 2) there is no portrait/landscape mode switching
+        if (!mWaitUserAuth && (mOrientation == getResources().getConfiguration().orientation)) {
             finish();
         }
     }
@@ -181,7 +186,7 @@ public class ProtectedAppsActivity extends Activity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         switch (requestCode) {
             case REQ_ENTER_PATTERN:
-                mWaitUserAuth = true;
+                mWaitUserAuth = false;
                 switch (resultCode) {
                     case RESULT_OK:
                         //Nothing to do, proceed!
@@ -197,7 +202,7 @@ public class ProtectedAppsActivity extends Activity {
                 }
                 break;
             case REQ_RESET_PATTERN:
-                mWaitUserAuth = true;
+                mWaitUserAuth = false;
                 mUserIsAuth = false;
         }
     }
@@ -244,7 +249,7 @@ public class ProtectedAppsActivity extends Activity {
     }
 
     private void resetLock() {
-        mWaitUserAuth = false;
+        mWaitUserAuth = true;
         Intent lockPattern = new Intent(LockPatternActivity.RECREATE_PATTERN, null,
                 this, LockPatternActivity.class);
         startActivityForResult(lockPattern, REQ_RESET_PATTERN);
-- 
cgit v1.1


From 9030d9235aabf7c45687f68801f9a4a09f9b776f Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Wed, 11 May 2016 14:22:59 -0700
Subject: Settings: Ignore process kill receiver events if activity is
 destroyed.

  Following the logic for refresh ui attempts to getContext() from the
  underlying activity which may have already been destroyed causing
  an NPE.

Change-Id: Ibe110022ebedcc55a01f3bda66501580c8d92fed
TICKET: NIGHTLIES-2935
---
 src/com/android/settings/applications/InstalledAppDetails.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index f2e6392..cc1b241 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -1019,8 +1019,10 @@ public class InstalledAppDetails extends AppInfoBase
     private final BroadcastReceiver mCheckKillProcessesReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
-            updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
-            refreshUi();
+            if (getActivity() != null && !getActivity().isDestroyed()) {
+                updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
+                refreshUi();
+            }
         }
     };
 
-- 
cgit v1.1


From d6709e61c125cdc636944c16efe3303f9ffbb9e1 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Tue, 17 May 2016 22:12:22 +0200
Subject: Automatic translation import

Change-Id: I2384c6bcba0d6e3a921315ba981525d942060b00
---
 res/values-be/arrays.xml     | 33 +++++++++++++++++++++++++++++++++
 res/values-be/strings.xml    | 40 ++++++++++++++++++++++++++++++++++++++++
 res/values-bg/cm_strings.xml |  2 +-
 res/values-nl/cm_strings.xml |  4 ++++
 4 files changed, 78 insertions(+), 1 deletion(-)

diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 4acb887..2349051 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -23,7 +23,32 @@
          These values will be used as search terms for TimeZone displayName
          strings. -->
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <string-array name="timezone_filters">
+    <!-- The next level of the time zoner picker should show time zones from the Americas. -->
+    <item>Амэрыка</item>
+    <!-- The next level of the time zoner picker should show time zones from Europe. -->
+    <item>Еўропа</item>
+    <!-- The next level of the time zoner picker should show time zones from Africa. -->
+    <item>Афрыка</item>
+    <!-- The next level of the time zoner picker should show time zones from Asia. -->
+    <item>Азія</item>
+    <!-- The next level of the time zoner picker should show time zones from Australia. -->
+    <item>Аўстралія</item>
+    <!-- The next level of the time zoner picker should show time zones from Pacific. -->
+    <item>Ціхі акіян</item>
+    <!-- The next level of the time zoner picker should show time zones from ALL regions. -->
+    <item>Усе</item>
+  </string-array>
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <string-array name="screen_timeout_entries">
+    <item>15 seconds</item>
+    <item>30 сэкунд</item>
+    <item>1 хвіліна</item>
+    <item>2 хвіліны</item>
+    <item>5 хвілін</item>
+    <item>10 minutes</item>
+    <item>30 minutes</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
   <!-- Do not translate. -->
@@ -67,6 +92,14 @@
   <!-- Do not translate. -->
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <string-array name="wifi_frequency_band_entries">
+    <!-- Operation on both 2.4 GHz and 5 GHz [CHAR LIMIT=25]-->
+    <item>Аўтаматычна</item>
+    <!-- Operation on 5 GHz alone [CHAR LIMIT=25]-->
+    <item>5 GHz only</item>
+    <!-- Operation on 2.4 GHz alone [CHAR LIMIT=25]-->
+    <item>2.4 GHz only</item>
+  </string-array>
   <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
   <!-- Do not translate. -->
   <!-- Display options for UsageStats class -->
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index cc237fa..a4d30d9 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -20,7 +20,9 @@
   <!-- Strings for Dialog create button -->
   <!-- Strings for Dialog allow button -->
   <!-- Strings for Dialog deny button -->
+  <string name="deny">Адхiлiць</string>
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <string name="dlg_close">Зачыніць</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
@@ -207,6 +209,7 @@
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radio_info_set_perferred_label">Усталяваць пераважны тып сеткі:</string>
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -214,6 +217,7 @@
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radio_info_smsc_refresh_label">Абнавіць</string>
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Band Mode Selection -->
@@ -264,6 +268,7 @@
   <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
   <!-- Label for option to select a settings panel as a shortcut -->
   <!-- Wireless controls settings screen, setting check box label -->
+  <string name="airplane_mode">Рэжым лёту</string>
   <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
   <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
   <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
@@ -283,6 +288,7 @@
   <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
   <!-- mobile network settings screen, setting option name -->
   <!-- mobile network settings screen, setting option summary text -->
+  <string name="sum_carrier_select">Абраць аператара сеткі</string>
   <!-- Date and time settings -->
   <!-- Main Settings screen setting option name to go into the date and time settings-->
   <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
@@ -490,9 +496,12 @@
   <!-- Summary of preference to manage device policies -->
   <!-- Bluetooth settings -->
   <!-- Bluetooth settings check box title on Main Settings screen -->
+  <string name="bluetooth_quick_toggle_title">Bluetooth</string>
   <!-- Bluetooth settings check box summary for turning on bluetooth -->
   <!--Used as title on second screen after selecting Bluetooth settings -->
+  <string name="bluetooth_settings">Bluetooth</string>
   <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <string name="bluetooth_settings_title">Bluetooth</string>
   <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
   <!-- ======================================================================================= -->
   <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
@@ -515,6 +524,7 @@
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <string name="bluetooth_search_for_devices">Абнавіць</string>
   <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
   <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
   <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
@@ -536,6 +546,7 @@
   <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
   <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
   <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <string name="bluetooth_menu_advanced">Падрабязьней</string>
   <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
   <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
   <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
@@ -554,6 +565,7 @@
   <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
          When a user decides what Bluetooth capabilities to use with the device.  -->
   <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <string name="bluetooth_device_advanced_rename_device">Пераназваць</string>
   <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
   <!-- 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]-->
@@ -637,6 +649,7 @@
   <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
   <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
   <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <string name="wifi_add_network">Дадаць сетку</string>
   <!-- Header for the list of wifi networks-->
   <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
   <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
@@ -644,6 +657,7 @@
   <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
   <!-- Menu option to scan Wi-Fi networks -->
   <!-- Menu option to Wi-Fi advanced settings -->
+  <string name="wifi_menu_advanced">Падрабязьней</string>
   <!-- Menu option to connect to a Wi-Fi network -->
   <!-- Menu option to remember a temporary Wi-Fi network -->
   <!-- Menu option to delete a Wi-Fi network -->
@@ -670,6 +684,7 @@
   <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
   <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
   <!-- Label for the SSID of the network -->
+  <string name="wifi_ssid">Назва сеткі</string>
   <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
   <!-- Label for the security of the connection -->
   <!-- Label for the signal strength of the connection -->
@@ -724,6 +739,7 @@
   <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
   <!-- Wi-Fi Advanced Settings -->
   <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <string name="wifi_saved_access_points_titlebar">Захаваныя сеткі</string>
   <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
   <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
@@ -732,6 +748,7 @@
   <!-- Title of the screen to adjust IP settings -->
   <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
   <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <string name="wifi_saved_access_points_label">Захаваныя сеткі</string>
   <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
   <!-- Menu item to save the IP settings -->
   <!-- Menu ietm to cancel the IP settings -->
@@ -765,6 +782,7 @@
   <!-- Wifi AP settings-->
   <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
   <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <string name="wifi_hotspot_checkbox_text">кропка доступу Wi\u2011Fi</string>
   <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
   <!-- Summary text when turning hotspot on -->
   <!-- Summary text when turning hotspot off -->
@@ -1134,10 +1152,12 @@
   <!-- Phone info screen, section titles: -->
   <!-- APN Settings -->
   <!-- APN settings screen title -->
+  <string name="apn_settings">APN</string>
   <!-- Screen title after user selects APNs setting option -->
   <!-- Edit access point label summary text when no value has been set -->
   <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
   <!-- Edit access point labels: The actual access point name-->
+  <string name="apn_apn">APN</string>
   <!-- Edit access point labels: The addess of the proxy to use for this APN -->
   <!-- Edit access point labels: The port number of the proxy to use for this APN -->
   <!-- Edit access point labels: The username that will be used when conencting to this APN-->
@@ -1164,6 +1184,7 @@
   <!-- APNs screen menu option to create a brand spanking new APN -->
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <string name="menu_cancel">Адхіліць</string>
   <!-- APN error dialog title -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
@@ -1236,6 +1257,7 @@
   <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
   <!-- Tethering help button - calls up a web view with general tethering info -->
   <!-- Wireless controls, item title to go into the network settings -->
+  <string name="network_settings_title">Сотавая сетка</string>
   <!-- Mobile plan [CHAR LIMIT=35]-->
   <!-- SMS Application [CHAR LIMIT=35]-->
   <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
@@ -1843,6 +1865,7 @@
   <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
   <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
   <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <string name="battery_stats_flashlight_on_label">Ліхтарык уключаны</string>
   <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
   <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
   <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
@@ -1857,9 +1880,11 @@
   <!-- Subtitle for list of packages -->
   <!-- Label for power consumed by the screen -->
   <!-- Label for power consumed by the flashlight -->
+  <string name="power_flashlight">Ліхтарык</string>
   <!-- Label for power consumed by the camera -->
   <!-- Label for power consumed by Wi-Fi -->
   <!-- Label for power consumed by Bluetooth -->
+  <string name="power_bluetooth">Bluetooth</string>
   <!-- Label for power consumed by Cell idle -->
   <!-- Label for power consumed by Calling -->
   <!-- Label for power consumed when Idle -->
@@ -1882,6 +1907,7 @@
   <!-- Label for Video usage time -->
   <!-- Label for Camera usage time -->
   <!-- Label for Flashlight usage time -->
+  <string name="usage_type_flashlight">Ліхтарык</string>
   <!-- Label for time that a feature has been on -->
   <!-- Label for time that there was no cell coverage -->
   <!-- Label for the total power capacity of the device's battery -->
@@ -1921,6 +1947,7 @@
   <!-- Menu label for viewing battery usage since unplugged -->
   <!-- Menu label for viewing battery usage total -->
   <!-- Menu label for refreshing with latest usage numbers -->
+  <string name="menu_stats_refresh">Абнавіць</string>
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Label for kernel threads in battery usage -->
   <!-- Label for mediaserver process in battery usage -->
@@ -2069,6 +2096,7 @@
   <!-- Gadget value used to describe turning off state. -->
   <!-- Spoken description for the Wi-Fi power control gadget. -->
   <!-- Spoken description for the Bluetooth power control gadget. -->
+  <string name="gadget_bluetooth">Bluetooth</string>
   <!-- Spoken description for the Location power control gadget. -->
   <!-- Spoken description for the data synchronization gadget. -->
   <!-- Template for brightness gadget toggle button description. -->
@@ -2087,6 +2115,7 @@
   <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
   <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
   <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <string name="advanced_security_title">Падрабязьней</string>
   <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
   <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
@@ -2167,10 +2196,12 @@
   <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
          a user is adding a network.
          [CHAR LIMIT=50] -->
+  <string name="wifi_setup_title_add_network">Дадаць сетку</string>
   <!-- Text message shown when Wifi is not connected.
          Used in Wifi Setup For Setup Wizard with XL screen. -->
   <!-- Button message shown on the button adding manual setting.
          Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <string name="wifi_setup_add_network">Дадаць сетку</string>
   <!-- Button message shown on the button refreshing a list of network.
          Used in Wifi Setup For Setup Wizard with XL screen. -->
   <!-- Button message shown on the button enabling users skip Wifi Setup.
@@ -2360,6 +2391,7 @@
   <!-- Title for menu option to enable global auto-sync of account data -->
   <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
   <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <string name="data_usage_menu_cellular_networks">Сотавая сетка</string>
   <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
@@ -2424,6 +2456,7 @@
   <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
   <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
   <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <string name="data_usage_metered_mobile">Сотавая сетка</string>
   <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
   <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
   <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
@@ -2635,11 +2668,15 @@
   <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
   <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
   <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <string name="network_operators_settings">Аператары сувязі</string>
   <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <string name="access_point_names">Кропка доступу сотавай сувязі</string>
   <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
   <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
   <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <string name="preferred_network_type_title">Тып сеткі</string>
   <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <string name="preferred_network_type_summary">LTE (раім)</string>
   <!-- Work SIM title.  [CHAR LIMIT=50] -->
   <!-- User app limits screen title [CHAR LIMIT=35] -->
   <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
@@ -2650,6 +2687,7 @@
   <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
   <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
   <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <string name="restriction_bluetooth_config_title">Bluetooth</string>
   <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
   <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
   <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
@@ -2740,6 +2778,7 @@
   <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
   <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
   <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <string name="advanced_section_header">Падрабязьней</string>
   <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
@@ -2932,6 +2971,7 @@
   <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
   <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
   <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <string name="advanced_apps">Падрабязьней</string>
   <!-- Title for application configuration settings [CHAR LIMIT=30] -->
   <!-- Warning toast shown when data usage screen can't find specified app -->
   <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 186fc7c..34fb49f 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -719,7 +719,7 @@
   <string name="status_bar_battery_style_icon_landscape">Хоризонтална икона</string>
   <string name="status_bar_battery_style_circle">Кръг</string>
   <string name="status_bar_battery_style_text">Текст</string>
-  <string name="status_bar_battery_style_hidden">Скрит</string>
+  <string name="status_bar_battery_style_hidden">Скрита</string>
   <!-- Status bar - Battery percentage -->
   <string name="status_bar_battery_percentage_title">Заряд на батерията в проценти</string>
   <string name="status_bar_battery_percentage_default">Скрит</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 89e153e..e89d2b7 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1006,8 +1006,12 @@
   <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Weer</string>
   <string name="weather_settings_general_settings_title">Algemeen</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="allow_background_wlan">Alleen via wifi</string>
+  <string name="allow_background_none">Geen toegang</string>
+  <string name="reset_stats_confirm">Bevestigen</string>
   <!-- Label for settings shortcut: carrier selection -->
 </resources>
-- 
cgit v1.1


From d67600a4f39917e47d5009bf4f9f8ce3be362af9 Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Mon, 16 May 2016 16:35:35 -0700
Subject: Settings: update time zone strings on date change

If the user changes the date, most obvious case being from 1970, to a
current date, and the user's selected Locale's country time zones have
been changed (according to ICU), we must update the time zone strings in
the system.

Ref: CYNGNOS-453

Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 926c3b0a50e521368628ef0d9975c99fa4cd3480)

Change-Id: I487c54cd4f933286c5004d24a3f8730ee2d4e4f6
---
 AndroidManifest.xml                              |  7 ++++++
 src/com/android/settings/DateChangeReceiver.java | 28 ++++++++++++++++++++++++
 src/com/android/settings/DateTimeSettings.java   | 13 +++++++++++
 3 files changed, 48 insertions(+)
 create mode 100644 src/com/android/settings/DateChangeReceiver.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 451f370..349bca7 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -529,6 +529,13 @@
                 android:value="true" />
         </activity>
 
+        <receiver android:name=".DateChangeReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.DATE_CHANGED"/>
+                <action android:name="android.intent.action.LOCALE_CHANGED"/>
+            </intent-filter>
+        </receiver>
+
         <activity android:name="DateTimeSettingsSetupWizard"
                   android:label="@string/date_and_time"
                   android:theme="@style/Theme.DateTimeSettingsSetupWizard"
diff --git a/src/com/android/settings/DateChangeReceiver.java b/src/com/android/settings/DateChangeReceiver.java
new file mode 100644
index 0000000..6a3ec88
--- /dev/null
+++ b/src/com/android/settings/DateChangeReceiver.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.android.settings;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DateChangeReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        DateTimeSettings.updateLocaleStrings();
+    }
+}
diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java
index 8a9e2ad..34753ef 100644
--- a/src/com/android/settings/DateTimeSettings.java
+++ b/src/com/android/settings/DateTimeSettings.java
@@ -40,9 +40,12 @@ import android.widget.TimePicker;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settingslib.datetime.ZoneGetter;
+import libcore.icu.TimeZoneNames;
 
+import java.text.DateFormatSymbols;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 
 public class DateTimeSettings extends SettingsPreferenceFragment
         implements OnSharedPreferenceChangeListener,
@@ -329,6 +332,16 @@ public class DateTimeSettings extends SettingsPreferenceFragment
         if (when / 1000 < Integer.MAX_VALUE) {
             ((AlarmManager) context.getSystemService(Context.ALARM_SERVICE)).setTime(when);
         }
+        updateLocaleStrings();
+    }
+
+    static void updateLocaleStrings() {
+        // If a device was boot up with date 1970 and then date changes to some later time,
+        // the wrong string might be cached if the country's zones have changed.
+        // See external/icu/icu4c/source/data/misc/metaZones.txt for complete mapping
+        TimeZoneNames.clearLocaleCache();
+        Locale locale = Locale.getDefault();
+        DateFormatSymbols.getInstance(locale).setZoneStrings(TimeZoneNames.getZoneStrings(locale));
     }
 
     /* package */ static void setTime(Context context, int hourOfDay, int minute) {
-- 
cgit v1.1


From 3a532e7d448a78500448956ec52ff24f835f9733 Mon Sep 17 00:00:00 2001
From: nadlabak <pavel@doshaska.net>
Date: Fri, 13 May 2016 15:33:34 +0200
Subject: Revert "wifi: forward port avoid poor connection setting"

This reverts commit d77990f4cccd4fdc4bd479305ae6c2419d2f8610.

Change-Id: I0987d8eb9e8e6c7730f0576f174b61115973d5fb
---
 res/xml/wifi_advanced_settings.xml                     |  7 -------
 .../android/settings/wifi/AdvancedWifiSettings.java    | 18 ------------------
 2 files changed, 25 deletions(-)

diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index 09d0f18..7f25708 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -38,13 +38,6 @@
             android:dialogTitle="@string/wifi_select_assistant_dialog_title"
             android:persistent="false" />
 
-    <!-- android:dependency="enable_wifi" -->
-    <SwitchPreference
-            android:key="wifi_poor_network_detection"
-            android:title="@string/wifi_poor_network_detection"
-            android:summary="@string/wifi_poor_network_detection_summary"
-            android:persistent="false" />
-
     <ListPreference
             android:key="frequency_band"
             android:title="@string/wifi_setting_frequency_band_title"
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 7aaaa90..b933a28 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -60,7 +60,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
     private static final String KEY_COUNTRY_CODE = "wifi_countrycode";
     private static final String KEY_NOTIFY_OPEN_NETWORKS = "notify_open_networks";
     private static final String KEY_SLEEP_POLICY = "sleep_policy";
-    private static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
     private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
     private static final String KEY_WIFI_ASSISTANT = "wifi_assistant";
     private static final String KEY_WIFI_DIRECT = "wifi_direct";
@@ -135,19 +134,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
                 Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON, 0) == 1);
         notifyOpenNetworks.setEnabled(mWifiManager.isWifiEnabled());
 
-        SwitchPreference poorNetworkDetection =
-            (SwitchPreference) findPreference(KEY_POOR_NETWORK_DETECTION);
-        if (poorNetworkDetection != null) {
-            if (Utils.isWifiOnly(getActivity())) {
-                getPreferenceScreen().removePreference(poorNetworkDetection);
-            } else {
-                poorNetworkDetection.setChecked(Settings.Global.getInt(getContentResolver(),
-                        Settings.Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
-                        WifiManager.DEFAULT_POOR_NETWORK_AVOIDANCE_ENABLED ?
-                        1 : 0) == 1);
-            }
-        }
-
         Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);
         intent.setClassName("com.android.certinstaller",
                 "com.android.certinstaller.CertInstallerMain");
@@ -289,10 +275,6 @@ public class AdvancedWifiSettings extends SettingsPreferenceFragment
             Global.putInt(getContentResolver(),
                     Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON,
                     ((SwitchPreference) preference).isChecked() ? 1 : 0);
-        } else if (KEY_POOR_NETWORK_DETECTION.equals(key)) {
-            Global.putInt(getContentResolver(),
-                    Global.WIFI_WATCHDOG_POOR_NETWORK_TEST_ENABLED,
-                    ((SwitchPreference) preference).isChecked() ? 1 : 0);
         } else {
             return super.onPreferenceTreeClick(screen, preference);
         }
-- 
cgit v1.1


From 9dc803c7bda8930a8e903614177b8a93ae5d6b4a Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Thu, 19 May 2016 12:07:08 -0700
Subject: Settings : Add title to xml preference screens

Search indexing was inserting null as the title, which results
in the default "Settings" title if the user selects a search result.
This is inconsistent with the title the user sees when they manually navigate
to that preference screen.

FEIJ-512

Change-Id: I6f6ed7b851c998aa2cb5531bef04e8000ccb8ddd
---
 res/xml/advanced_apps.xml                                | 1 +
 res/xml/button_settings.xml                              | 1 +
 res/xml/default_apps.xml                                 | 1 +
 res/xml/display.xml                                      | 1 +
 res/xml/notification_manager_settings.xml                | 1 +
 src/com/android/settings/search/IndexDatabaseHelper.java | 2 +-
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/xml/advanced_apps.xml b/res/xml/advanced_apps.xml
index 70b6856..4809be6 100644
--- a/res/xml/advanced_apps.xml
+++ b/res/xml/advanced_apps.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/configure_apps"
     android:key="applications_settings">
 
     <PreferenceScreen
diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 9a85b6f..68e1285 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -15,6 +15,7 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/button_pref_title"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <SwitchPreference
diff --git a/res/xml/default_apps.xml b/res/xml/default_apps.xml
index d5f9de0..41ab072 100644
--- a/res/xml/default_apps.xml
+++ b/res/xml/default_apps.xml
@@ -17,6 +17,7 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:title="@string/default_apps_title"
         android:key="default_apps">
 
     <Preference
diff --git a/res/xml/display.xml b/res/xml/display.xml
index e0dae5a..366263e 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -16,6 +16,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+    android:title="@string/display_and_lights"
     settings:keywords="@string/keywords_display">
 
     <PreferenceCategory
diff --git a/res/xml/notification_manager_settings.xml b/res/xml/notification_manager_settings.xml
index b45cb6b..a09eea4 100644
--- a/res/xml/notification_manager_settings.xml
+++ b/res/xml/notification_manager_settings.xml
@@ -15,6 +15,7 @@
      limitations under the License.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+        android:title="@string/notification_manager"
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
 
     <!-- Heads up -->
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index fd7b762..4fc93db 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 119;
+    private static final int DATABASE_VERSION = 120;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";
-- 
cgit v1.1


From 0574ebd775c6d9b57a1cf62a6426db602b716696 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Tue, 17 May 2016 19:33:42 -0700
Subject: Settings: persist "always ask" sms sim selection

The dialog was prompted, and the user has picked always prompt, don't
ask them again, the Messaging app will need to request which SIM to use.

Ticket: CYNGNOS-2185, CYNGNOS-2570

Change-Id: I95a510974b89945da252f4c6c3e905e9a0de81af
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/sim/SimDialogActivity.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 84276cb..6ebea0b 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -194,7 +194,8 @@ public class SimDialogActivity extends Activity {
                             case SMS_PICK:
                                 boolean isSmsPrompt = false;
                                 if (value < 1) {
-                                    isSmsPrompt = true;
+                                    isSmsPrompt = false; // user knows best
+                                    setDefaultSmsSubId(context, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
                                 } else {
                                     sir = smsSubInfoList.get(value);
                                     if ( sir != null) {
-- 
cgit v1.1


From c05cf0a0c8e8056bc5ad74cf8a3a6830f7a4c9bc Mon Sep 17 00:00:00 2001
From: raroyer <romanroyer@yahoo.com>
Date: Mon, 2 May 2016 22:27:25 -0700
Subject: Settings: Fix Storage Applications Manager dropdown

Disabled Filter Dropdown in LIST_TYPE_STORAGE is hidden but pops up when clicked, does nothing.  Disabling completely.

Change-Id: Id497e59876f0d0adb5997eb300596f17fe9f5cdb
---
 src/com/android/settings/applications/ManageApplications.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 61c2ebb..42399ae 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -877,7 +877,8 @@ public class ManageApplications extends InstrumentedFragment
                 Utils.handleLoadingContainer(mManageApplications.mLoadingContainer,
                         mManageApplications.mListContainer, true, true);
             }
-            if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS) {
+            if (mManageApplications.mListType == LIST_TYPE_USAGE_ACCESS
+                    || mManageApplications.mListType == LIST_TYPE_STORAGE) {
                 // No enabled or disabled filters for usage access.
                 return;
             }
-- 
cgit v1.1


From de47a0adc8c48a55dccdd6877231a36ab7a7b026 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Thu, 19 May 2016 15:46:43 -0700
Subject: Settings: Wrap invocation on search view.

  Exception thrown during monkey testing.

Change-Id: I2f08df1e36c386aec0d57e3b6714cdbdd0f29246
TICKET: FEIJ-677
---
 src/com/android/settings/dashboard/SearchResultsSummary.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index ca764b3..9b1b169 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -236,7 +236,9 @@ public class SearchResultsSummary extends InstrumentedFragment {
 
                 mShowResults = true;
                 mQuery = cursor.getString(0);
-                mSearchView.setQuery(mQuery, false);
+                if (mSearchView != null) {
+                    mSearchView.setQuery(mQuery, false);
+                }
             }
         });
         mSuggestionsListView.addHeaderView(
-- 
cgit v1.1


From 6d2a7ca0f8154c5bd8490704c36c8b12ffd674c5 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Thu, 19 May 2016 15:59:09 -0700
Subject: Settings : Rebuild app list after reset

If the user resets app states, we need to rebuild the list
so the new app info is fetched

FEIJ-706
FEIJ-511

Change-Id: I5d6261d38dc2f06e37b29e6b7ba1f7a1e49a6ab8
---
 src/com/android/settings/applications/ManageApplications.java | 10 ++++++++--
 src/com/android/settings/applications/ResetAppsHelper.java    |  9 ++++++++-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 42399ae..668f381 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -87,7 +87,8 @@ import java.util.Comparator;
  * intent.
  */
 public class ManageApplications extends InstrumentedFragment
-        implements OnItemClickListener, OnItemSelectedListener {
+        implements OnItemClickListener, OnItemSelectedListener,
+        ResetAppsHelper.ResetCompletedCallback {
 
     static final String TAG = "ManageApplications";
     static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
@@ -276,7 +277,7 @@ public class ManageApplications extends InstrumentedFragment
 
         mInvalidSizeStr = getActivity().getText(R.string.invalid_size_value);
 
-        mResetAppsHelper = new ResetAppsHelper(getActivity());
+        mResetAppsHelper = new ResetAppsHelper(getActivity(), this);
     }
 
 
@@ -618,6 +619,11 @@ public class ManageApplications extends InstrumentedFragment
         mFilterAdapter.setFilterEnabled(FILTER_APPS_DISABLED, hasDisabledApps);
     }
 
+    @Override
+    public void onResetCompleted() {
+        mApplications.mExtraInfoBridge.onPackageListChanged();
+    }
+
     static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
 
         private final ManageApplications mManageApplications;
diff --git a/src/com/android/settings/applications/ResetAppsHelper.java b/src/com/android/settings/applications/ResetAppsHelper.java
index ad2ea02..2d0f671 100644
--- a/src/com/android/settings/applications/ResetAppsHelper.java
+++ b/src/com/android/settings/applications/ResetAppsHelper.java
@@ -49,10 +49,11 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
     private final NetworkPolicyManager mNpm;
     private final AppOpsManager mAom;
     private final Context mContext;
+    private final ResetCompletedCallback mResetCompletedCallback;
 
     private AlertDialog mResetDialog;
 
-    public ResetAppsHelper(Context context) {
+    public ResetAppsHelper(Context context, ResetCompletedCallback callback) {
         mContext = context;
         mPm = context.getPackageManager();
         mIPm = IPackageManager.Stub.asInterface(ServiceManager.getService("package"));
@@ -60,6 +61,7 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
                 ServiceManager.getService(Context.NOTIFICATION_SERVICE));
         mNpm = NetworkPolicyManager.from(context);
         mAom = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
+        mResetCompletedCallback = callback;
     }
 
     public void onRestoreInstanceState(Bundle savedInstanceState) {
@@ -139,7 +141,12 @@ public class ResetAppsHelper implements DialogInterface.OnClickListener,
                         mNpm.setUidPolicy(uid, POLICY_NONE);
                     }
                 }
+                mResetCompletedCallback.onResetCompleted();
             }
         });
     }
+
+    public interface ResetCompletedCallback {
+        public void onResetCompleted();
+    }
 }
-- 
cgit v1.1


From c72b4659ae29aa89f3dc2990995b0638fe28ce4f Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@cyngn.com>
Date: Fri, 20 May 2016 17:04:28 -0700
Subject: Automatic translation import

Change-Id: I2ed8183e1f98487f6af5d998a7a73efba5c535c3
Ticket: RM-214
---
 res/values-nb/cm_strings.xml | 46 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index bdbaea3..c2ea711 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -353,6 +353,7 @@
   <string name="app_ops_summaries_use_fingerprint">bruk fingeravtrykk</string>
   <string name="app_ops_summaries_use_body_sensors">bruke enhetssensorer</string>
   <string name="app_ops_summaries_read_cell_broadcasts">lese cellekringkastinger</string>
+  <string name="app_ops_summaries_mock_location">feil posisjon</string>
   <string name="app_ops_summaries_read_external_storage">lese ekstern lagring</string>
   <string name="app_ops_summaries_write_external_storage">skriv til ekstern lagring</string>
   <string name="app_ops_summaries_turn_screen_on">slå skjermen på</string>
@@ -376,12 +377,14 @@
   <string name="app_ops_labels_modify_calendar">Endre kalender</string>
   <string name="app_ops_labels_wifi_scan">Wi-Fi skanning</string>
   <string name="app_ops_labels_notification">Varsling/Toast</string>
+  <string name="app_ops_labels_cell_scan">Celle scan</string>
   <string name="app_ops_labels_call_phone">Ringe</string>
   <string name="app_ops_labels_read_sms">Les SMS</string>
   <string name="app_ops_labels_write_sms">Skriv SMS</string>
   <string name="app_ops_labels_receive_sms">Motta SMS</string>
   <string name="app_ops_labels_receive_emergency_sms">Motta beredskap SMS</string>
   <string name="app_ops_labels_receive_mms">Motta MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Motta WAP push</string>
   <string name="app_ops_labels_send_sms">Sende SMS</string>
   <string name="app_ops_labels_read_icc_sms">Les ICC SMS</string>
   <string name="app_ops_labels_write_icc_sms">Skriv ICC SMS</string>
@@ -404,14 +407,23 @@
   <string name="app_ops_labels_bluetooth_volume">Bluetoothvolum</string>
   <string name="app_ops_labels_keep_awake">hold våken</string>
   <string name="app_ops_labels_monitor_location">Overvåk plassering</string>
+  <string name="app_ops_labels_monitor_high_power_location">Overvåk kraftkrevende plassering</string>
+  <string name="app_ops_labels_get_usage_stats">Få brukstatistikker</string>
   <string name="app_ops_labels_mute_unmute_microphone">Demp/fjern demping mikrofon</string>
   <string name="app_ops_labels_toast_window">vise toastmeldinger</string>
   <string name="app_ops_labels_project_media">Prosjekt media</string>
   <string name="app_ops_labels_activate_vpn">Aktiver VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Skrive bakgrunn</string>
+  <string name="app_ops_labels_assist_structure">Hjelpestruktur</string>
+  <string name="app_ops_labels_assist_screenshot">Hjelpeskjermbilde</string>
+  <string name="app_ops_labels_read_phone_state">Lese telefontilstand</string>
   <string name="app_ops_labels_add_voicemail">Legg til mobilsvar</string>
   <string name="app_ops_labels_use_sip">Bruk SIP</string>
   <string name="app_ops_labels_make_call">Foreta anrop</string>
   <string name="app_ops_labels_use_fingerprint">Bruk fingeravtrykk</string>
+  <string name="app_ops_labels_use_body_sensors">Bruk enhetssensorer</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Les cellekringkastinger</string>
+  <string name="app_ops_labels_mock_location">Feil posisjon</string>
   <string name="app_ops_labels_read_external_storage">Les fra ekstern lagring</string>
   <string name="app_ops_labels_write_external_storage">Skriv til ekstern lagring</string>
   <string name="app_ops_labels_turn_screen_on">Slå skjermen på</string>
@@ -431,6 +443,7 @@
   <string name="app_ops_allowed_count">Tillat <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Avslåtte <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Tillatte <xliff:g id="count">%1$s</xliff:g>, avslåtte <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Deaktivert av batterioptimalisering</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Vis brukerinstallerte apps</string>
   <string name="app_ops_show_system_apps">Vis systemapper</string>
@@ -604,6 +617,7 @@
   <string name="live_display_color_profile_photography_title">Fotografi</string>
   <string name="live_display_color_profile_photography_summary">Perfekt fargegjengivelse for bilder</string>
   <string name="live_display_color_profile_basic_title">Grunnleggende</string>
+  <string name="live_display_color_profile_basic_summary">Bruk skjermen ukalibrert</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Valgikon</string>
   <string name="ime_switcher_notify_summary">Viser inndatametode snarvei</string>
@@ -713,6 +727,7 @@
   <string name="status_bar_battery_percentage_text_next">Ved siden av ikonet</string>
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Statusbarikoner</string>
+  <string name="status_bar_icons_summary">Kontroller hvilke av status ikonene som skal vises</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokker touchbevegelseshendelser</string>
   <string name="edge_gesture_service_summary">Ikke send touch hendelser for navigering og status bar bevegelser til apps</string>
@@ -790,6 +805,7 @@
   <string name="voice_wakeup_retrain_title">Tren stemme igjen</string>
   <string name="voice_wakeup_activity_title">Aktivitet som skal starte</string>
   <string name="voice_wakeup_default_activity">Google nå</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Stemmeoppvekking trenger telefon samtale tillatelser for å velge en Direkteoppringings kontakt.</string>
   <string name="picker_activities">Aktiviteter</string>
   <string name="select_custom_app_title">Velg egendefinert app</string>
   <string name="select_custom_activity_title">Velg egendefinert aktivitet</string>
@@ -858,12 +874,14 @@
   <string name="menu_hidden_apps_delete">Tilbakestille</string>
   <string name="menu_hidden_apps_reset_lock">Tilbakestille mønster lås</string>
   <string name="protected_apps">Beskyttede apps</string>
+  <string name="protected_apps_summary">Administrer hvilke apper som er skjult bak en sikkerhetslås</string>
   <string name="saving_protected_components">Lagre komponent status\u2026</string>
   <string name="pa_login_username_hint">Brukernavn (epost)</string>
   <string name="pa_login_password_hint">Passord</string>
   <string name="pa_login_submit_button">logg inn</string>
   <string name="pa_login_checking_password">Sjekker konto\u2026</string>
   <string name="pa_login_incorrect_login">Innlogging var feil</string>
+  <string name="pa_pattern_or_fingerprint_header">Må tegne mønster eller bruke fingeravtrykk for å låse opp</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">Bidragsytere</string>
   <string name="contributors_cloud_loading_message">Lasting bidragsytere data\u2026</string>
@@ -888,13 +906,18 @@
   <string name="title_general">Generelt</string>
   <string name="advanced">Avansert</string>
   <string name="link_volume_option_title">Link ringetone &amp; varslings volumer</string>
+  <string name="lcd_density_prompt_message">Noen apper kan kanskje ikke fungere på en ikke-standard DPI.\n\nDette vil starte enheten din på nytt.</string>
   <!-- Edit access point labels: PPP number -->
+  <string name="apn_ppp_number">APN PPP telefonnummer</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
   <string name="duplicate_apn_error_title">Dupliserte APN</string>
+  <string name="duplicate_apn_error_message">Denne APNen eksisterer allerede. Forkast eller bytt parametere.</string>
+  <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> er <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">deaktivert</string>
   <string name="sim_missing">manglende eller feil</string>
   <string name="sim_enabler_need_disable_sim">SIM-kortet vil bli deaktivert. Vil du fortsette?</string>
   <string name="sim_enabler_will_disable_sim_title">Oppmerksomhet</string>
+  <string name="sim_enabler_need_switch_data_service">Dette SIM-kortet vil bli deaktivert og SIM-kort <xliff:g id="slotid">%1$s</xliff:g> vil bli brukt til data servicer. Er du sikker på at du vil fortsette?</string>
   <string name="sim_enabler_airplane_on">Kan ikke utføre operasjonen mens Flymodus er på.</string>
   <string name="sim_enabler_in_call">Kan ikke utføre operasjonen i samtalen.</string>
   <string name="sim_enabler_both_inactive">Kan ikke deaktivere alle SIM-kort</string>
@@ -953,17 +976,22 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Annet</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi hotspot tidsavbrudd</string>
   <string name="hotstpot_inactivity_timeout_never">Aldri</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 minutt</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minutter</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minutter</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Portabel Wi\u2011Fi hotspot vil aldri ha tidsavbrudd</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Portabel Wi\u2011Fi hotspot vil ha tidsavbrudd etter <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <string name="live_lock_screen_title">Levende skjermlås</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Aktiver og konfigurer Levende skjermlåser</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Innstillinger</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">For å se tilgjengelige Levende skjermlåser, må du slå Levende skjermlåser på.</string>
   <string name="interruptions_ignore_while_media_title">Hindre lyd ducking</string>
   <string name="interruptions_ignore_while_media_summary">Ikke Reduser media avspillingsvolumet når en melding ankommer</string>
   <!-- CM Legal -->
@@ -978,13 +1006,31 @@
   <string name="battery_info_status_charging_dock_ac">Lader på dokk AC</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Lader via dokk-USB</string>
+  <string name="restrict_app_wlan_title">Deaktiver appens Wi\u2011Fi bruk</string>
+  <string name="restrict_app_wlan_summary">Hindre programmet i å bruke Wi\u2011Fi datatilkobling</string>
+  <string name="restrict_app_cellular_title">Deaktiver appens mobildatabruk</string>
+  <string name="restrict_app_cellular_summary">Hindre programmet i å bruke mobildata tilkobling</string>
   <string name="privacy_guard_internet_category">Internett</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vær</string>
+  <string name="weather_settings_no_services_prompt">Ingen værleverandør tjeneste installert</string>
+  <string name="weather_settings_button">Leverandørinnstillinger</string>
+  <string name="weather_settings_activity_not_found">Kan ikke starte innstillingsmenyen for denne leverandøren</string>
+  <string name="weather_settings_add_weather_provider">Legg til vær leverandør</string>
   <string name="weather_settings_general_settings_title">Generelt</string>
+  <string name="weather_settings_providers_title">Leverandører</string>
+  <string name="weather_settings_temp_units_title">Temperatur enhet</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">vær</string>
+  <string name="background_data_access">Bakgrunnsdatatilgang</string>
+  <string name="allow_background_both">Via mobildata &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Bare over Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen tilgang</string>
   <string name="mobile_data_alert">Mobildata varsel</string>
+  <string name="mobile_data_alert_summary">Varsle når appen bruker en betydelig mengde data</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktiver databruk varsler</string>
+  <string name="data_usage_menu_disable_data_alerts">Deaktiver databruk varsler</string>
   <string name="data_usage_menu_reset_stats">Nullstill data statistikker</string>
   <string name="reset_data_stats_msg">Dette vil fjerne alt av tidligere og nåværende datasporing innformasjon</string>
   <string name="reset_stats_confirm">Bekreft</string>
-- 
cgit v1.1


From 5599680aa5c84f00a0ee148186e66e2476ce6184 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 10 May 2016 09:25:31 -0700
Subject: Give user control over lock screen blur

This will provide control over blurring since the current implementation
assumes it is always on provided the device config specifies it
supports blur.

Change-Id: I7add45c607fcf47777d61629a3fc6245ffedb339
---
 res/values/cm_strings.xml                      | 3 +++
 res/xml/security_settings_chooser.xml          | 5 +++++
 res/xml/security_settings_password.xml         | 5 +++++
 res/xml/security_settings_pattern.xml          | 5 +++++
 res/xml/security_settings_pin.xml              | 5 +++++
 src/com/android/settings/SecuritySettings.java | 9 +++++++++
 6 files changed, 32 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 27ca707..c02a8f8 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1213,4 +1213,7 @@
 
     <!-- Label for settings shortcut: carrier selection -->
     <string name="shortcut_carrier_title">Network operators</string>
+
+    <!-- title for lock screen blur preference -->
+    <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
 </resources>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index a097abf..cad2534 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -51,6 +51,11 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index 680a579..f926378 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -77,6 +77,11 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 2576ea7..1e04839 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -93,6 +93,11 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index a378ef9..c5d849d 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -82,6 +82,11 @@
             android:title="@string/lockscreen_visualizer_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_blur_enabled"
+            android:title="@string/lockscreen_blur_enabled_title"
+            android:defaultValue="true"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 6337800..35451d7 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -125,6 +125,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
     private static final String KEY_SMS_SECURITY_CHECK_PREF = "sms_security_check_limit";
     private static final String KEY_GENERAL_CATEGORY = "general_category";
     private static final String KEY_LIVE_LOCK_SCREEN = "live_lock_screen";
+    private static final String KEY_LOCK_SCREEN_BLUR = CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED;
 
     // These switch preferences need special handling since they're not all stored in Settings.
     private static final String SWITCH_PREFERENCE_KEYS[] = { KEY_LOCK_AFTER_TIMEOUT,
@@ -359,6 +360,14 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 setLiveLockScreenPreferenceTitleAndSummary(liveLockPreference);
                 groupToAddTo.addPreference(liveLockPreference);
             }
+
+            // only show blur setting for devices that support it
+            boolean blurSupported = getResources().getBoolean(
+                    com.android.internal.R.bool.config_ui_blur_enabled);
+            if (!blurSupported) {
+                Preference blurEnabledPref = root.findPreference(KEY_LOCK_SCREEN_BLUR);
+                if (blurEnabledPref != null) root.removePreference(blurEnabledPref);
+            }
         }
 
         if (securityOrExternal) {
-- 
cgit v1.1


From e0c4195281314478a0aee3e982a00c101bf86054 Mon Sep 17 00:00:00 2001
From: luca020400 <luca.stefani.ge1@gmail.com>
Date: Mon, 23 May 2016 09:06:16 +0200
Subject: Settings: Fix blur preference removal

* The preference lives in the General category group

Change-Id: Ia6ab514557f6ff0c731a9d2a342f8bfea98bd0a6
---
 src/com/android/settings/SecuritySettings.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 35451d7..9305f0a 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -365,8 +365,8 @@ public class SecuritySettings extends SettingsPreferenceFragment
             boolean blurSupported = getResources().getBoolean(
                     com.android.internal.R.bool.config_ui_blur_enabled);
             if (!blurSupported) {
-                Preference blurEnabledPref = root.findPreference(KEY_LOCK_SCREEN_BLUR);
-                if (blurEnabledPref != null) root.removePreference(blurEnabledPref);
+                Preference blurEnabledPref = generalCategory.findPreference(KEY_LOCK_SCREEN_BLUR);
+                if (blurEnabledPref != null) generalCategory.removePreference(blurEnabledPref);
             }
         }
 
-- 
cgit v1.1


From 6f68d2e4ffe3a56e631bc166740166608ef39dc9 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Fri, 20 May 2016 17:54:32 -0700
Subject: Settings: Remove redundant definition of SoundSettingsActivity.

  Causes CTS cross-profile intent verification failure.

Change-Id: Id1c92c45cb1fb89e34598d54b9eb45497d629eac
TICKET: FEIJ-104
---
 AndroidManifest.xml                    | 4 ++--
 src/com/android/settings/Settings.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 349bca7..26e03a7 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2487,7 +2487,7 @@
                        android:resource="@id/sound_settings" />
         </activity>
 
-        <activity android:name="Settings$SoundSettingsActivity"
+        <activity android:name="Settings$CMSoundSettingsActivity"
                 android:label="@string/notification_settings"
                 android:exported="true"
                 android:taskAffinity="">
@@ -2512,7 +2512,7 @@
         <activity-alias android:name="Settings$SoundSettingsActivity"
                 android:label="@string/notification_settings"
                 android:taskAffinity=""
-                android:targetActivity="Settings$SoundSettingsActivity">
+                android:targetActivity="Settings$CMSoundSettingsActivity">
             <intent-filter android:priority="1">
                 <action android:name="com.android.settings.SOUND_SETTINGS" />
                 <action android:name="android.settings.SOUND_SETTINGS" />
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 8af3c80..0834b4f 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -124,7 +124,7 @@ public class Settings extends SettingsActivity {
     public static class ProfilesSettingsActivity extends SettingsActivity { /* empty */ }
     public static class AnonymousStatsActivity extends Settings { /* empty */ }
     public static class ContributorsCloudActivity extends SettingsActivity { /* empty */ }
-    public static class SoundSettingsActivity extends SettingsActivity { /* empty */ }
+    public static class CMSoundSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class LiveLockScreenSettingsActivity extends SettingsActivity { /* empty */ }
     public static class NotificationManagerActivity extends SettingsActivity { /* empty */ }
-- 
cgit v1.1


From 477dca6c3bc6064aac635a661ef7ab6c83bc7c3c Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 24 May 2016 17:51:54 +0200
Subject: Fix NPE when user has his lockscreen set to "None"

Change-Id: Ib4d9612de740009f68f995fdb00c0e5bb38858f6
---
 src/com/android/settings/SecuritySettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 9305f0a..0fd5d2c 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -364,7 +364,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
             // only show blur setting for devices that support it
             boolean blurSupported = getResources().getBoolean(
                     com.android.internal.R.bool.config_ui_blur_enabled);
-            if (!blurSupported) {
+            if (!blurSupported && generalCategory != null) {
                 Preference blurEnabledPref = generalCategory.findPreference(KEY_LOCK_SCREEN_BLUR);
                 if (blurEnabledPref != null) generalCategory.removePreference(blurEnabledPref);
             }
-- 
cgit v1.1


From 317b86efdaa3d87b985c97e8859c21ca473a1f85 Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Tue, 24 May 2016 08:46:20 -0700
Subject: Settings: Update oem unlocking status when dismiss

When oem unlocking confirm dialog dismiss, need
to update the checkbox status also.

FEIJ-780

Change-Id: I9b5c4446ecd9736051fb7b6c12ad22aa0d985a85
---
 src/com/android/settings/DevelopmentSettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 3054cec..630844a 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1761,7 +1761,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                Utils.setOemUnlockEnabled(getActivity(), true);
+                if (which == DialogInterface.BUTTON_POSITIVE) {
+                    Utils.setOemUnlockEnabled(getActivity(), true);
+                }
                 updateAllOptions();
             }
         };
@@ -1770,7 +1772,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 .setTitle(R.string.confirm_enable_oem_unlock_title)
                 .setMessage(R.string.confirm_enable_oem_unlock_text)
                 .setPositiveButton(R.string.enable_text, onConfirmListener)
-                .setNegativeButton(android.R.string.cancel, null)
+                .setNegativeButton(android.R.string.cancel, onConfirmListener)
                 .create()
                 .show();
     }
-- 
cgit v1.1


From d48e7e93555b88749d6204ba6fd430aafc8cce30 Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Tue, 24 May 2016 15:25:09 -0700
Subject: Settings: Update oem unlocking status with back button

When oem unlocking confirm dialog dismiss by back button,
the enable oem lock status is not consistent.

FEIJ-780

Change-Id: I42a33896c8d844d965cfc706872903175ffbf1cc
---
 src/com/android/settings/DevelopmentSettings.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 630844a..04e28e7 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1758,7 +1758,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     }
 
     private void confirmEnableOemUnlock() {
-        DialogInterface.OnClickListener onConfirmListener = new DialogInterface.OnClickListener() {
+        DialogInterface.OnClickListener onEnableOemListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 if (which == DialogInterface.BUTTON_POSITIVE) {
@@ -1771,8 +1771,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.confirm_enable_oem_unlock_title)
                 .setMessage(R.string.confirm_enable_oem_unlock_text)
-                .setPositiveButton(R.string.enable_text, onConfirmListener)
-                .setNegativeButton(android.R.string.cancel, onConfirmListener)
+                .setPositiveButton(R.string.enable_text, onEnableOemListener)
+                .setNegativeButton(android.R.string.cancel, onEnableOemListener)
+                .setCancelable(false)
                 .create()
                 .show();
     }
-- 
cgit v1.1


From e3b9678622a0e3d6a91c9261b948a438f52b7f8b Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Tue, 24 May 2016 15:30:28 -0700
Subject: Settings: Disable cancelable with multi-windows confirm dialog

When muliti-windows confirm dialog is dismissed by back button,
the status will become inconsistent.

Change-Id: Ie00099dce395f08d9ad782482863f2120977d240
---
 src/com/android/settings/DevelopmentSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 04e28e7..cfdf921 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -1792,6 +1792,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 .setMessage(R.string.confirm_enable_multi_window_text)
                 .setPositiveButton(R.string.enable_text, onConfirmListener)
                 .setNegativeButton(android.R.string.cancel, onConfirmListener)
+                .setCancelable(false)
                 .create()
                 .show();
     }
-- 
cgit v1.1


From d13fe2ca488fea9627794385b5f563bac55d86ae Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@cyngn.com>
Date: Thu, 26 May 2016 18:57:52 -0700
Subject: Automatic translation import

Change-Id: I319222d474b4254d912be3ad8a29a2a5f578b1ac
Ticket: RM-214
---
 res/values-af/cm_strings.xml      | 1 +
 res/values-am/cm_strings.xml      | 1 +
 res/values-ar/cm_strings.xml      | 1 +
 res/values-as-rIN/cm_strings.xml  | 1 +
 res/values-ast-rES/cm_strings.xml | 1 +
 res/values-az-rAZ/cm_strings.xml  | 1 +
 res/values-be/cm_strings.xml      | 1 +
 res/values-bg/cm_strings.xml      | 2 ++
 res/values-bn-rBD/cm_strings.xml  | 1 +
 res/values-br-rFR/cm_strings.xml  | 1 +
 res/values-ca/cm_strings.xml      | 2 ++
 res/values-cs/cm_strings.xml      | 6 ++++--
 res/values-csb-rPL/cm_strings.xml | 1 +
 res/values-cy/cm_strings.xml      | 1 +
 res/values-da/cm_strings.xml      | 1 +
 res/values-de/cm_strings.xml      | 1 +
 res/values-el/cm_strings.xml      | 2 ++
 res/values-en-rAU/cm_strings.xml  | 1 +
 res/values-en-rGB/cm_strings.xml  | 1 +
 res/values-en-rIN/cm_strings.xml  | 1 +
 res/values-en-rPT/cm_strings.xml  | 1 +
 res/values-eo/cm_strings.xml      | 1 +
 res/values-es-rMX/cm_strings.xml  | 1 +
 res/values-es-rUS/cm_strings.xml  | 8 ++++++++
 res/values-es/cm_strings.xml      | 1 +
 res/values-et-rEE/cm_strings.xml  | 1 +
 res/values-eu-rES/cm_strings.xml  | 1 +
 res/values-fa/cm_strings.xml      | 1 +
 res/values-fi/cm_strings.xml      | 2 ++
 res/values-fil-rPH/cm_strings.xml | 1 +
 res/values-fr-rCA/cm_strings.xml  | 1 +
 res/values-fr/cm_strings.xml      | 1 +
 res/values-frp-rIT/cm_strings.xml | 1 +
 res/values-fy-rNL/cm_strings.xml  | 1 +
 res/values-gd-rGB/cm_strings.xml  | 1 +
 res/values-gl-rES/cm_strings.xml  | 1 +
 res/values-gu-rIN/cm_strings.xml  | 1 +
 res/values-hi/cm_strings.xml      | 1 +
 res/values-hr/cm_strings.xml      | 1 +
 res/values-hu/cm_strings.xml      | 1 +
 res/values-hy-rAM/cm_strings.xml  | 1 +
 res/values-in/cm_strings.xml      | 1 +
 res/values-is-rIS/cm_strings.xml  | 1 +
 res/values-it/cm_strings.xml      | 1 +
 res/values-iw/cm_strings.xml      | 1 +
 res/values-ja/cm_strings.xml      | 7 ++++---
 res/values-ka-rGE/cm_strings.xml  | 1 +
 res/values-kk-rKZ/cm_strings.xml  | 1 +
 res/values-km-rKH/cm_strings.xml  | 1 +
 res/values-kn-rIN/cm_strings.xml  | 1 +
 res/values-ko/cm_strings.xml      | 1 +
 res/values-ku/cm_strings.xml      | 1 +
 res/values-ky-rKG/cm_strings.xml  | 1 +
 res/values-lb/cm_strings.xml      | 1 +
 res/values-lo-rLA/cm_strings.xml  | 1 +
 res/values-lt/cm_strings.xml      | 1 +
 res/values-lv/cm_strings.xml      | 1 +
 res/values-mk-rMK/cm_strings.xml  | 1 +
 res/values-ml-rIN/cm_strings.xml  | 1 +
 res/values-mn-rMN/cm_strings.xml  | 1 +
 res/values-mr-rIN/cm_strings.xml  | 1 +
 res/values-ms-rMY/cm_strings.xml  | 1 +
 res/values-my-rMM/cm_strings.xml  | 1 +
 res/values-nb/cm_strings.xml      | 2 ++
 res/values-ne-rNP/cm_strings.xml  | 1 +
 res/values-nl/cm_strings.xml      | 1 +
 res/values-oc-rFR/cm_strings.xml  | 1 +
 res/values-or-rIN/cm_strings.xml  | 1 +
 res/values-pa-rIN/cm_strings.xml  | 1 +
 res/values-pl/cm_strings.xml      | 1 +
 res/values-pt-rBR/cm_strings.xml  | 2 ++
 res/values-pt-rPT/cm_strings.xml  | 2 ++
 res/values-rm/cm_strings.xml      | 1 +
 res/values-ro/cm_strings.xml      | 1 +
 res/values-ru/cm_strings.xml      | 1 +
 res/values-si-rLK/cm_strings.xml  | 1 +
 res/values-sk/cm_strings.xml      | 1 +
 res/values-sl/cm_strings.xml      | 2 ++
 res/values-sq-rAL/cm_strings.xml  | 1 +
 res/values-sr/cm_strings.xml      | 1 +
 res/values-sv/cm_strings.xml      | 7 +++++++
 res/values-sw/cm_strings.xml      | 1 +
 res/values-ta-rIN/cm_strings.xml  | 1 +
 res/values-te-rIN/cm_strings.xml  | 1 +
 res/values-th/cm_strings.xml      | 1 +
 res/values-tr/cm_strings.xml      | 1 +
 res/values-ug/cm_strings.xml      | 1 +
 res/values-uk/cm_strings.xml      | 1 +
 res/values-ur-rPK/cm_strings.xml  | 1 +
 res/values-uz-rUZ/cm_strings.xml  | 1 +
 res/values-vi/cm_strings.xml      | 1 +
 res/values-zh-rCN/cm_strings.xml  | 2 ++
 res/values-zh-rHK/cm_strings.xml  | 1 +
 res/values-zh-rTW/cm_strings.xml  | 1 +
 res/values-zu/cm_strings.xml      | 1 +
 95 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index fad3101..5c2d2c4 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1012,4 +1012,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Algemeen</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 2cdffac..207fb66 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1046,4 +1046,5 @@
   <string name="restrict_cellular_access_dialog_summary">قد تسبب هذه الميزة توقف تطبيق معين يعتمد على الوصول إلى شبكة الاتصال لإيقاف العمل في حالة توفر شبكات خلوية.\n\nيمكنك العثور على ضوابط أكثر ملاءمة لاستخدام البيانات في الإعدادات المتوفرة داخل التطبيق.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">مشغلات الشبكات</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 8063d5d..b95f300 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">সাধাৰণ</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 63cd04d..72e4638 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -891,4 +891,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="restrict_cellular_access_summary">Deshabilita l\'accesu de datos en redes móviles</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 518270f..9e1ebe3 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -708,4 +708,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Ümumi</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index a6adad9..d094765 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -990,4 +990,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Агульныя</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 34fb49f..5faeb9e 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Тази функция може да спре работата на приложение което зависи от достъп до интернет когато са налични само мобилни данни\n\n Може да намерите по-подходящи настройки в настройките на приложението.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Мрежови оператори</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Замъгляване на заключен екран</string>
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 44e6c77..b3075e1 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -559,4 +559,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">সাধারণ</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index e29dff8..2e271af 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Aquesta característica podria provocar que una aplicació que depèn de l\'accés a la xarxa deixi de funcionar quan només les xarxes mòbils estiguin disponibles.\n\nPots trobar els controls d\'ús de dades més adequats a la configuració disponible dins de l\'aplicació.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadors de xarxa</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfocament de la pantalla de bloqueig</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 24ed282..eb5ad94 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -698,8 +698,8 @@
   <string name="status_bar_notif_count_summary">Zobrazí počet nezobrazených upozornění v oznamovací oblasti</string>
   <string name="status_bar_quick_qs_pulldown_title">Rychlé stažení nabídky</string>
   <string name="status_bar_quick_qs_pulldown_summary">Tažením dolů z %1$s strany stavové lišty se vysune rychlé nastavení</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Nalevo</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Napravo</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Vlevo</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Vpravo</string>
   <string name="status_bar_quick_qs_pulldown_off">Vypnuto</string>
   <string name="status_bar_quick_qs_pulldown_left">Nalevo</string>
   <string name="status_bar_quick_qs_pulldown_right">Napravo</string>
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Tato vlastnost může způsobit zastavení funkčnosti některých aplikací, které jsou závislé na přístupu k datům a zařízení je právě připojeno pouze k mobilní datové síti.\n\nVhodnějsí omezení využití dat je možné nalézt v ovládání používání datových sítí v nastavení aplikace.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Síťový poskytovatelé</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Rozostření zamykací obrazovky</string>
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index dd17d6b..cb9db22 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="reset_stats_confirm">Bekræft</string>
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 3482514..5a624d5 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <string name="restrict_cellular_access_dialog_summary">Diese Funktion kann dazu führen, dass eine App, die Netzzugang benötigt, nicht mehr funktioniert, wenn nur das Mobilfunknetz zur Verfügung steht.\n\nPassendere Einstellungen können Sie in den App-eigenen Einstellungen finden.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netzbetreiber</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index e0ecab5..4285dc6 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1044,4 +1044,6 @@
   <string name="restrict_cellular_access_dialog_summary">Αυτή η δυνατότητα μπορεί να προκαλέσει μια εφαρμογή που εξαρτάται από την πρόσβαση στο δίκτυο να σταματήσει να λειτουργεί όταν υπάρχουν μόνο δίκτυα κινητής τηλεφωνίας διαθέσιμα.\n\nΜπορείτε να βρείτε πιο κατάλληλους ελέγχους της χρήσης δεδομένων στις ρυθμίσεις που είναι διαθέσιμες μέσα από την εφαρμογή.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Εταιρίες δικτύου</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Θόλωμα οθόνης κλειδώματος</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index edfcd59..529a588 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -766,4 +766,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 0344221..222c557 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -193,4 +193,5 @@
   <string name="restrict_cellular_access_dialog_title">Restrict mobile data access?</string>
   <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 7d5e118..7624a00 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -910,4 +910,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index f28d4e3..5d88574 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -845,4 +845,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Ĝeneralo</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index f81c262..245cde9 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -295,4 +295,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index f41921b..62715b1 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1016,7 +1016,13 @@
   <string name="weather_settings_no_services_prompt">No hay servicios de proveedores del clima instalados</string>
   <string name="weather_settings_button">Ajustes del proveedor</string>
   <string name="weather_settings_activity_not_found">No se puede iniciar el menú de configuración de este proveedor</string>
+  <string name="weather_settings_add_weather_provider">Agregar proveedor de clima</string>
   <string name="weather_settings_general_settings_title">General</string>
+  <string name="weather_settings_providers_title">Proveedores</string>
+  <string name="weather_settings_temp_units_title">Unidad de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">clima</string>
   <string name="background_data_access">Acceso a datos en segundo plano</string>
   <string name="allow_background_both">Sobre datos celulares &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Solo por Wi-Fi</string>
@@ -1034,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de funcionar cuando haya solo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 9bfe6df..476d76c 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1034,4 +1034,5 @@
   <string name="restrict_cellular_access_dialog_summary">Esta función puede causar que una aplicación que depende del acceso a la red deje de trabajar cuando hayan sólo redes móviles disponibles.\n\nPuede encontrar los controles de uso de datos más adecuados en la configuración disponible dentro de la aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 74badf8..91ba135 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -885,4 +885,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Üldine</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 9d4fe2d..c92d326 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <string name="restrict_cellular_access_dialog_summary">Ezaugarri honek sareko datuak behar dituen aplikazio batek ez funtzionatzea eragin dezake sare mugikorrak besterik ez daudenean eskuragarri.\n\nAplikazioaren aukeretan datu erabileraren kontrol egokiagoak aurkitu ditzakezu.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Sare operadoreak</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index cf500f6..afd5bb4 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -893,4 +893,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">عمومي</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 1fff8ed..7cafde0 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Tämä ominaisuus voi aiheuttaa verkkoyhteydestä riippuvaisen sovelluksen toiminnan lakkaamisen kun vain mobiilidataverkko on käytettävissä.\n\nLöydät lisää tiedonsiirron hallintaominaisuuksia sovelluksesta.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Verkko-operaattorit</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Lukitusnäytön sumennus</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 3d7407d..d841e5b 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1041,4 +1041,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="restrict_cellular_access_dialog_summary">Cette fonctionnalité peut empêcher le fonctionnement d\'une appli dépendante d\'un accès au réseau lorsque seuls des réseaux mobiles sont disponibles.\n\nVous pouvez trouver des options plus appropriées de gestion de l\'utilisation des données dans les paramètres disponibles dans cette appli.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Opérateurs réseau</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index cc81f36..7cfd726 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -189,4 +189,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 394114f..3960f72 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -435,4 +435,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index a51f4b8..affd278 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1007,4 +1007,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">સામાન્ય</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index ee2ad6e..a8e229b 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -858,4 +858,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index e68b0e9..89e2dd6 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1041,4 +1041,5 @@
   <string name="restrict_cellular_access_dialog_summary">Ova značajka može uzrokovati da aplikacija koja je ovisna o pristupu mreži prestane raditi kada je samo mobilna veza dostupna.\n\nPrimjerenije postavke kontrole potrošnje podataka možete naći u aplikaciji.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Mrežni operateri</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index a56a73e..b4a630f 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1007,4 +1007,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Általános</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 1f21561..22301a1 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1039,4 +1039,5 @@
   <string name="restrict_cellular_access_dialog_summary">Fitur ini dapat menyebabkan sebuah aplikasi yang bergantung pada akses jaringan untuk berhenti bekerja apabila hanya jaringan seluler yang tersedia.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih tepat dalam Pengaturan yang tersedia dalam aplikasi.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operator jaringan</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index f274b53..cd99b78 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="restrict_cellular_access_dialog_summary">Questa funzione potrebbe impedire ad un\'app di funzionare correttamente quando sei connesso solo con dati mobili.\n\nPotresti trovare controlli per l\'utilizzo dati pià appropriati all\'interno delle impostazioni dell\'app stessa.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatori di rete</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 74119de..68a4c55 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <string name="restrict_cellular_access_dialog_summary">תכונה זו עלולה לגרום להפסקת פעולתו של יישום התלוי בגישה לרשת כאשר קיימת זמינות לרשתות סלולריות בלבד.\n\nתוכל למצוא פקדים מתאימים יותר לשימוש בנתונים, בהגדרות הזמינות בתוך היישום.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ספקי סלולר</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 2701feb..c3548bf 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -161,7 +161,7 @@
   <string name="toggleWifiAp">Wi\u2011Fiテザリング</string>
   <string name="toggleBluetooth">Bluetooth</string>
   <string name="toggleGPS">GPS</string>
-  <string name="toggleData">データ通信</string>
+  <string name="toggleData">データ接続</string>
   <string name="toggleSync">データの自動同期</string>
   <string name="toggle2g3g4g">優先ネットワークの種類</string>
   <string name="toggle2g3g4g_msim">優先ネットワークの種類（%1$s）</string>
@@ -360,7 +360,7 @@
   <string name="app_ops_summaries_toggle_bluetooth">Bluetoothの切り替え</string>
   <string name="app_ops_summaries_start_at_boot">ブート時の実行</string>
   <string name="app_ops_summaries_toggle_nfc">NFCの切り替え</string>
-  <string name="app_ops_summaries_toggle_mobile_data">データ通信の切り替え</string>
+  <string name="app_ops_summaries_toggle_mobile_data">モバイルデータの切り替え</string>
   <string name="app_ops_summaries_superuser">ルートアクセス</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">おおよその位置情報</string>
@@ -430,7 +430,7 @@
   <string name="app_ops_labels_toggle_bluetooth">Bluetoothの切り替え</string>
   <string name="app_ops_labels_start_at_boot">ブート時の実行</string>
   <string name="app_ops_labels_toggle_nfc">NFCの切り替え</string>
-  <string name="app_ops_labels_toggle_mobile_data">データ通信の切り替え</string>
+  <string name="app_ops_labels_toggle_mobile_data">モバイルデータの切り替え</string>
   <string name="app_ops_labels_superuser">ルートアクセス</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">許可</string>
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">全般</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 033e4a5..906536e 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1007,4 +1007,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">ಸಾಮಾನ್ಯ</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 8d38844..e7c1f0b 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1033,4 +1033,5 @@
   <string name="restrict_cellular_access_dialog_summary">이 기능은 셀룰러 네트워크만 사용할 때 네트워크 연결이 필요한 앱의 정상적인 작동을 방해할 수 있습니다.\n\n앱의 설정에서 데이터 사용량을 조절할 수 있는 설정을 찾을 수 있습니다.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">네트워크 영업자</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index b4a6e35..b41e6f2 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -767,4 +767,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">گشتی</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index e8dd1eb..32c0449 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -888,4 +888,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Allgemeng</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index d0d5ec0..fb34936 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -893,4 +893,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Bendra</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 81f79e5..df12839 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -551,4 +551,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Vispārīgi</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index cf75cba..280a3ea 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">പൊതുവായത്</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index af00e54..9d96759 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index c2ea711..f7e714f 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Denne funksjonen kan forårsake at en app som avhenger av nettverkstilgang slutter å virke når bare mobilnettverk er tilgjengelig.\n\nDu finner mer hensiktsmessig databruk kontrolleringsinnstillinger tilgjengelig i appens innstillinger.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nettverksoperatører</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Låseskjerm utydelighet</string>
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index e89d2b7..0b2285b 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1014,4 +1014,5 @@
   <string name="allow_background_none">Geen toegang</string>
   <string name="reset_stats_confirm">Bevestigen</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 889da83..16a2b87 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">ସାଧାରଣ</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 5017145..c5f6342 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1031,4 +1031,5 @@
   <string name="restrict_cellular_access_dialog_title">Ograniczyć dostęp do danych mobilnych?</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index c67fa9d..31d9d50 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que um app que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nVocê pode encontrar ferramentas mais apropriadas para o controle de dados nas configurações disponíveis no app.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Tela de bloqueio embaçada</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 1636fac..353bc1b 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1040,4 +1040,6 @@
   <string name="restrict_cellular_access_dialog_summary">Este recurso pode fazer com que uma aplicação que dependa de acesso à rede deixe de responder quando só estiverem disponíveis redes móveis.\n\nPoderá encontrar ferramentas mais apropriadas para o controlo de dados nas definições disponíveis na aplicação.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desfocagem do ecrã de bloqueio</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 61a6208..19b7971 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -929,4 +929,5 @@
   <string name="weather_settings_title">Vremea</string>
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 559c310..a4322d8 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1039,4 +1039,5 @@
   <string name="restrict_cellular_access_dialog_summary">Данная функция может приостановить работу приложений, использующих доступ к сети, если будут доступны только мобильные сети.\n\nДополнительные параметры управления использованием данных можно найти в настройках приложения.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Операторы сети</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 5c5306b..6c96921 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -559,4 +559,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">ප්‍රධාන</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 43010a5..ad1c22b 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -893,4 +893,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Všeobecné</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 2fb02fb..bac5a37 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1044,4 +1044,6 @@
   <string name="restrict_cellular_access_dialog_summary">Ta značilnost lahko povzroči, da aplikacija, ki je odvisna od dostopa do omrežja, preneha delovati, ko so na voljo samo mob. omrežja.\n\nPrimernejše nastavitve nadzora porabe podatkov lahko najdete v aplikaciji.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Omrežni operaterji</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Zamegljenost zaklenjenega zaslona</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index b1a6774..cfcc3ea 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1036,4 +1036,5 @@
   <string name="restrict_cellular_access_dialog_summary">Ова функција може узроковати да апликација која зависи од мрежног приступа престане радити када су само мобилне мрежа доступне.\n\nМожеш наћи више одговарајућих контрола у подешавању апликације.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Оператор мреже</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 00fad60..9ba97fc 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1014,9 +1014,16 @@ inkluderar en unik identifikation,
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Väder</string>
+  <string name="weather_settings_add_weather_provider">Lägg till väderleverantör</string>
   <string name="weather_settings_general_settings_title">Allmänt</string>
+  <string name="weather_settings_providers_title">Leverantörer</string>
+  <string name="weather_settings_temp_units_title">Temperaturenhet</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">väder</string>
   <string name="allow_background_wlan">Endast över Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen åtkomst</string>
   <string name="reset_stats_confirm">Bekräfta</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 7ffeebe..dc0978e 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">பொது</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 4f0f647..1ef7504 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1005,4 +1005,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">సాధారణం</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index ae68567..73897a6 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1039,4 +1039,5 @@
   <string name="restrict_cellular_access_dialog_summary">ความสามารถนี้อาจทำใหแอปที่ต้องใช้งานเครือข่ายหยุดทำงานเมื่อมีเพียงเครือข่ายมือถือเท่านั้นที่ใช้งานได้\n\nคุณสามารถตั้งการควบคุมข้อมูลให้เหมาะสมได้จากการตั้งค่าผ่านแอปเหล่านั้น</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ผู้ให้บริการเครือข่าย</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index c42355b..4a49fd7 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <string name="restrict_cellular_access_dialog_summary">Bu özellik sadece hücresel ağ kullanılabilirken ağ erişimine bağlı çalışan bir uygulamanın çalışmayı durdurmasına sebep olabilir.\n\nDaha uygun veri kullanım seçeneklerini uygulama içindeki ayarlardan bulabilirsiniz.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Ağ operatörleri</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index a45326e..ee8eacb 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1014,4 +1014,5 @@
   <string name="reset_stats_confirm">جەزملەش</string>
   <string name="restrict_cellular_access_dialog_summary">كۆچمە تورغىلا باغلىنىدىغان ئەھۋالدا، بۇ ئىقتىدار تەگلىك سانلىق مەلۇماتىغا ئېھتىياجلىق پىروگراممىنىڭ خىزمەت قىلىشىنى توختىتىپ قويۇشى مۇمكىن.\n\nسىز شۇ ئەپنىڭ تەمىنلىگەن تەڭشىكىدىن سانلىق مەلۇمات ئېقىمىنى تىزگىنلەيدىغان تېخىمۇ مۇۋاپىق تاللانمىنى تاپالىشىڭىز مۇمكىن.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 957d3cc..879952b 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -941,4 +941,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">Головні</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 5a78e6a..bdc794e 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1039,4 +1039,5 @@
   <string name="restrict_cellular_access_dialog_summary">Tính năng này có thể khiến một ứng dụng phụ thuộc vào việc truy cập mạng ngừng hoạt động khi chỉ sẵn có mạng di động.\n\nBạn có thể tìm thấy các quyền kiểm soát sử dụng dữ liệu thích hợp hơn trong các cài đặt sẵn có trong ứng dụng.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index ca79553..1c9c739 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1037,4 +1037,6 @@
   <string name="restrict_cellular_access_dialog_summary">此功能在仅有移动数据网络时可能会导致依赖网络访问的应用停止工作。\n\n您可以在设置中找到对于该应用更加合适的数据使用情况控制。</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">网络运营商</string>
+  <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">锁屏模糊</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index d6814cf..01bf083 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -833,4 +833,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 2ee4e2c..87c2a90 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -870,4 +870,5 @@
   <!-- Weather -->
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 262bd43..721627e 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -180,4 +180,5 @@
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
 </resources>
-- 
cgit v1.1


From 9546c00936b4458b3bf932d62c28b3219ea6a03e Mon Sep 17 00:00:00 2001
From: Lars Greiss <kufikugel@googlemail.com>
Date: Mon, 24 Nov 2014 23:50:07 +0100
Subject: Settings: Add per app controls for LP keyguard notifications (2/2)

Nice done by google but the UX is a problem especially for ppl who are using a lot apps and just want
to see from important apps the notifications on the lockscreen.

This commit adds the ability to

- enable/disable per app the keyguard notification at all
- enable/disable per app ongoing notifications on the keyguard

We handle this over the app policy conf file like the other per app notification options

TICKET: CRACKLING-1127
Change-Id: I12df484379621c3baba333d30a8b545b3a0ec0ae
---
 res/values/cm_strings.xml                          |  7 ++++
 res/xml/app_notification_settings.xml              | 18 +++++++-
 .../notification/AppNotificationSettings.java      | 49 ++++++++++++++++++++++
 .../settings/notification/NotificationBackend.java | 19 +++++++++
 4 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index c02a8f8..4b97f89 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1216,4 +1216,11 @@
 
     <!-- title for lock screen blur preference -->
     <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
+
+    <!-- Per app controls for LP keyguard notifications -->
+    <string name="app_notification_show_on_keyguard_title">Show on lockscreen</string>
+    <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lockscreen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lockscreen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lockscreen</string>
+
 </resources>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index b7557b2..f438e2f 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -50,11 +50,27 @@
             android:order="4"
             android:persistent="false" />
 
+    <!-- Keyguard options -->
+    <SwitchPreference
+            android:key="show_on_keyguard"
+            android:title="@string/app_notification_show_on_keyguard_title"
+            android:summary="@string/app_notification_show_on_keyguard_summary"
+            android:order="5"
+            android:persistent="false" />
+
+    <SwitchPreference
+            android:key="no_ongoing_on_keyguard"
+            android:title="@string/app_notification_no_ongoing_on_keyguard_title"
+            android:summary="@string/app_notification_no_ongoing_on_keyguard_summary"
+            android:order="6"
+            android:dependency="show_on_keyguard"
+            android:persistent="false" />
+
     <!-- App notification preferences -->
     <Preference
             android:key="app_settings"
             android:title="@string/app_notification_preferences"
-            android:order="5"
+            android:order="7"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index d54aced..22df064 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -59,6 +59,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
     private static final String KEY_PEEKABLE = "peekable";
     private static final String KEY_SENSITIVE = "sensitive";
     private static final String KEY_APP_SETTINGS = "app_settings";
+    private static final String KEY_SHOW_ON_KEYGUARD = "show_on_keyguard";
+    private static final String KEY_NO_ONGOING_ON_KEYGUARD = "no_ongoing_on_keyguard";
 
     private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
             = new Intent(Intent.ACTION_MAIN)
@@ -71,6 +73,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
     private SwitchPreference mPriority;
     private SwitchPreference mPeekable;
     private SwitchPreference mSensitive;
+    private SwitchPreference mShowOnKeyguard;
+    private SwitchPreference mShowNoOngoingOnKeyguard;
     private AppRow mAppRow;
     private boolean mCreated;
     private boolean mIsSystemPackage;
@@ -137,6 +141,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         mPriority = (SwitchPreference) findPreference(KEY_PRIORITY);
         mPeekable = (SwitchPreference) findPreference(KEY_PEEKABLE);
         mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
+        mShowOnKeyguard = (SwitchPreference) findPreference(KEY_SHOW_ON_KEYGUARD);
+        mShowNoOngoingOnKeyguard = (SwitchPreference) findPreference(KEY_NO_ONGOING_ON_KEYGUARD);
 
         mAppRow = mBackend.loadAppRow(pm, info.applicationInfo);
 
@@ -202,6 +208,47 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         } else {
             removePreference(KEY_APP_SETTINGS);
         }
+
+        int keyguard = mBackend.getShowNotificationForPackageOnKeyguard(pkg, mUid);
+        mShowOnKeyguard.setChecked((keyguard & Notification.SHOW_ALL_NOTI_ON_KEYGUARD) != 0);
+        mShowNoOngoingOnKeyguard.setChecked(
+                (keyguard & Notification.SHOW_NO_ONGOING_NOTI_ON_KEYGUARD) != 0);
+
+        mShowOnKeyguard.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean showOnKeyguard = (Boolean) newValue;
+                int keyguard = mBackend.getShowNotificationForPackageOnKeyguard(pkg, mUid);
+
+                if (showOnKeyguard && (keyguard & Notification.SHOW_ALL_NOTI_ON_KEYGUARD) == 0) {
+                    keyguard |= Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+                } else {
+                    keyguard &= ~Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+                }
+                return mBackend.setShowNotificationForPackageOnKeyguard(pkg, mUid, keyguard);
+            }
+        });
+
+        mShowNoOngoingOnKeyguard.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                final boolean showNoOngoingOnKeyguard = (Boolean) newValue;
+                int keyguard = mBackend.getShowNotificationForPackageOnKeyguard(pkg, mUid);
+                if (showNoOngoingOnKeyguard
+                        && (keyguard & Notification.SHOW_NO_ONGOING_NOTI_ON_KEYGUARD) == 0) {
+                    keyguard |= Notification.SHOW_NO_ONGOING_NOTI_ON_KEYGUARD;
+                } else {
+                    keyguard &= ~Notification.SHOW_NO_ONGOING_NOTI_ON_KEYGUARD;
+                }
+                return mBackend.setShowNotificationForPackageOnKeyguard(pkg, mUid, keyguard);
+            }
+        });
+
+        // Users cannot block notifications from system/signature packages
+        if (mIsSystemPackage || !getLockscreenNotificationsEnabled()) {
+            getPreferenceScreen().removePreference(mShowNoOngoingOnKeyguard);
+            getPreferenceScreen().removePreference(mShowOnKeyguard);
+        }
     }
 
     @Override
@@ -226,6 +273,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         setVisible(mPeekable, mIsSystemPackage || !banned && headsUpEnabled);
         setVisible(mSensitive, mIsSystemPackage || !banned && lockscreenSecure
                 && lockscreenNotificationsEnabled && allowPrivate);
+        setVisible(mShowOnKeyguard, mIsSystemPackage || !banned);
+        setVisible(mShowNoOngoingOnKeyguard, mIsSystemPackage || !banned);
     }
 
     private void setVisible(Preference p, boolean visible) {
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 2060719..5467cb3 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -130,6 +130,25 @@ public class NotificationBackend {
         }
     }
 
+    public int getShowNotificationForPackageOnKeyguard(String pkg, int uid) {
+        try {
+            return sINM.getShowNotificationForPackageOnKeyguard(pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+        }
+    }
+
+    public boolean setShowNotificationForPackageOnKeyguard(String pkg, int uid, int status) {
+        try {
+            sINM.setShowNotificationForPackageOnKeyguard(pkg, uid, status);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
     static class Row {
         public String section;
     }
-- 
cgit v1.1


From 13b63aedb2352163d8f3ca4f09cdf1ca7b54d7c4 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Wed, 1 Jun 2016 12:02:41 -0700
Subject: Automatic translation import

Change-Id: Ida39cf15dc6a0a21286d0177a21437747b616775
---
 res/values-af/cm_strings.xml      |  1 +
 res/values-am/cm_strings.xml      |  1 +
 res/values-ar/cm_strings.xml      |  1 +
 res/values-as-rIN/cm_strings.xml  |  1 +
 res/values-ast-rES/cm_strings.xml |  1 +
 res/values-az-rAZ/cm_strings.xml  |  1 +
 res/values-be/cm_strings.xml      | 16 ++++++++++++++++
 res/values-bg/cm_strings.xml      |  7 ++++---
 res/values-bn-rBD/cm_strings.xml  |  1 +
 res/values-br-rFR/cm_strings.xml  |  1 +
 res/values-ca/cm_strings.xml      |  1 +
 res/values-cs/cm_strings.xml      |  1 +
 res/values-csb-rPL/cm_strings.xml |  1 +
 res/values-cy/cm_strings.xml      |  1 +
 res/values-da/cm_strings.xml      |  1 +
 res/values-de/cm_strings.xml      |  2 ++
 res/values-el/cm_strings.xml      |  1 +
 res/values-en-rAU/cm_strings.xml  |  1 +
 res/values-en-rGB/cm_strings.xml  |  1 +
 res/values-en-rIN/cm_strings.xml  |  1 +
 res/values-en-rPT/cm_strings.xml  |  1 +
 res/values-eo/cm_strings.xml      |  1 +
 res/values-es-rMX/cm_strings.xml  |  1 +
 res/values-es-rUS/cm_strings.xml  |  1 +
 res/values-es/cm_strings.xml      |  1 +
 res/values-et-rEE/cm_strings.xml  |  1 +
 res/values-eu-rES/cm_strings.xml  |  2 ++
 res/values-fa/cm_plurals.xml      |  2 ++
 res/values-fa/cm_strings.xml      |  2 ++
 res/values-fi/cm_strings.xml      |  1 +
 res/values-fil-rPH/cm_strings.xml |  1 +
 res/values-fr-rCA/cm_strings.xml  |  1 +
 res/values-fr/cm_strings.xml      |  1 +
 res/values-frp-rIT/cm_strings.xml |  1 +
 res/values-fy-rNL/cm_strings.xml  |  1 +
 res/values-gd-rGB/cm_strings.xml  |  1 +
 res/values-gl-rES/cm_strings.xml  |  1 +
 res/values-gu-rIN/cm_strings.xml  |  1 +
 res/values-hi/cm_strings.xml      |  1 +
 res/values-hr/cm_strings.xml      |  2 ++
 res/values-hu/cm_strings.xml      |  1 +
 res/values-hy-rAM/cm_strings.xml  |  1 +
 res/values-in/cm_strings.xml      |  1 +
 res/values-is-rIS/cm_strings.xml  |  1 +
 res/values-it/cm_strings.xml      |  2 ++
 res/values-iw/cm_plurals.xml      |  4 ++++
 res/values-iw/cm_strings.xml      |  3 +++
 res/values-ja/cm_strings.xml      |  1 +
 res/values-ka-rGE/cm_strings.xml  |  1 +
 res/values-kk-rKZ/cm_strings.xml  |  1 +
 res/values-km-rKH/cm_strings.xml  |  1 +
 res/values-kn-rIN/cm_strings.xml  |  1 +
 res/values-ko/cm_strings.xml      |  1 +
 res/values-ku/cm_strings.xml      |  1 +
 res/values-ky-rKG/cm_strings.xml  |  1 +
 res/values-lb/cm_strings.xml      |  1 +
 res/values-lo-rLA/cm_strings.xml  |  1 +
 res/values-lt/cm_strings.xml      |  1 +
 res/values-lv/cm_strings.xml      |  1 +
 res/values-mk-rMK/cm_strings.xml  |  1 +
 res/values-ml-rIN/cm_strings.xml  |  1 +
 res/values-mn-rMN/cm_strings.xml  |  1 +
 res/values-mr-rIN/cm_strings.xml  |  1 +
 res/values-ms-rMY/cm_strings.xml  |  1 +
 res/values-my-rMM/cm_strings.xml  |  1 +
 res/values-nb/cm_strings.xml      |  1 +
 res/values-ne-rNP/cm_strings.xml  |  1 +
 res/values-nl/cm_strings.xml      |  1 +
 res/values-oc-rFR/cm_strings.xml  |  1 +
 res/values-or-rIN/cm_strings.xml  |  1 +
 res/values-pa-rIN/cm_strings.xml  |  1 +
 res/values-pl/cm_strings.xml      |  3 +--
 res/values-pt-rBR/cm_strings.xml  |  1 +
 res/values-pt-rPT/cm_strings.xml  |  1 +
 res/values-rm/cm_strings.xml      |  1 +
 res/values-ro/cm_strings.xml      |  1 +
 res/values-ru/cm_strings.xml      |  4 ++++
 res/values-si-rLK/cm_strings.xml  |  1 +
 res/values-sk/cm_strings.xml      |  1 +
 res/values-sl/cm_strings.xml      |  1 +
 res/values-sq-rAL/cm_strings.xml  |  1 +
 res/values-sr/cm_strings.xml      |  1 +
 res/values-sv/cm_strings.xml      |  1 +
 res/values-sw/cm_strings.xml      |  1 +
 res/values-ta-rIN/cm_strings.xml  |  1 +
 res/values-te-rIN/cm_strings.xml  |  1 +
 res/values-th/cm_strings.xml      |  1 +
 res/values-tr/cm_strings.xml      |  1 +
 res/values-ug/cm_strings.xml      |  1 +
 res/values-uk/cm_strings.xml      |  1 +
 res/values-ur-rPK/cm_strings.xml  |  1 +
 res/values-uz-rUZ/cm_strings.xml  |  1 +
 res/values-vi/cm_strings.xml      |  1 +
 res/values-zh-rCN/cm_strings.xml  |  1 +
 res/values-zh-rHK/cm_strings.xml  |  1 +
 res/values-zh-rTW/cm_strings.xml  |  1 +
 res/values-zu/cm_strings.xml      |  1 +
 97 files changed, 129 insertions(+), 5 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 5c2d2c4..0d1190c 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1013,4 +1013,5 @@
   <string name="weather_settings_general_settings_title">Algemeen</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 207fb66..9946977 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1047,4 +1047,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">مشغلات الشبكات</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index b95f300..ee3a74b 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">সাধাৰণ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 72e4638..387143a 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -892,4 +892,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 9e1ebe3..137f369 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -709,4 +709,5 @@
   <string name="weather_settings_general_settings_title">Ümumi</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index d094765..eb622ba 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -266,8 +266,10 @@
   <string name="notification_light_missed_call_title">Прапушчаны выклік</string>
   <string name="notification_light_voicemail_title">Галасавая пошта</string>
   <string name="notification_light_screen_on">Выкарыстоўваць індыкатар пры ўключаным экране</string>
+  <string name="notification_light_zen_mode">Святло ў рэжыме \"Не турбаваць\"</string>
   <string name="notification_light_use_multiple_leds">Некалькі светадыёдаў</string>
   <string name="keywords_lights_brightness_level">бляклая яскравасць</string>
+  <string name="notification_light_automagic">Аўтаматычны выбар колеру</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Індыкатар падзей</string>
   <string name="led_notification_text">Светадыёд падлучаны ў параметрах</string>
@@ -359,6 +361,7 @@
   <string name="app_ops_summaries_toggle_bluetooth">пераключыць bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">запуск падчас загрузкі</string>
   <string name="app_ops_summaries_toggle_nfc">пераключыць NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">пераключыць стан сотавай сеткі</string>
   <string name="app_ops_summaries_superuser">суперкарыстальнік</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Прыблізнае месцазнаходжанне</string>
@@ -428,6 +431,7 @@
   <string name="app_ops_labels_toggle_bluetooth">Пераключыць bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Запуск падчас загрузкі</string>
   <string name="app_ops_labels_toggle_nfc">Пераключыць NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">пераключыць стан сотавай сеткі</string>
   <string name="app_ops_labels_superuser">Рэжым суперкарыстальніка</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Дазваляць</string>
@@ -903,6 +907,8 @@
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Нумар тэлефону кропкі доступу PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">Дубляваць APN</string>
+  <string name="duplicate_apn_error_message">Такі APN ужо існуе. Скасаваць ці змяніць параметры.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> — <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">адключана</string>
   <string name="sim_missing">адсутнічае альбо няспраўная</string>
@@ -924,6 +930,7 @@
   <string name="sim_card_status_title">Статус SIM %d</string>
   <string name="sim_card_lock_settings_title">Параметры блакавання SIM %d</string>
   <string name="sim_card_summary_empty">SIM не ўстаўлена</string>
+  <string name="sim_mobile_network_settings_category_title">Налады сотавай сеткі</string>
   <string name="sim_mobile_network_settings_title">Параметры SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
@@ -967,12 +974,20 @@
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">Ніколі</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 хвіліна</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 хвілін</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 хвілін</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Не адключаць ніколі Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Адключыць праз <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Жывы экран блакавання</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Уключыць ды наладзіць жывы экран блакавання</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Налады</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Каб бачыць даступныя жывыя экраны блакавання, ўключыце іх.</string>
   <string name="interruptions_ignore_while_media_title">Не прыглушаць гук</string>
   <string name="interruptions_ignore_while_media_summary">Не змяншаць гучнасць прайгравання мультымедыя пры атрыманні паведамленняў</string>
   <!-- CM Legal -->
@@ -991,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">Агульныя</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 5faeb9e..90e59ab 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -56,9 +56,9 @@
   <string name="cmupdate_settings_title">Системни актуализации</string>
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Актуализирай режима за възстановяване</string>
-  <string name="update_recovery_summary">Актуализирай recovery със системните актуализации</string>
-  <string name="update_recovery_on_warning">Забележка: Когато тази функция е активна, вашето инсталирано recovery ще бъде заменено с включеното в текущата версия на операционната система.\n\nВашето recovery ще се актуализира заедно с ъпгрейдите на вашата система, за да се гарантира съвместимост с бъдещите версии.\n\nИскате ли да активирате тази функция?</string>
-  <string name="update_recovery_off_warning">Предупреждение: Когато тази функция е забранена, вашето recovery няма да бъде актуализирана с актуализациите на операционната система.\n\nБъдещи актуализации на операционната система не могат да се инсталират с остарели или потребителски recovery версии.\n\nНаистина ли искате да забраните тази функция?</string>
+  <string name="update_recovery_summary">Актуализирай режима за възстановяване със системните актуализации</string>
+  <string name="update_recovery_on_warning">Забележка: Когато тази функция е активна, вашият режим за възстановяване ще бъде заменен с включения в текущата версия на операционната система.\n\nВашия режима за възстановяване ще се актуализира заедно с ъпгрейдите на вашата система, за да се гарантира съвместимост с бъдещите версии.\n\nИскате ли да активирате тази функция?</string>
+  <string name="update_recovery_off_warning">Предупреждение: Когато тази функция е забранена, вашия режима за възстановяване няма да бъде актуализиран с актуализациите на операционната система.\n\nБъдещи актуализации на операционната система не могат да се инсталират с остарели или потребителски режими за възстановяване.\n\nНаистина ли искате да забраните тази функция?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Теми</string>
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Мрежови оператори</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Замъгляване на заключен екран</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index b3075e1..82b3a3b 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -560,4 +560,5 @@
   <string name="weather_settings_general_settings_title">সাধারণ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 2e271af..ca497ce 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Operadors de xarxa</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desenfocament de la pantalla de bloqueig</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index eb5ad94..432d725 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Síťový poskytovatelé</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Rozostření zamykací obrazovky</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index cb9db22..d7e6a1c 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1007,4 +1007,5 @@
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 5a624d5..a8aacd6 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1041,4 +1041,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netzbetreiber</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Sperrbildschirm-Unschärfe</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 4285dc6..cdd6245 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1046,4 +1046,5 @@
   <string name="shortcut_carrier_title">Εταιρίες δικτύου</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Θόλωμα οθόνης κλειδώματος</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 529a588..02a36e0 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -767,4 +767,5 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 222c557..abe8073 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -194,4 +194,5 @@
   <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 7624a00..b3bf55d 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -911,4 +911,5 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 5d88574..76ed813 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -846,4 +846,5 @@
   <string name="weather_settings_general_settings_title">Ĝeneralo</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 245cde9..15311cd 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -296,4 +296,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 62715b1..182f62a 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 476d76c..fd4eb6c 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1035,4 +1035,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 91ba135..05a709e 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -886,4 +886,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="weather_settings_general_settings_title">Üldine</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index c92d326..b0432c1 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1041,4 +1041,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Sare operadoreak</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Blokeo-pantailaren lausotzea</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fa/cm_plurals.xml b/res/values-fa/cm_plurals.xml
index 2cd816c..58a3d74 100644
--- a/res/values-fa/cm_plurals.xml
+++ b/res/values-fa/cm_plurals.xml
@@ -17,9 +17,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="backlight_timeout_time">
+    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> ثانیه</item>
     <item quantity="other"><xliff:g id="seconds">%d</xliff:g> ثانیه</item>
   </plurals>
   <plurals name="app_ops_count">
+    <item quantity="one">%d بار</item>
     <item quantity="other">%d بار</item>
   </plurals>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index afd5bb4..3a89203 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -18,6 +18,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
+    <item quantity="one">شما اکنون <xliff:g id="step_count">%1$d</xliff:g> ضربه با فعال‌سازی ابزارهای توسعه فاصله دارید.</item>
     <item quantity="other">شما اکنون <xliff:g id="step_count">%1$d</xliff:g> ضربه با فعال‌سازی ابزارهای توسعه فاصله دارید.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
@@ -894,4 +895,5 @@
   <string name="weather_settings_general_settings_title">عمومي</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 7cafde0..69aca54 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Verkko-operaattorit</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Lukitusnäytön sumennus</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index d841e5b..0e129e5 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1042,4 +1042,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Opérateurs réseau</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 7cfd726..eb40dd9 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -190,4 +190,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 3960f72..0b1b27e 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -436,4 +436,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index affd278..d6f15dc 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1008,4 +1008,5 @@
   <string name="weather_settings_general_settings_title">સામાન્ય</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index a8e229b..725693b 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -859,4 +859,5 @@
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 89e2dd6..167bf54 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1042,4 +1042,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Mrežni operateri</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Zamućen Zaključani zaslon</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index b4a630f..28e955e 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1008,4 +1008,5 @@
   <string name="weather_settings_general_settings_title">Általános</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 22301a1..7be8f72 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operator jaringan</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index cd99b78..ef44635 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1043,4 +1043,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatori di rete</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Blocco schermo sfuocato</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-iw/cm_plurals.xml b/res/values-iw/cm_plurals.xml
index a268bc8..0488253 100644
--- a/res/values-iw/cm_plurals.xml
+++ b/res/values-iw/cm_plurals.xml
@@ -18,10 +18,14 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <plurals name="backlight_timeout_time">
     <item quantity="one">שנייה <xliff:g id="seconds">%d</xliff:g></item>
+    <item quantity="two"><xliff:g id="seconds">%d</xliff:g> שניות</item>
+    <item quantity="many"><xliff:g id="seconds">%d</xliff:g> שניות</item>
     <item quantity="other"><xliff:g id="seconds">%d</xliff:g> שניות</item>
   </plurals>
   <plurals name="app_ops_count">
     <item quantity="one">פעם אחת</item>
+    <item quantity="two">%d פעמים</item>
+    <item quantity="many">%d פעמים</item>
     <item quantity="other">%d פעמים</item>
   </plurals>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 68a4c55..feb8dd6 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -19,6 +19,8 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">רק עוד צעד <xliff:g id="step_count">%1$d</xliff:g> מהפעלת אפשרויות מפתח.</item>
+    <item quantity="two">רק עוד <xliff:g id="step_count">%1$d</xliff:g> צעדים מהפעלת אפשרויות מפתח.</item>
+    <item quantity="many">רק עוד <xliff:g id="step_count">%1$d</xliff:g> צעדים מהפעלת אפשרויות מפתח.</item>
     <item quantity="other">רק עוד <xliff:g id="step_count">%1$d</xliff:g> צעדים מהפעלת אפשרויות מפתח.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
@@ -1041,4 +1043,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ספקי סלולר</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index c3548bf..bd94faa 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">全般</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 906536e..2fe18d8 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1008,4 +1008,5 @@
   <string name="weather_settings_general_settings_title">ಸಾಮಾನ್ಯ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index e7c1f0b..f603827 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1034,4 +1034,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">네트워크 영업자</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index b41e6f2..a22a331 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -768,4 +768,5 @@
   <string name="weather_settings_general_settings_title">گشتی</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 32c0449..7352a9c 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -889,4 +889,5 @@
   <string name="weather_settings_general_settings_title">Allgemeng</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index fb34936..9611aa9 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -894,4 +894,5 @@
   <string name="weather_settings_general_settings_title">Bendra</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index df12839..1a66be8 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -552,4 +552,5 @@
   <string name="weather_settings_general_settings_title">Vispārīgi</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 280a3ea..1b434ce 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1007,4 +1007,5 @@
   <string name="weather_settings_general_settings_title">പൊതുവായത്</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 9d96759..3b61e5c 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index f7e714f..d5366db 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Nettverksoperatører</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Låseskjerm utydelighet</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 0b2285b..5d9cd0d 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="reset_stats_confirm">Bevestigen</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 16a2b87..dd41694 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">ସାଧାରଣ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index c5f6342..4ac2d4b 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -692,8 +692,6 @@
   <string name="status_bar_notif_count_summary">Wyświetla licznik oczekujących powiadomień</string>
   <string name="status_bar_quick_qs_pulldown_title">Szybkie rozwijanie</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s krawędź ekranu rozwija szybkie ustawienia</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Lewa</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Prawa</string>
   <string name="status_bar_quick_qs_pulldown_off">Wyłączony</string>
   <string name="status_bar_quick_qs_pulldown_left">Lewa</string>
   <string name="status_bar_quick_qs_pulldown_right">Prawa</string>
@@ -1032,4 +1030,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 31d9d50..14b5757 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Tela de bloqueio embaçada</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 353bc1b..610fc6d 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1042,4 +1042,5 @@
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desfocagem do ecrã de bloqueio</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 19b7971..3ea15ba 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -930,4 +930,5 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index a4322d8..aef7f3f 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1021,6 +1021,8 @@
   <string name="weather_settings_general_settings_title">Общие</string>
   <string name="weather_settings_providers_title">Провайдеры</string>
   <string name="weather_settings_temp_units_title">Единица температуры</string>
+  <string name="weather_settings_temp_celsius">Градус Цельсия</string>
+  <string name="weather_settings_temp_fahrenheit">Градус Фаренгейта</string>
   <string name="weather_settings_keyword">погода</string>
   <string name="background_data_access">Доступ к фоновым данным</string>
   <string name="allow_background_both">Использовать моб. данные и Wi\u2011Fi</string>
@@ -1040,4 +1042,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Операторы сети</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Размытие экрана блокировки</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 6c96921..9ec2255 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -560,4 +560,5 @@
   <string name="weather_settings_general_settings_title">ප්‍රධාන</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index ad1c22b..5646b8b 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -894,4 +894,5 @@
   <string name="weather_settings_general_settings_title">Všeobecné</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index bac5a37..4996e79 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1046,4 +1046,5 @@
   <string name="shortcut_carrier_title">Omrežni operaterji</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Zamegljenost zaklenjenega zaslona</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index cfcc3ea..df2bdb4 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1037,4 +1037,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Оператор мреже</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 9ba97fc..318b5a0 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1026,4 +1026,5 @@ inkluderar en unik identifikation,
   <string name="reset_stats_confirm">Bekräfta</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index dc0978e..c697e22 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">பொது</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 1ef7504..b608b5b 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1006,4 +1006,5 @@
   <string name="weather_settings_general_settings_title">సాధారణం</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 73897a6..c7eda88 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ผู้ให้บริการเครือข่าย</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 4a49fd7..cbfc6d0 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1041,4 +1041,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Ağ operatörleri</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index ee8eacb..aa2401b 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="restrict_cellular_access_dialog_summary">كۆچمە تورغىلا باغلىنىدىغان ئەھۋالدا، بۇ ئىقتىدار تەگلىك سانلىق مەلۇماتىغا ئېھتىياجلىق پىروگراممىنىڭ خىزمەت قىلىشىنى توختىتىپ قويۇشى مۇمكىن.\n\nسىز شۇ ئەپنىڭ تەمىنلىگەن تەڭشىكىدىن سانلىق مەلۇمات ئېقىمىنى تىزگىنلەيدىغان تېخىمۇ مۇۋاپىق تاللانمىنى تاپالىشىڭىز مۇمكىن.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 879952b..bc8f3d8 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -942,4 +942,5 @@
   <string name="weather_settings_general_settings_title">Головні</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index bdc794e..097c35c 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1040,4 +1040,5 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 1c9c739..24291f4 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1039,4 +1039,5 @@
   <string name="shortcut_carrier_title">网络运营商</string>
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">锁屏模糊</string>
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 01bf083..63501c1 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -834,4 +834,5 @@
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 87c2a90..ca7dd9b 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -871,4 +871,5 @@
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 721627e..727d532 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -181,4 +181,5 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- Per app controls for LP keyguard notifications -->
 </resources>
-- 
cgit v1.1


From 1bd8d6707841dd1ef8fbb42b96a624550387e91a Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Thu, 2 Jun 2016 15:46:02 +0300
Subject: Lockscreen -> lock screen

Change-Id: I1653d92869f4cfd37f3758be178b856a1031cb9b
---
 res/values/cm_strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 4b97f89..b3c02f5 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1218,9 +1218,9 @@
     <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
 
     <!-- Per app controls for LP keyguard notifications -->
-    <string name="app_notification_show_on_keyguard_title">Show on lockscreen</string>
-    <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lockscreen</string>
-    <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lockscreen</string>
-    <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lockscreen</string>
+    <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
+    <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
+    <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
 
 </resources>
-- 
cgit v1.1


From 9af27ab5e5d76e49d08c9841a264eb9d5a699bd5 Mon Sep 17 00:00:00 2001
From: Dan Pasanen <invisiblek@cyanogenmod.org>
Date: Mon, 2 May 2016 09:34:44 -0500
Subject: Settings: fix toggling lockscreen rotation toggle [2/3]

Change-Id: I4339afcf7befb70f459b088be9e1fc62a0465b4f
---
 res/xml/display_rotation.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/res/xml/display_rotation.xml b/res/xml/display_rotation.xml
index c6a3394..b839e39 100644
--- a/res/xml/display_rotation.xml
+++ b/res/xml/display_rotation.xml
@@ -21,10 +21,11 @@
     <SwitchPreference
         android:key="accelerometer"
         android:title="@string/accelerometer_title" />
-    <SwitchPreference
+    <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="lockscreen_rotation"
         android:title="@string/display_lockscreen_rotation_title"
-        android:dependency="accelerometer" />
+        android:dependency="accelerometer"
+        android:defaultValue="false" />
     <PreferenceCategory
         android:key="display_rotation_category"
         android:title="@string/display_rotation_category_title" />
-- 
cgit v1.1


From d6715b97696f84c0fbd84fac416cafac80900a9a Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Fri, 3 Jun 2016 15:14:45 -0700
Subject: Automatic translation import

Change-Id: I75ed7f58e6fbc7a961b4fe10278393ffde4ef418
---
 res/values-af/cm_strings.xml      |  4 ++++
 res/values-ar/cm_strings.xml      |  4 ++++
 res/values-as-rIN/cm_strings.xml  |  4 ++++
 res/values-ast-rES/cm_strings.xml |  4 ++++
 res/values-az-rAZ/cm_strings.xml  |  4 ++++
 res/values-be/cm_strings.xml      |  4 ++++
 res/values-bg/cm_strings.xml      |  4 ++++
 res/values-ca/cm_strings.xml      |  4 ++++
 res/values-cs/cm_strings.xml      |  4 ++++
 res/values-da/cm_strings.xml      |  4 ++++
 res/values-de/cm_strings.xml      |  4 ++++
 res/values-el/cm_strings.xml      |  4 ++++
 res/values-en-rAU/cm_strings.xml  |  4 ++++
 res/values-en-rIN/cm_strings.xml  |  4 ++++
 res/values-eo/cm_strings.xml      |  4 ++++
 res/values-es-rUS/cm_strings.xml  |  4 ++++
 res/values-es/cm_strings.xml      | 11 +++++++++++
 res/values-et-rEE/cm_strings.xml  |  4 ++++
 res/values-eu-rES/cm_strings.xml  |  4 ++++
 res/values-fa/cm_strings.xml      |  4 ++++
 res/values-fi/cm_strings.xml      |  4 ++++
 res/values-fr/cm_strings.xml      |  4 ++++
 res/values-gu-rIN/cm_strings.xml  |  4 ++++
 res/values-hi/cm_strings.xml      |  4 ++++
 res/values-hr/cm_strings.xml      |  4 ++++
 res/values-hu/cm_strings.xml      |  4 ++++
 res/values-in/cm_strings.xml      |  4 ++++
 res/values-it/cm_strings.xml      |  4 ++++
 res/values-iw/cm_strings.xml      |  4 ++++
 res/values-ja/cm_strings.xml      | 39 +++++++++++++++++++++++++++++++++++++++
 res/values-kn-rIN/cm_strings.xml  |  4 ++++
 res/values-ko/cm_strings.xml      |  4 ++++
 res/values-ku/cm_strings.xml      |  4 ++++
 res/values-lb/cm_strings.xml      |  4 ++++
 res/values-lt/cm_strings.xml      |  4 ++++
 res/values-ml-rIN/cm_strings.xml  |  4 ++++
 res/values-mr-rIN/cm_strings.xml  |  4 ++++
 res/values-nb/cm_strings.xml      |  4 ++++
 res/values-nl/cm_strings.xml      |  4 ++++
 res/values-or-rIN/cm_strings.xml  |  4 ++++
 res/values-pl/cm_strings.xml      | 13 +++++++++++++
 res/values-pt-rBR/cm_strings.xml  |  4 ++++
 res/values-pt-rPT/cm_strings.xml  |  4 ++++
 res/values-ro/cm_strings.xml      |  4 ++++
 res/values-ru/cm_strings.xml      |  4 ++++
 res/values-sk/cm_strings.xml      |  4 ++++
 res/values-sl/cm_strings.xml      |  4 ++++
 res/values-sr/cm_strings.xml      |  4 ++++
 res/values-sv/cm_strings.xml      |  4 ++++
 res/values-ta-rIN/cm_strings.xml  |  4 ++++
 res/values-te-rIN/cm_strings.xml  |  4 ++++
 res/values-th/cm_strings.xml      |  4 ++++
 res/values-tr/cm_strings.xml      |  4 ++++
 res/values-ug/cm_strings.xml      |  4 ++++
 res/values-uk/cm_strings.xml      |  4 ++++
 res/values-vi/cm_strings.xml      |  4 ++++
 res/values-zh-rCN/cm_strings.xml  |  4 ++++
 res/values-zh-rHK/cm_strings.xml  |  4 ++++
 res/values-zh-rTW/cm_strings.xml  |  4 ++++
 59 files changed, 287 insertions(+)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 0d1190c..0b94fdb 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1014,4 +1014,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Vertoon op slotskerm</string>
+  <string name="app_notification_show_on_keyguard_summary">Vertoon kennisgewings vanuit hierdie program op die slotskerm</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Deaktiveer aanhoudende kennisgewings op die slotskerm</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Moet nooit aanhoudende kennisgewings vertoon vanuit hierdie program op die slotskerm</string>
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 9946977..cbc98f5 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1048,4 +1048,8 @@
   <string name="shortcut_carrier_title">مشغلات الشبكات</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">إظهار على شاشة التأمين</string>
+  <string name="app_notification_show_on_keyguard_summary">إظهار إشعارات من هذا التطبيق على شاشة التأمين</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">منع الإشعارات الثابتة على شاشة التأمين</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">عدم إظهار إشعارات ثابتة من هذا التطبيق على شاشة التأمين</string>
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index ee3a74b..f494745 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
+  <string name="app_notification_show_on_keyguard_summary">এই এপ্প্‌ৰ পৰা অধিসূচনা লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">লক স্ক্ৰীণত নেৰানেপেৰা অধিসূচনা অক্ষম কৰক</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">এই এপ্প্‌ৰ পৰা নেৰানেপেৰা অধিসূচনা লক স্ক্ৰীণত নেদেখুৱাব</string>
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 387143a..4e61f73 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -893,4 +893,8 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Amosar na pantalla de bloquéu</string>
+  <string name="app_notification_show_on_keyguard_summary">Amosar notificaciones d\'esta aplicación na pantalla de bloquéu</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes na pantalla de bloquéu</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nun amosar nunca notificaciones persistentes d\'esta aplicación na pantalla de bloquéu</string>
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 137f369..7fd2d61 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -710,4 +710,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Kilik ekranında göstər</string>
+  <string name="app_notification_show_on_keyguard_summary">Kilid ekranında bu tətbiqetmənin bildirişlərini göstər</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Kilid ekranında davamlı bildirişləri ləğv et</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Kilid ekranında bu tətbiqmənin davamlı bildirişlərini heç vaxt göstərmə</string>
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index eb622ba..4bf9c34 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">На экране блакавання</string>
+  <string name="app_notification_show_on_keyguard_summary">Паказваць апавяшчэнні з гэтага дадатку на экране блакавання</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Адключыць шторазовыя апавяшчэнні пра блакаванне экрана</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць шторазовыя апавяшчэнні з гэтага дадатку на экране блакавання</string>
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 90e59ab..87bcd3e 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Замъгляване на заключен екран</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Покажи при заключен екран</string>
+  <string name="app_notification_show_on_keyguard_summary">Показвай известия от това приложение при заключен екран</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Забрани постоянна нотификация при заключен екран</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Никога не показвай постоянни нотификации от това приложение при заключен екран</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ca497ce..8831516 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desenfocament de la pantalla de bloqueig</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostra a la pantalla de bloqueig</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostra les notificacions d\'aquesta aplicació a la pantalla de bloqueig</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Deshabilita les notificacions persistents a la pantalla de bloqueig</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">No mostris mai notificacions persistents d\'aquesta aplicació a la pantalla de bloqueig</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 432d725..eb0f2ca 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Rozostření zamykací obrazovky</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Zobrazit na zamykací obrazovce</string>
+  <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Zakázat trvalé upozornění na zamykací obrazovce</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nikdy nezobrazovat trvalé upozornění na zamykací obrazovce</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index d7e6a1c..6ae0857 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1008,4 +1008,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Vis på låseskærmen</string>
+  <string name="app_notification_show_on_keyguard_summary">Vis meddelelser fra denne app på låseskærmen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende meddelelser på låseskærmen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldrig vedvarende meddelelser fra denne app på låseskærmen</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index a8aacd6..56b4c72 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Sperrbildschirm-Unschärfe</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Auf dem Sperrbildschirm anzeigen</string>
+  <string name="app_notification_show_on_keyguard_summary">Benachrichtigungen von dieser App auf dem Sperrbildschirm anzeigen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhafte Benachrichtigungen auf dem Sperrbildschirm deaktivieren</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Keine dauerhaften Benachrichtigungen dieser App auf dem Sperrbildschirm anzeigen</string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index cdd6245..9f43b01 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1047,4 +1047,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Θόλωμα οθόνης κλειδώματος</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Εμφάνιση στην οθόνη κλειδώματος</string>
+  <string name="app_notification_show_on_keyguard_summary">Εμφάνιση ειδοποιήσεων από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Απενεργ. επίμονης ειδοποίησης στην οθόνη κλειδώματος</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Να μην εμφανίζονται ποτέ επίμονες ειδοποιήσεις από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 02a36e0..9926577 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -768,4 +768,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
+  <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index b3bf55d..cccbc81 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -912,4 +912,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
+  <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 76ed813..e8b63b0 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -847,4 +847,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Montri sur la ŝlosa ekrano</string>
+  <string name="app_notification_show_on_keyguard_summary">Montri atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Malŝalti daŭran atentigon sur ŝlosa ekrano</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Neniam montri daŭrajn atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 182f62a..3448541 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostrar en la pantalla bloqueada</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla bloqueada</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla bloqueada</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla bloqueada</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index fd4eb6c..b7780a8 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1016,7 +1016,13 @@
   <string name="weather_settings_no_services_prompt">No hay servicios de proveedores de clima instalados</string>
   <string name="weather_settings_button">Ajustes de proveedor</string>
   <string name="weather_settings_activity_not_found">No se puede iniciar el menú de configuración de este proveedor</string>
+  <string name="weather_settings_add_weather_provider">Agregar proveedor de clima</string>
   <string name="weather_settings_general_settings_title">General</string>
+  <string name="weather_settings_providers_title">Proveedores</string>
+  <string name="weather_settings_temp_units_title">Unidad de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">clima</string>
   <string name="background_data_access">Acceso a datos en segundo plano</string>
   <string name="allow_background_both">Sobre datos celulares y Wi\u2011Fi</string>
   <string name="allow_background_wlan">Solo por Wi-Fi</string>
@@ -1035,5 +1041,10 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostrar en la pantalla de bloqueo</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla de bloqueo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla de bloqueo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla de bloqueo</string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 05a709e..402340f 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -887,4 +887,8 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Kuva lukustusekraanil</string>
+  <string name="app_notification_show_on_keyguard_summary">Kuva selle rakenduse teavitusi lukustusekraanil</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Keela püsivad teavitused lukustusekraanil</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Ära kunagi näita püsivaid teavitusi sellelt rakenduselt lukustuskuval</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index b0432c1..c55f745 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Blokeo-pantailaren lausotzea</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Bistaratu blokeo-pantailan</string>
+  <string name="app_notification_show_on_keyguard_summary">Bistaratu aplikazio honen jakinarazpenak blokeo-pantailan</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Ezgaitu jakinarazpen iraunkorra blokeo-pantailan</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Ez bistaratu inoiz aplikazio honen jakinarazpen iraunkorrak blokeo-pantailan</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 3a89203..7cbe18f 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -896,4 +896,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">نمایش در قفل صفحه</string>
+  <string name="app_notification_show_on_keyguard_summary">نمایش اعلان‌های این برنامه در قفل صفحه</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">غیرفعال کردن اعلان‌های پایدار در قفل صفحه</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">اعلان‌های پایدار این برنامه هرگز در قفل صفحه نشان داده نشود</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 69aca54..d7acba7 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Lukitusnäytön sumennus</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Näytä lukitusnäytöllä</string>
+  <string name="app_notification_show_on_keyguard_summary">Näytä tämän sovelluksen ilmoitukset lukitusnäytöllä</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Älä näytä pysyviä ilmoituksia lukitusnäytöllä</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Älä koskaan näytä pysyviä ilmoituksia tästä sovelluksesta lukitusnäytöllä</string>
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 0e129e5..665805b 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1043,4 +1043,8 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="shortcut_carrier_title">Opérateurs réseau</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Afficher sur l\'écran de verrouillage</string>
+  <string name="app_notification_show_on_keyguard_summary">Afficher les notifications de cette application sur l\'écran de verrouillage</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Désactiver les notifications persistantes sur l\'écran de verrouillage</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Ne jamais afficher les notifications persistantes de cette application sur l\'écran de verrouillage</string>
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index d6f15dc..d9feb19 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1009,4 +1009,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">લૉક ચાલુ સ્ક્રીન દર્શાવો</string>
+  <string name="app_notification_show_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી સૂચનાઓ દર્શાવો</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">લૉક સ્ક્રીન પર નિરંતર સૂચનાઓ અક્ષમ કરો</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી નિરંતર સૂચનાઓ ક્યારેય દર્શાવવા નહીં</string>
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 725693b..785c606 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -860,4 +860,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">लॉक स्क्रीन पर दिखाएँ</string>
+  <string name="app_notification_show_on_keyguard_summary">इस ऐप की अधिसूचनाओं को लॉक स्क्रीन पर दिखाएँ</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीन पर बने रहने वाली अधिसूचनाओं को अक्षम करें</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">इस ऐप की अधिसूचनाओं को कभी भी लॉक स्क्रीन पर नहीं दिखाएँ</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 167bf54..b94cf20 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1044,4 +1044,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Zamućen Zaključani zaslon</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Prikaži na zaključanom zaslonu</string>
+  <string name="app_notification_show_on_keyguard_summary">Prikaži obavijesti iz ove aplikacije na zaključanom zaslonu</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Onemogući trajne obavijesti na zaključanom zaslonu</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nikad ne prikazuj trajne obavijesti ove aplikacije na zaključanom zaslonu</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 28e955e..d692901 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1009,4 +1009,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Megjelenítés a zárképernyőn</string>
+  <string name="app_notification_show_on_keyguard_summary">Ezen alkalmazáshoz tartozó értesítések megjelenítése a zárképernyőn</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Állandó értesítés tiltása a zárképernyőn</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 7be8f72..fb90eca 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1041,4 +1041,8 @@
   <string name="shortcut_carrier_title">Operator jaringan</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Tampilkan pada layar kunci</string>
+  <string name="app_notification_show_on_keyguard_summary">Tampilkan pemberitahuan dari aplikasi ini pada layar kunci</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Tiadakan pemberitahuan tetap pada layar kunci</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Tidak pernah menampilkan pemberitahuan tetap dari aplikasi ini pada layar kunci</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index ef44635..a4309aa 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1045,4 +1045,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Blocco schermo sfuocato</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostra nella schermata di blocco</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nella schermata di blocco</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nella schermata di blocco</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index feb8dd6..6975a52 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1044,4 +1044,8 @@
   <string name="shortcut_carrier_title">ספקי סלולר</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">הצג על מסך הנעילה</string>
+  <string name="app_notification_show_on_keyguard_summary">הצג הודעות מיישום זה במסך הנעילה</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">השבתת התראות תמידיות על מסך הנעילה</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">אל תציג התראות תמידיות מיישום זה על מסך הנעילה</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index bd94faa..ae635c7 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -272,6 +272,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">ライトの設定</string>
   <string name="led_notification_text">設定によってLEDライトが有効になっています</string>
+  <string name="notification_light_no_apps_summary">アプリごとのコントロールを追加するには、[%1$s]を有効にしてメニューバーの[\u002b]を押す</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Androidデバッグ</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -441,6 +442,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g>許可しました</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g>拒否しました</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g>許可、<xliff:g id="count">%2$s</xliff:g>拒否しました</string>
+  <string name="app_ops_disabled_by_optimization">電池の最適化によって無効化</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">ユーザーアプリを表示</string>
   <string name="app_ops_show_system_apps">内蔵アプリを表示</string>
@@ -871,6 +873,7 @@
   <string name="menu_hidden_apps_delete">リセット</string>
   <string name="menu_hidden_apps_reset_lock">パターンロックをリセット</string>
   <string name="protected_apps">アプリの保護</string>
+  <string name="protected_apps_summary">パスワードでロックしている時に非表示にするアプリを管理する</string>
   <string name="saving_protected_components">コンポーネントの状態を保存中\u2026</string>
   <string name="pa_login_username_hint">ユーザー名（メール）</string>
   <string name="pa_login_password_hint">パスワード</string>
@@ -1002,9 +1005,45 @@
   <string name="battery_info_status_charging_dock_ac">ACでホルダーを充電しています</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">USBでホルダーを充電しています</string>
+  <string name="restrict_app_wlan_title">アプリのWi\u2011Fiの使用を無効化</string>
+  <string name="restrict_app_wlan_summary">アプリのWi\u2011Fiデータ接続の使用を防止する</string>
+  <string name="restrict_app_cellular_title">アプリのモバイルデータの使用を無効化</string>
+  <string name="restrict_app_cellular_summary">アプリのモバイルデータ接続の使用を防止する</string>
+  <string name="privacy_guard_internet_category">インターネット</string>
   <!-- Weather -->
+  <string name="weather_settings_title">天気</string>
+  <string name="weather_settings_no_services_prompt">天気プロバイダサービスがインストールされていません</string>
+  <string name="weather_settings_button">プロバイダの設定</string>
+  <string name="weather_settings_activity_not_found">このプロバイダの設定メニューを起動できませんでした</string>
+  <string name="weather_settings_add_weather_provider">天気プロバイダを追加</string>
   <string name="weather_settings_general_settings_title">全般</string>
+  <string name="weather_settings_providers_title">プロバイダ</string>
+  <string name="weather_settings_temp_units_title">温度の単位</string>
+  <string name="weather_settings_temp_celsius">摂氏</string>
+  <string name="weather_settings_temp_fahrenheit">華氏</string>
+  <string name="weather_settings_keyword">天気</string>
+  <string name="background_data_access">バックグラウンドデータアクセス</string>
+  <string name="allow_background_both">モバイルデータとWi\u2011Fi経由</string>
+  <string name="allow_background_wlan">Wi\u2011Fi経由のみ</string>
+  <string name="allow_background_none">アクセスなし</string>
+  <string name="mobile_data_alert">モバイルデータ警告</string>
+  <string name="mobile_data_alert_summary">アプリが大量のデータを使用したときに通知する</string>
+  <string name="data_usage_menu_enable_data_alerts">データ使用量警告を有効化</string>
+  <string name="data_usage_menu_disable_data_alerts">データ使用量警告を無効化</string>
+  <string name="data_usage_menu_reset_stats">データ使用量の統計をリセット</string>
+  <string name="reset_data_stats_msg">この操作は過去から現在までのデータ使用量の追跡情報を消去します</string>
+  <string name="reset_stats_confirm">確認</string>
+  <string name="restrict_cellular_access_title">モバイルデータアクセスを制限</string>
+  <string name="restrict_cellular_access_summary">モバイルネットワークでのデータアクセスを無効にする</string>
+  <string name="restrict_cellular_access_dialog_title">モバイルデータアクセスを制限しますか？</string>
+  <string name="restrict_cellular_access_dialog_summary">この機能はモバイルネットワークのみが利用可能な場合にネットワークアクセスに依存するアプリが動作しなくなる可能性があります。\n\nこのアプリで利用可能なデータ使用量のより適切なコントロールは設定から行うことができます。</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">通信事業者</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">ロック画面のぼかし</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">ロック画面に表示</string>
+  <string name="app_notification_show_on_keyguard_summary">このアプリからの通知をロック画面に表示する</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">常駐する通知をロック画面で無効化</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">このアプリからの常駐する通知をロック画面に表示しない</string>
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 2fe18d8..c8c0462 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1009,4 +1009,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಪ್ರದರ್ಶಿಸು</string>
+  <string name="app_notification_show_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಈ ಆಪ್‍ನಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ನಿರಂತರ ಅಧಿಸೂಚನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಎಂದಿಗೂ ಈ ಆಪ್‍ನಿಂದ ನಿರಂತರ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಬೇಡ</string>
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index f603827..4206d86 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1035,4 +1035,8 @@
   <string name="shortcut_carrier_title">네트워크 영업자</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">잠금 화면에 표시</string>
+  <string name="app_notification_show_on_keyguard_summary">잠금화면에 알림을 표시</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">상주 알림을 잠금화면에 표시하지 않음</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">이 앱의 상주 알림을 잠금화면에 표시하지 않음</string>
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index a22a331..714a9d3 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -769,4 +769,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">پیشاندانی لەسەر قوفڵی شاشە</string>
+  <string name="app_notification_show_on_keyguard_summary">پیشاندانی تێبینی لەم بەرنامەیە لەسەر قوفڵی شاشە</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">لەکارخستنی بەردەوام تێبینی لەسەر قوفڵی سەرشاشە</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">هەرگیز بەبەردەوامی تێبینی پیشان مەدە لەسەر ئەم بەرنامەیە لەسەر قوفڵی سەر شاشە</string>
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 7352a9c..ac31720 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -890,4 +890,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Um Spärschierm uweisen</string>
+  <string name="app_notification_show_on_keyguard_summary">Notifikatioune vun dëser App op dem Spärschierm uweisen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhaft Notifikatiounen op de Spärschierm desaktivéieren</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Ni dauerhaft Notifikatiounen op de Spärschierm uweisen</string>
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 9611aa9..aca0fb0 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -895,4 +895,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Rodyti ekrano užrakte</string>
+  <string name="app_notification_show_on_keyguard_summary">Rodyti pranešimus iš šios programos ekrano užrakte</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Neleisti nuolatinių pranešimų ekrano užrakte</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Niekada nerodyti nuolatinių pranešimų iš šios programos ekrano užrakte</string>
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 1b434ce..f4bd497 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1008,4 +1008,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">ലോക്ക് സ്ക്രീനിൽ ദൃശ്യമാക്കുക</string>
+  <string name="app_notification_show_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">ലോക്ക് സ്ക്രീനിൽ തുടര്‍ച്ചയായുള്ള അറിയിപ്പ് അപ്രാപ്തമാക്കുക</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് തുടരെയുള്ള അറിയിപ്പുകള്‍ ദൃശ്യമാക്കരുത്</string>
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 3b61e5c..bde282d 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">लॉक स्क्रीनवर दर्शवा</string>
+  <string name="app_notification_show_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सूचना लॉक स्क्रीनवर दर्शवा</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीनवर सातत्यपूर्ण सूचना अक्षम करा</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सातत्यपूर्ण सूचना लॉक स्क्रीनवर कधीही दाखवू नका</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index d5366db..7e4784b 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Låseskjerm utydelighet</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Vis på låseskjerm</string>
+  <string name="app_notification_show_on_keyguard_summary">Vis varslinger fra denne appen på låseskjermen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende varsler på låseskjermen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldri vedvarende meldinger fra denne appen på låseskjermen</string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 5d9cd0d..96cab31 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1016,4 +1016,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Weergeven op vergrendelingsscherm</string>
+  <string name="app_notification_show_on_keyguard_summary">Meldingen van deze app weergeven op het vergrendelingsscherm</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Permanente meldingen op vergrendelingsscherm uitschakelen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Permanente meldingen van deze app niet weergeven op het vergrendelingsscherm</string>
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index dd41694..153b8d5 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଦେଖା୍ନ୍ତୁ</string>
+  <string name="app_notification_show_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ନିର୍ଦେଶାବଳି ଦେଖା୍ନ୍ତୁ</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି କଦାପି ଦେଖାନ୍ତୁ ନାହିଁ</string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 4ac2d4b..9f1f091 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -692,6 +692,8 @@
   <string name="status_bar_notif_count_summary">Wyświetla licznik oczekujących powiadomień</string>
   <string name="status_bar_quick_qs_pulldown_title">Szybkie rozwijanie</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s krawędź ekranu rozwija szybkie ustawienia</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Lewo</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Prawo</string>
   <string name="status_bar_quick_qs_pulldown_off">Wyłączony</string>
   <string name="status_bar_quick_qs_pulldown_left">Lewa</string>
   <string name="status_bar_quick_qs_pulldown_right">Prawa</string>
@@ -1022,13 +1024,24 @@
   <string name="allow_background_both">Dane mobilne &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Tylko przez Wi\u2011Fi</string>
   <string name="allow_background_none">Brak dostępu</string>
+  <string name="mobile_data_alert">Alert danych komórkowych</string>
+  <string name="mobile_data_alert_summary">Powiadom, jeśli aplikacja zużywa znaczną ilość danych</string>
+  <string name="data_usage_menu_enable_data_alerts">Włącz alerty użycia danych</string>
+  <string name="data_usage_menu_disable_data_alerts">Wyłącz alerty użycia danych</string>
   <string name="data_usage_menu_reset_stats">Resetuj statystyki danych</string>
   <string name="reset_data_stats_msg">Spowoduje to skasowanie przeszłych i aktualnych informacji o użyciu danych</string>
   <string name="reset_stats_confirm">Potwierdź</string>
   <string name="restrict_cellular_access_title">Ogranicz dostęp do danych mobilnych</string>
+  <string name="restrict_cellular_access_summary">Wyłącz dostęp do danych w sieciach komórkowych</string>
   <string name="restrict_cellular_access_dialog_title">Ograniczyć dostęp do danych mobilnych?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ta funkcja może spowodować, że aplikacje wymagające stałego dostępu do danych mogą przestać działać jeśli będą dostępne tylko sieci komórkowe.\n\nMożesz znaleźć więcej ustawień odnośnie kontroli danych mobilnych w ustawieniach.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Rozmycie blokady ekranu</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Pokaż na ekranie blokady</string>
+  <string name="app_notification_show_on_keyguard_summary">Pokaż powiadomienia z tej aplikacji na ekranie blokady</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Wyłącz trwałe powiadomienia na ekranie blokady</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 14b5757..3d6b0db 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Tela de bloqueio embaçada</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostrar na tela de bloqueio</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostrar notificações deste aplicativo na tela de bloqueio</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desativar notificação persistente na tela de bloqueio</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar notificações persistentes deste aplicativo na tela de bloqueio</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 610fc6d..c9845d2 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1043,4 +1043,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Desfocagem do ecrã de bloqueio</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Mostrar no ecrã de bloqueio</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostrar notificações desta aplicação no ecrã de bloqueio</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desativar as notificações persistentes no ecrã de bloqueio</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar as notificações persistentes desta aplicação no ecrã de bloqueio</string>
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 3ea15ba..d7a53dc 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -931,4 +931,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Afișează pe ecranul de blocare</string>
+  <string name="app_notification_show_on_keyguard_summary">Afișează notificări de la acestă aplicație pe ecranul de blocare</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Dezactivați notificarea persistentă pe ecranul de blocare</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nu arată notificări persistente de la acestă aplicație pe ecranul de blocare</string>
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index aef7f3f..1b8f6eb 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1044,4 +1044,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Размытие экрана блокировки</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">На экране блокировки</string>
+  <string name="app_notification_show_on_keyguard_summary">Показывать уведомления из этого приложения на экране блокировки</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Заблокировать постоянные на экране блокир.</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Не показывать постоянные уведомления из этого приложения на экране блокировки</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 5646b8b..e4f4a00 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -895,4 +895,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Zobraziť na obrazovke uzamknutia</string>
+  <string name="app_notification_show_on_keyguard_summary">Zobraziť oznámenia z tejto aplikácie na uzamknutej obrazovke</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Zakázať trvalé oznámenia na obrazovke uzamknutia</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nezobrazovať trvalé oznámenia z tejto aplikácie na obrazovke uzamknutia</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 4996e79..19024fd 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1047,4 +1047,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Zamegljenost zaklenjenega zaslona</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Prikaži na zaslonu za zakl.</string>
+  <string name="app_notification_show_on_keyguard_summary">Na zaklenjenem zaslonu prikaži obvestila iz te aplikacije</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Onem. vztr. obv. na zas. za zakl.</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nikoli ne prikaži vztrajnih obvestil iz te aplikacije na zaklenjenem zaslonu</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index df2bdb4..b348893 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1038,4 +1038,8 @@
   <string name="shortcut_carrier_title">Оператор мреже</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Прикажи на закључаном екрану</string>
+  <string name="app_notification_show_on_keyguard_summary">Прикажи обавештење ове апликације на закључаном екрану</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Онемогућити трајна обавештења на закључаном екрану</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Никад не приказуј трајна обавештења ове апликације на закључаном екрану</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 318b5a0..8911cf4 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1027,4 +1027,8 @@ inkluderar en unik identifikation,
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Visa på låsskärmen</string>
+  <string name="app_notification_show_on_keyguard_summary">Visa aviseringar från denna app på låsskärmen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Inaktivera beständiga aviseringar på låsskärmen</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Visa aldrig beständiga aviseringar från denna app på låsskärmen</string>
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index c697e22..af5ee64 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">லாக் திரையில் காட்டு</string>
+  <string name="app_notification_show_on_keyguard_summary">லாக் திரையில் இந்த பயன்பாடு-இல் இருந்து அறிவுறுத்தல்களை காட்டு</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">பூட்டுத் திரையில் விடாப்பிடியான அறிவுறுத்தலை முடக்கு</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">இந்த பயன்பாடு-இல் இருந்து  விடாப்பிடியான அறிவுறுத்தலை பூட்டுத் திரையில் எப்போதும் காட்டாதே</string>
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index b608b5b..882ff88 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1007,4 +1007,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">లాక్ స్క్రీనును చూపుము</string>
+  <string name="app_notification_show_on_keyguard_summary">ఈ ప్రోగ్రాం నుండి వచ్చే నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపుము</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">లాక్ స్క్రీన్ పైన నిరంతర నోటిఫికేషన్లను నిలిపివేయుము</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">ఎప్పుడూ కూడా ఈ ప్రోగ్రాం నుండి వచ్చే నిరంతర నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపవద్దు</string>
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index c7eda88..3e560d2 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1041,4 +1041,8 @@
   <string name="shortcut_carrier_title">ผู้ให้บริการเครือข่าย</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">แสดงบนหน้าจอล็อค</string>
+  <string name="app_notification_show_on_keyguard_summary">แสดงการแจ้งเตือนจากแอปนี้บนหน้าจอล็อค</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">ปิดใช้งานการแจ้งเตือนแบบถาวรบนหน้าจอล็อค</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">ไม่ต้องแสดงการแจ้งเตือนแบบถาวรจากแอปนี้บนหน้าจอล็อค</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index cbfc6d0..6d0edbf 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1042,4 +1042,8 @@
   <string name="shortcut_carrier_title">Ağ operatörleri</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Kilit ekranında göster</string>
+  <string name="app_notification_show_on_keyguard_summary">Kilit ekranında bu uygulamanın bildirimlerini göster</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Kilit ekranında kalıcı bildirimleri devre dışı bırak</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Kilit ekranında bu uygulamanın kalıcı bildirimlerini asla gösterme</string>
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index aa2401b..d47bec4 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1016,4 +1016,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">قۇلۇپ ئېكراندا كۆرسىتىدۇ</string>
+  <string name="app_notification_show_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ ئۇقتۇرۇشلىرىنى كۆرسىتىدۇ</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">قۇلۇپ ئېكراندا دائىملىق ئۇقتۇرۇشنى چەكلەيدۇ</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ دائىملىق ئۇقتۇرۇشىنى مەڭگۈ كۆرسەتمەيدۇ</string>
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index bc8f3d8..0147596 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -943,4 +943,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">На екрані блокування</string>
+  <string name="app_notification_show_on_keyguard_summary">Відображати сповіщення із цієї програми на екрані блокування</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Відключити сповіщення на екрані блокування</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Не відображувати сповіщення від цієї програми на екрані блокування</string>
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 097c35c..915596c 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1041,4 +1041,8 @@
   <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Hiển thị trên màn hình khóa</string>
+  <string name="app_notification_show_on_keyguard_summary">Hiển thị các thông báo từ ứng dụng này trên màn hình khóa</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Tắt thông báo liên tục trên màn hình khóa</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Không bao giờ hiển thị các thông báo liên tục từ ứng dụng này trên màn hình khóa</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 24291f4..7841d44 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1040,4 +1040,8 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">锁屏模糊</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">在锁屏上显示</string>
+  <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">禁用锁屏上的持久通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">永不在锁屏上显示来自此应用的持久通知</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 63501c1..13d7af9 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -835,4 +835,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
+  <string name="app_notification_show_on_keyguard_summary">在鎖定螢幕中顯示此應用程式的通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">在鎖定螢幕上停用持久通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定螢幕上不再顯示來自此應用程式的持久通知</string>
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index ca7dd9b..248586a 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -872,4 +872,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
+  <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">在鎖屏上停用持久通知</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
 </resources>
-- 
cgit v1.1


From f6744a9b6493b172744deaf382a672699ac4730d Mon Sep 17 00:00:00 2001
From: Deepak Kundra <deepakkundra@gmail.com>
Date: Fri, 27 May 2016 20:18:17 -0700
Subject: Radio info to control QC dbg prop's

Issue-id:FEIJ-679

Change-Id: Ia1c9e5d5899ae173d4fd7fa9b2339013b42f115b
---
 AndroidManifest.xml                       |   8 ++
 res/layout/cm_radio_info.xml              |  72 ++++++++++
 res/values/cm_strings.xml                 |  17 +++
 src/com/android/settings/CmRadioInfo.java | 217 ++++++++++++++++++++++++++++++
 4 files changed, 314 insertions(+)
 create mode 100644 res/layout/cm_radio_info.xml
 create mode 100644 src/com/android/settings/CmRadioInfo.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 26e03a7..523d4cc 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1972,6 +1972,14 @@
             </intent-filter>
         </activity>
 
+        <activity android:name="CmRadioInfo" android:label="@string/cm_radio_info_label"
+            android:process="com.android.phone">
+            <intent-filter>
+                <action android:name="com.android.settings.OEM_RADIO_INFO" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
         <!-- Suspect activity alias: targetActivity is Settings itself, does not define a name. Remove? -->
         <activity-alias android:name="ProxySelector"
             android:label="@string/proxy_settings_label"
diff --git a/res/layout/cm_radio_info.xml b/res/layout/cm_radio_info.xml
new file mode 100644
index 0000000..f49db70
--- /dev/null
+++ b/res/layout/cm_radio_info.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+
+    <LinearLayout style="@style/info_layout">
+
+        <!-- Turn on/off prop for MBN Auto Loading -->
+        <Button android:id="@+id/mbn_auto_load"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        <!-- Turn on/off prop for forcing VoLTE avail overlay -->
+        <Button android:id="@+id/volte_avail_ovr"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        <!-- Turn on/off prop for forcing VT avail overlay -->
+        <Button android:id="@+id/vt_avail_ovr"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        <!-- Turn on/off prop for forcing WFC avail overlay -->
+        <Button android:id="@+id/wfc_avail_ovr"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        <!-- Turn on/off ADB radio log -->
+        <Button android:id="@+id/adb_radio_log"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+        <!-- Turn on/off DIAG log -->
+        <Button android:id="@+id/diag_log"
+                android:textSize="14sp"
+                android:layout_marginTop="8dip"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                />
+
+    </LinearLayout>
+</ScrollView>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index b3c02f5..a0e811b 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1223,4 +1223,21 @@
     <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
     <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
 
+    <!-- CmRadioInfo -->
+    <string name="cm_radio_info_label">Enhanced radio control</string>
+
+    <!-- Radio Control (IMS/MBN etc.) -->
+    <string name="cm_radio_info_mbn_auto_load_on_label">Turn off MBN auto load</string>
+    <string name="cm_radio_info_mbn_auto_load_off_label">Turn on MBN auto load</string>
+    <string name="cm_radio_info_volte_avail_ovr_on_label">Turn off VoLTE dbg</string>
+    <string name="cm_radio_info_volte_avail_ovr_off_label">Turn on VoLTE dbg</string>
+    <string name="cm_radio_info_vt_avail_ovr_on_label">Turn off VT dbg</string>
+    <string name="cm_radio_info_vt_avail_ovr_off_label">Turn on VT dbg</string>
+    <string name="cm_radio_info_wfc_avail_ovr_on_label">Turn off WFC dbg</string>
+    <string name="cm_radio_info_wfc_avail_ovr_off_label">Turn on WFC dbg</string>
+    <string name="cm_radio_info_adb_log_on_label">Turn off ADB radio log</string>
+    <string name="cm_radio_info_adb_log_off_label">Turn on ADB radio log</string>
+    <string name="cm_radio_info_diag_log_on_label">Turn off Diag log</string>
+    <string name="cm_radio_info_diag_log_off_label">Turn on Diag log</string>
+
 </resources>
diff --git a/src/com/android/settings/CmRadioInfo.java b/src/com/android/settings/CmRadioInfo.java
new file mode 100644
index 0000000..112f4d8
--- /dev/null
+++ b/src/com/android/settings/CmRadioInfo.java
@@ -0,0 +1,217 @@
+/*
+ *     Copyright (C) 2016 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.
+ */
+
+package com.android.settings;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+
+public class CmRadioInfo extends Activity {
+    private final String TAG = "CmRadioInfo";
+
+    private Button mbnAutoLoadButton;
+    private Button volteAvailOvrButton;
+    private Button vtAvailOvrButton;
+    private Button wfcAvailOvrButton;
+    private Button adbRadioLog;
+    private Button diagLog;
+
+    static final String PROPERTY_SW_MBN_UPDATE = "persist.radio.sw_mbn_update";
+    static final String PROPERTY_SW_MBN_VOLTE = "persist.radio.sw_mbn_volte";
+    static final String PROPERTY_VOLTE_AVAIL_OVR = "persist.dbg.volte_avail_ovr";
+    static final String PROPERTY_VT_AVAIL_OVR = "persist.dbg.vt_avail_ovr";
+    static final String PROPERTY_DATA_IWLAN_ENABLE = "persist.data.iwlan.enable";
+    static final String PROPERTY_WFC_AVAIL_OVR = "persist.dbg.wfc_avail_ovr";
+    static final String PROPERTY_ADB_LOG_ON = "persist.radio.adb_log_on";
+    static final String PROPERTY_DIAG_LOG_ON = "persist.radio.diag_log_on";
+
+    @Override
+    public void onCreate(Bundle icicle) {
+        super.onCreate(icicle);
+
+        setContentView(R.layout.cm_radio_info);
+
+        mbnAutoLoadButton = (Button) findViewById(R.id.mbn_auto_load);
+        mbnAutoLoadButton.setOnClickListener(mMbnAutoLoadHandler);
+
+        volteAvailOvrButton = (Button) findViewById(R.id.volte_avail_ovr);
+        volteAvailOvrButton.setOnClickListener(mVolteAvailOvrHandler);
+
+        vtAvailOvrButton = (Button) findViewById(R.id.vt_avail_ovr);
+        vtAvailOvrButton.setOnClickListener(mVtAvailOvrHandler);
+
+        wfcAvailOvrButton = (Button) findViewById(R.id.wfc_avail_ovr);
+        wfcAvailOvrButton.setOnClickListener(mWfcAvailOvrHandler);
+
+        adbRadioLog = (Button) findViewById(R.id.adb_radio_log);
+        adbRadioLog.setOnClickListener(mAdbRadioLogHandler);
+
+        diagLog = (Button) findViewById(R.id.diag_log);
+        diagLog.setOnClickListener(mDiagLogHandler);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+
+        updateMbnAutoLoadState();
+        updateVolteAvailOvrState();
+        updateVtAvailOvrState();
+        updateWfcAvailOvrState();
+        updateAdbRadioLogState();
+        updateDiagLogState();
+
+        log("onResume: update cm radio info");
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        log("onPause: cm radio info");
+    }
+
+    OnClickListener mMbnAutoLoadHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_SW_MBN_UPDATE, (isMbnAutoLoad() ? "0" : "1"));
+            updateMbnAutoLoadState();
+        }
+    };
+
+    private boolean isMbnAutoLoad() {
+        return SystemProperties.getBoolean(PROPERTY_SW_MBN_UPDATE, false);
+    }
+
+    private void updateMbnAutoLoadState() {
+        log("updateMbnAutoLoadState isMbnAutoLoad()=" + isMbnAutoLoad());
+        String buttonText = isMbnAutoLoad() ?
+                            getString(R.string.cm_radio_info_mbn_auto_load_on_label) :
+                            getString(R.string.cm_radio_info_mbn_auto_load_off_label);
+        mbnAutoLoadButton.setText(buttonText);
+    }
+
+    OnClickListener mVolteAvailOvrHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_SW_MBN_VOLTE, (isVolteAvailOvr() ? "0" : "1"));
+            SystemProperties.set(PROPERTY_VOLTE_AVAIL_OVR, (isVolteAvailOvr() ? "0" : "1"));
+            updateVolteAvailOvrState();
+        }
+    };
+
+    private boolean isVolteAvailOvr() {
+        return SystemProperties.getBoolean(PROPERTY_VOLTE_AVAIL_OVR, false);
+    }
+
+    private void updateVolteAvailOvrState() {
+        log("updateVolteAvailOvrState isVolteAvailOvr()=" + isVolteAvailOvr());
+        String buttonText = isVolteAvailOvr() ?
+                            getString(R.string.cm_radio_info_volte_avail_ovr_on_label) :
+                            getString(R.string.cm_radio_info_volte_avail_ovr_off_label);
+        volteAvailOvrButton.setText(buttonText);
+    }
+
+    OnClickListener mVtAvailOvrHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_VT_AVAIL_OVR, (isVtAvailOvr() ? "0" : "1"));
+            updateVtAvailOvrState();
+        }
+    };
+
+    private boolean isVtAvailOvr() {
+        return SystemProperties.getBoolean(PROPERTY_VT_AVAIL_OVR, false);
+    }
+
+    private void updateVtAvailOvrState() {
+        log("updateVtAvailOvrState isVtAvailOvr()=" + isVtAvailOvr());
+        String buttonText = isVtAvailOvr() ?
+                            getString(R.string.cm_radio_info_vt_avail_ovr_on_label) :
+                            getString(R.string.cm_radio_info_vt_avail_ovr_off_label);
+        vtAvailOvrButton.setText(buttonText);
+    }
+
+    OnClickListener mWfcAvailOvrHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_DATA_IWLAN_ENABLE, (isWfcAvailOvr() ? "false" : "true"));
+            SystemProperties.set(PROPERTY_WFC_AVAIL_OVR, (isWfcAvailOvr() ? "0" : "1"));
+            updateWfcAvailOvrState();
+        }
+    };
+
+    private boolean isWfcAvailOvr() {
+        return SystemProperties.getBoolean(PROPERTY_WFC_AVAIL_OVR, false);
+    }
+
+    private void updateWfcAvailOvrState() {
+        log("updateWfcAvailOvrState isWfcAvailOvr()=" + isWfcAvailOvr());
+        String buttonText = isWfcAvailOvr() ?
+                            getString(R.string.cm_radio_info_wfc_avail_ovr_on_label) :
+                            getString(R.string.cm_radio_info_wfc_avail_ovr_off_label);
+        wfcAvailOvrButton.setText(buttonText);
+    }
+
+    OnClickListener mAdbRadioLogHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_ADB_LOG_ON, (isAdbRadioLog() ? "0" : "1"));
+            updateAdbRadioLogState();
+        }
+    };
+
+    private boolean isAdbRadioLog() {
+        return SystemProperties.getBoolean(PROPERTY_ADB_LOG_ON, false);
+    }
+
+    private void updateAdbRadioLogState() {
+        log("updateAdbRadioLogState isAdbRadioLog()=" + isAdbRadioLog());
+        String buttonText = isAdbRadioLog() ?
+                getString(R.string.cm_radio_info_adb_log_on_label) :
+                getString(R.string.cm_radio_info_adb_log_off_label);
+        adbRadioLog.setText(buttonText);
+    }
+
+    OnClickListener mDiagLogHandler = new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+            SystemProperties.set(PROPERTY_DIAG_LOG_ON, (isDiagLog() ? "0" : "1"));
+            updateDiagLogState();
+        }
+    };
+
+    private boolean isDiagLog() {
+        return SystemProperties.getBoolean(PROPERTY_DIAG_LOG_ON, false);
+    }
+
+    private void updateDiagLogState() {
+        log("updateDiagLogState isDiagLog()=" + isDiagLog());
+        String buttonText = isDiagLog() ?
+                getString(R.string.cm_radio_info_diag_log_on_label) :
+                getString(R.string.cm_radio_info_diag_log_off_label);
+        diagLog.setText(buttonText);
+    }
+
+    private void log(String s) {
+        Log.d(TAG, "[Phone] " + s);
+    }
+}
-- 
cgit v1.1


From 54dc1d4475e18736a94e3d32d0280c97dcc67807 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Mon, 6 Jun 2016 17:44:22 -0700
Subject: Automatic translation import

Change-Id: Ie5bb0b8e6e1980a4e29cedea2820beb893fb7e23
---
 res/values-af/cm_strings.xml      | 2 ++
 res/values-am/cm_strings.xml      | 2 ++
 res/values-ar/cm_strings.xml      | 2 ++
 res/values-as-rIN/cm_strings.xml  | 2 ++
 res/values-ast-rES/cm_strings.xml | 2 ++
 res/values-az-rAZ/cm_strings.xml  | 2 ++
 res/values-be/cm_strings.xml      | 8 ++++++++
 res/values-bg/cm_strings.xml      | 2 ++
 res/values-bn-rBD/cm_strings.xml  | 2 ++
 res/values-br-rFR/cm_strings.xml  | 2 ++
 res/values-ca/cm_strings.xml      | 2 ++
 res/values-cs/cm_strings.xml      | 2 ++
 res/values-csb-rPL/cm_strings.xml | 2 ++
 res/values-cy/cm_strings.xml      | 2 ++
 res/values-da/cm_strings.xml      | 2 ++
 res/values-de/cm_strings.xml      | 2 ++
 res/values-el/cm_strings.xml      | 2 ++
 res/values-en-rAU/cm_strings.xml  | 2 ++
 res/values-en-rGB/cm_strings.xml  | 2 ++
 res/values-en-rIN/cm_strings.xml  | 2 ++
 res/values-en-rPT/cm_strings.xml  | 2 ++
 res/values-eo/cm_strings.xml      | 2 ++
 res/values-es-rMX/cm_strings.xml  | 2 ++
 res/values-es-rUS/cm_strings.xml  | 2 ++
 res/values-es/cm_strings.xml      | 2 ++
 res/values-et-rEE/cm_strings.xml  | 2 ++
 res/values-eu-rES/cm_strings.xml  | 2 ++
 res/values-fa/cm_strings.xml      | 2 ++
 res/values-fi/cm_strings.xml      | 2 ++
 res/values-fil-rPH/cm_strings.xml | 2 ++
 res/values-fr-rCA/cm_strings.xml  | 2 ++
 res/values-fr/cm_strings.xml      | 2 ++
 res/values-frp-rIT/cm_strings.xml | 2 ++
 res/values-fy-rNL/cm_strings.xml  | 2 ++
 res/values-gd-rGB/cm_strings.xml  | 2 ++
 res/values-gl-rES/cm_strings.xml  | 2 ++
 res/values-gu-rIN/cm_strings.xml  | 2 ++
 res/values-hi/cm_strings.xml      | 2 ++
 res/values-hr/cm_strings.xml      | 2 ++
 res/values-hu/cm_strings.xml      | 2 ++
 res/values-hy-rAM/cm_strings.xml  | 2 ++
 res/values-in/cm_strings.xml      | 2 ++
 res/values-is-rIS/cm_strings.xml  | 2 ++
 res/values-it/cm_strings.xml      | 2 ++
 res/values-iw/cm_strings.xml      | 2 ++
 res/values-ja/cm_strings.xml      | 4 +++-
 res/values-ka-rGE/cm_strings.xml  | 2 ++
 res/values-kk-rKZ/cm_strings.xml  | 2 ++
 res/values-km-rKH/cm_strings.xml  | 2 ++
 res/values-kn-rIN/cm_strings.xml  | 2 ++
 res/values-ko/cm_strings.xml      | 2 ++
 res/values-ku/cm_strings.xml      | 2 ++
 res/values-ky-rKG/cm_strings.xml  | 2 ++
 res/values-lb/cm_strings.xml      | 2 ++
 res/values-lo-rLA/cm_strings.xml  | 2 ++
 res/values-lt/cm_strings.xml      | 2 ++
 res/values-lv/cm_strings.xml      | 2 ++
 res/values-mk-rMK/cm_strings.xml  | 2 ++
 res/values-ml-rIN/cm_strings.xml  | 2 ++
 res/values-mn-rMN/cm_strings.xml  | 2 ++
 res/values-mr-rIN/cm_strings.xml  | 2 ++
 res/values-ms-rMY/cm_strings.xml  | 2 ++
 res/values-my-rMM/cm_strings.xml  | 2 ++
 res/values-nb/cm_strings.xml      | 2 ++
 res/values-ne-rNP/cm_strings.xml  | 2 ++
 res/values-nl/cm_strings.xml      | 2 ++
 res/values-oc-rFR/cm_strings.xml  | 2 ++
 res/values-or-rIN/cm_strings.xml  | 2 ++
 res/values-pa-rIN/cm_strings.xml  | 2 ++
 res/values-pl/cm_strings.xml      | 2 ++
 res/values-pt-rBR/cm_strings.xml  | 2 ++
 res/values-pt-rPT/cm_strings.xml  | 2 ++
 res/values-rm/cm_strings.xml      | 2 ++
 res/values-ro/cm_strings.xml      | 2 ++
 res/values-ru/cm_strings.xml      | 2 ++
 res/values-si-rLK/cm_strings.xml  | 2 ++
 res/values-sk/cm_strings.xml      | 2 ++
 res/values-sl/cm_strings.xml      | 2 ++
 res/values-sq-rAL/cm_strings.xml  | 2 ++
 res/values-sr/cm_strings.xml      | 2 ++
 res/values-sv/cm_strings.xml      | 2 ++
 res/values-sw/cm_strings.xml      | 2 ++
 res/values-ta-rIN/cm_strings.xml  | 2 ++
 res/values-te-rIN/cm_strings.xml  | 2 ++
 res/values-th/cm_strings.xml      | 2 ++
 res/values-tr/cm_strings.xml      | 2 ++
 res/values-ug/cm_strings.xml      | 2 ++
 res/values-uk/cm_strings.xml      | 2 ++
 res/values-ur-rPK/cm_strings.xml  | 2 ++
 res/values-uz-rUZ/cm_strings.xml  | 2 ++
 res/values-vi/cm_strings.xml      | 2 ++
 res/values-zh-rCN/cm_strings.xml  | 2 ++
 res/values-zh-rHK/cm_strings.xml  | 2 ++
 res/values-zh-rTW/cm_strings.xml  | 2 ++
 res/values-zu/cm_strings.xml      | 2 ++
 95 files changed, 197 insertions(+), 1 deletion(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 0b94fdb..96bd07b 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1018,4 +1018,6 @@
   <string name="app_notification_show_on_keyguard_summary">Vertoon kennisgewings vanuit hierdie program op die slotskerm</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktiveer aanhoudende kennisgewings op die slotskerm</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Moet nooit aanhoudende kennisgewings vertoon vanuit hierdie program op die slotskerm</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index cbc98f5..732e796 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1052,4 +1052,6 @@
   <string name="app_notification_show_on_keyguard_summary">إظهار إشعارات من هذا التطبيق على شاشة التأمين</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">منع الإشعارات الثابتة على شاشة التأمين</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">عدم إظهار إشعارات ثابتة من هذا التطبيق على شاشة التأمين</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index f494745..60e9410 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1011,4 +1011,6 @@
   <string name="app_notification_show_on_keyguard_summary">এই এপ্প্‌ৰ পৰা অধিসূচনা লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">লক স্ক্ৰীণত নেৰানেপেৰা অধিসূচনা অক্ষম কৰক</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">এই এপ্প্‌ৰ পৰা নেৰানেপেৰা অধিসূচনা লক স্ক্ৰীণত নেদেখুৱাব</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 4e61f73..e99a904 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -897,4 +897,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_notification_show_on_keyguard_summary">Amosar notificaciones d\'esta aplicación na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nun amosar nunca notificaciones persistentes d\'esta aplicación na pantalla de bloquéu</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 7fd2d61..4078c27 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -714,4 +714,6 @@
   <string name="app_notification_show_on_keyguard_summary">Kilid ekranında bu tətbiqetmənin bildirişlərini göstər</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Kilid ekranında davamlı bildirişləri ləğv et</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilid ekranında bu tətbiqmənin davamlı bildirişlərini heç vaxt göstərmə</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 4bf9c34..caaaa78 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -972,6 +972,7 @@
   <string name="factory_reset_warning_text_reset_now">ВЫДАЛІЦЬ УСЁ</string>
   <string name="factory_reset_warning_text_message">Усе дададзеныя акаўнты, дадаткі, іх дадзеныя і налады будуць выдалены з гэтай прылады. Скасаваць гэта дзеянне будзе немагчыма.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Іншы</string>
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">Ніколі</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 хвіліна</string>
@@ -1002,8 +1003,13 @@
   <string name="battery_info_status_charging_dock_ac">Зарадка ад адаптара дак-станцыі</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Зарадка праз USB дак-станцыю</string>
+  <string name="privacy_guard_internet_category">Сеціва</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Надвор\'е</string>
   <string name="weather_settings_general_settings_title">Агульныя</string>
+  <string name="weather_settings_temp_celsius">Цэльсій</string>
+  <string name="weather_settings_temp_fahrenheit">Фарэнгейт</string>
+  <string name="weather_settings_keyword">надвор\'е</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
@@ -1011,4 +1017,6 @@
   <string name="app_notification_show_on_keyguard_summary">Паказваць апавяшчэнні з гэтага дадатку на экране блакавання</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Адключыць шторазовыя апавяшчэнні пра блакаванне экрана</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць шторазовыя апавяшчэнні з гэтага дадатку на экране блакавання</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 87bcd3e..9e5f859 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Показвай известия от това приложение при заключен екран</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Забрани постоянна нотификация при заключен екран</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никога не показвай постоянни нотификации от това приложение при заключен екран</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 82b3a3b..02b544a 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -561,4 +561,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 8831516..38a2099 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostra les notificacions d\'aquesta aplicació a la pantalla de bloqueig</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deshabilita les notificacions persistents a la pantalla de bloqueig</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostris mai notificacions persistents d\'aquesta aplicació a la pantalla de bloqueig</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index eb0f2ca..839ebbc 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Zakázat trvalé upozornění na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikdy nezobrazovat trvalé upozornění na zamykací obrazovce</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 6ae0857..f47614a 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1012,4 +1012,6 @@
   <string name="app_notification_show_on_keyguard_summary">Vis meddelelser fra denne app på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende meddelelser på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldrig vedvarende meddelelser fra denne app på låseskærmen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 56b4c72..f0c5ec7 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Benachrichtigungen von dieser App auf dem Sperrbildschirm anzeigen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhafte Benachrichtigungen auf dem Sperrbildschirm deaktivieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Keine dauerhaften Benachrichtigungen dieser App auf dem Sperrbildschirm anzeigen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 9f43b01..356afd6 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1051,4 +1051,6 @@
   <string name="app_notification_show_on_keyguard_summary">Εμφάνιση ειδοποιήσεων από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Απενεργ. επίμονης ειδοποίησης στην οθόνη κλειδώματος</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Να μην εμφανίζονται ποτέ επίμονες ειδοποιήσεις από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 9926577..ca6ceaa 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -772,4 +772,6 @@
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index abe8073..143a6d2 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -195,4 +195,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index cccbc81..2c51b92 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -916,4 +916,6 @@
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index e8b63b0..161ee54 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -851,4 +851,6 @@
   <string name="app_notification_show_on_keyguard_summary">Montri atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Malŝalti daŭran atentigon sur ŝlosa ekrano</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Neniam montri daŭrajn atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 15311cd..95ea32f 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -297,4 +297,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 3448541..cd507dd 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla bloqueada</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla bloqueada</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla bloqueada</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index b7780a8..1f785c8 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla de bloqueo</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 402340f..f7980fa 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -891,4 +891,6 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="app_notification_show_on_keyguard_summary">Kuva selle rakenduse teavitusi lukustusekraanil</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Keela püsivad teavitused lukustusekraanil</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ära kunagi näita püsivaid teavitusi sellelt rakenduselt lukustuskuval</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index c55f745..20dfe7f 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Bistaratu aplikazio honen jakinarazpenak blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Ezgaitu jakinarazpen iraunkorra blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ez bistaratu inoiz aplikazio honen jakinarazpen iraunkorrak blokeo-pantailan</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 7cbe18f..938f7e2 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -900,4 +900,6 @@
   <string name="app_notification_show_on_keyguard_summary">نمایش اعلان‌های این برنامه در قفل صفحه</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">غیرفعال کردن اعلان‌های پایدار در قفل صفحه</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">اعلان‌های پایدار این برنامه هرگز در قفل صفحه نشان داده نشود</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index d7acba7..b49a4cc 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Näytä tämän sovelluksen ilmoitukset lukitusnäytöllä</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Älä näytä pysyviä ilmoituksia lukitusnäytöllä</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Älä koskaan näytä pysyviä ilmoituksia tästä sovelluksesta lukitusnäytöllä</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 665805b..027edcf 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1047,4 +1047,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_notification_show_on_keyguard_summary">Afficher les notifications de cette application sur l\'écran de verrouillage</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Désactiver les notifications persistantes sur l\'écran de verrouillage</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ne jamais afficher les notifications persistantes de cette application sur l\'écran de verrouillage</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index eb40dd9..140a922 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -191,4 +191,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 0b1b27e..9fcdcdd 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -437,4 +437,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index d9feb19..556d8b2 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1013,4 +1013,6 @@
   <string name="app_notification_show_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી સૂચનાઓ દર્શાવો</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">લૉક સ્ક્રીન પર નિરંતર સૂચનાઓ અક્ષમ કરો</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી નિરંતર સૂચનાઓ ક્યારેય દર્શાવવા નહીં</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 785c606..f47e365 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -864,4 +864,6 @@
   <string name="app_notification_show_on_keyguard_summary">इस ऐप की अधिसूचनाओं को लॉक स्क्रीन पर दिखाएँ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीन पर बने रहने वाली अधिसूचनाओं को अक्षम करें</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">इस ऐप की अधिसूचनाओं को कभी भी लॉक स्क्रीन पर नहीं दिखाएँ</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index b94cf20..068f2b3 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1048,4 +1048,6 @@
   <string name="app_notification_show_on_keyguard_summary">Prikaži obavijesti iz ove aplikacije na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onemogući trajne obavijesti na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikad ne prikazuj trajne obavijesti ove aplikacije na zaključanom zaslonu</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index d692901..9e799e3 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1013,4 +1013,6 @@
   <string name="app_notification_show_on_keyguard_summary">Ezen alkalmazáshoz tartozó értesítések megjelenítése a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Állandó értesítés tiltása a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index fb90eca..5277890 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1045,4 +1045,6 @@
   <string name="app_notification_show_on_keyguard_summary">Tampilkan pemberitahuan dari aplikasi ini pada layar kunci</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Tiadakan pemberitahuan tetap pada layar kunci</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Tidak pernah menampilkan pemberitahuan tetap dari aplikasi ini pada layar kunci</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index a4309aa..8653182 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1049,4 +1049,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nella schermata di blocco</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nella schermata di blocco</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 6975a52..6347600 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1048,4 +1048,6 @@
   <string name="app_notification_show_on_keyguard_summary">הצג הודעות מיישום זה במסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">השבתת התראות תמידיות על מסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">אל תציג התראות תמידיות מיישום זה על מסך הנעילה</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index ae635c7..3f79141 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -436,7 +436,7 @@
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">許可</string>
   <string name="app_ops_permissions_ignored">無視</string>
-  <string name="app_ops_permissions_always_ask">ダイアログ</string>
+  <string name="app_ops_permissions_always_ask">常に確認する</string>
   <!-- App ops detail -->
   <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g>（<xliff:g id="count">%2$s</xliff:g>使用）</string>
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g>許可しました</string>
@@ -1046,4 +1046,6 @@
   <string name="app_notification_show_on_keyguard_summary">このアプリからの通知をロック画面に表示する</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">常駐する通知をロック画面で無効化</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">このアプリからの常駐する通知をロック画面に表示しない</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index c8c0462..265b2df 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1013,4 +1013,6 @@
   <string name="app_notification_show_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಈ ಆಪ್‍ನಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ನಿರಂತರ ಅಧಿಸೂಚನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಎಂದಿಗೂ ಈ ಆಪ್‍ನಿಂದ ನಿರಂತರ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಬೇಡ</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 4206d86..8e30371 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1039,4 +1039,6 @@
   <string name="app_notification_show_on_keyguard_summary">잠금화면에 알림을 표시</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">상주 알림을 잠금화면에 표시하지 않음</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">이 앱의 상주 알림을 잠금화면에 표시하지 않음</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 714a9d3..fb17df9 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -773,4 +773,6 @@
   <string name="app_notification_show_on_keyguard_summary">پیشاندانی تێبینی لەم بەرنامەیە لەسەر قوفڵی شاشە</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">لەکارخستنی بەردەوام تێبینی لەسەر قوفڵی سەرشاشە</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">هەرگیز بەبەردەوامی تێبینی پیشان مەدە لەسەر ئەم بەرنامەیە لەسەر قوفڵی سەر شاشە</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index ac31720..f7b9ed6 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -894,4 +894,6 @@
   <string name="app_notification_show_on_keyguard_summary">Notifikatioune vun dëser App op dem Spärschierm uweisen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhaft Notifikatiounen op de Spärschierm desaktivéieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ni dauerhaft Notifikatiounen op de Spärschierm uweisen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index aca0fb0..505c2fd 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -899,4 +899,6 @@
   <string name="app_notification_show_on_keyguard_summary">Rodyti pranešimus iš šios programos ekrano užrakte</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Neleisti nuolatinių pranešimų ekrano užrakte</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Niekada nerodyti nuolatinių pranešimų iš šios programos ekrano užrakte</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 1a66be8..4b9fa81 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -553,4 +553,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index f4bd497..23ad807 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1012,4 +1012,6 @@
   <string name="app_notification_show_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ലോക്ക് സ്ക്രീനിൽ തുടര്‍ച്ചയായുള്ള അറിയിപ്പ് അപ്രാപ്തമാക്കുക</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് തുടരെയുള്ള അറിയിപ്പുകള്‍ ദൃശ്യമാക്കരുത്</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index bde282d..edf30c5 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1011,4 +1011,6 @@
   <string name="app_notification_show_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सूचना लॉक स्क्रीनवर दर्शवा</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीनवर सातत्यपूर्ण सूचना अक्षम करा</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सातत्यपूर्ण सूचना लॉक स्क्रीनवर कधीही दाखवू नका</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 7e4784b..1059add 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Vis varslinger fra denne appen på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende varsler på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldri vedvarende meldinger fra denne appen på låseskjermen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 96cab31..8072bbf 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1020,4 +1020,6 @@
   <string name="app_notification_show_on_keyguard_summary">Meldingen van deze app weergeven op het vergrendelingsscherm</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Permanente meldingen op vergrendelingsscherm uitschakelen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Permanente meldingen van deze app niet weergeven op het vergrendelingsscherm</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 153b8d5..274d19d 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1011,4 +1011,6 @@
   <string name="app_notification_show_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ନିର୍ଦେଶାବଳି ଦେଖା୍ନ୍ତୁ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି କଦାପି ଦେଖାନ୍ତୁ ନାହିଁ</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 9f1f091..15d2286 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1044,4 +1044,6 @@
   <string name="app_notification_show_on_keyguard_summary">Pokaż powiadomienia z tej aplikacji na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Wyłącz trwałe powiadomienia na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 3d6b0db..34f216b 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações deste aplicativo na tela de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar notificação persistente na tela de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar notificações persistentes deste aplicativo na tela de bloqueio</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index c9845d2..2ceab37 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1047,4 +1047,6 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações desta aplicação no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar as notificações persistentes no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar as notificações persistentes desta aplicação no ecrã de bloqueio</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index d7a53dc..2bb3888 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -935,4 +935,6 @@
   <string name="app_notification_show_on_keyguard_summary">Afișează notificări de la acestă aplicație pe ecranul de blocare</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dezactivați notificarea persistentă pe ecranul de blocare</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nu arată notificări persistente de la acestă aplicație pe ecranul de blocare</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 1b8f6eb..36e9758 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1048,4 +1048,6 @@
   <string name="app_notification_show_on_keyguard_summary">Показывать уведомления из этого приложения на экране блокировки</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Заблокировать постоянные на экране блокир.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не показывать постоянные уведомления из этого приложения на экране блокировки</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 9ec2255..7f90982 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -561,4 +561,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index e4f4a00..1c2e679 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -899,4 +899,6 @@
   <string name="app_notification_show_on_keyguard_summary">Zobraziť oznámenia z tejto aplikácie na uzamknutej obrazovke</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Zakázať trvalé oznámenia na obrazovke uzamknutia</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nezobrazovať trvalé oznámenia z tejto aplikácie na obrazovke uzamknutia</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 19024fd..74e6188 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1051,4 +1051,6 @@
   <string name="app_notification_show_on_keyguard_summary">Na zaklenjenem zaslonu prikaži obvestila iz te aplikacije</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onem. vztr. obv. na zas. za zakl.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikoli ne prikaži vztrajnih obvestil iz te aplikacije na zaklenjenem zaslonu</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index b348893..603e670 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1042,4 +1042,6 @@
   <string name="app_notification_show_on_keyguard_summary">Прикажи обавештење ове апликације на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Онемогућити трајна обавештења на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никад не приказуј трајна обавештења ове апликације на закључаном екрану</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 8911cf4..bcc15ba 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1031,4 +1031,6 @@ inkluderar en unik identifikation,
   <string name="app_notification_show_on_keyguard_summary">Visa aviseringar från denna app på låsskärmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Inaktivera beständiga aviseringar på låsskärmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Visa aldrig beständiga aviseringar från denna app på låsskärmen</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index af5ee64..86184c0 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1011,4 +1011,6 @@
   <string name="app_notification_show_on_keyguard_summary">லாக் திரையில் இந்த பயன்பாடு-இல் இருந்து அறிவுறுத்தல்களை காட்டு</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">பூட்டுத் திரையில் விடாப்பிடியான அறிவுறுத்தலை முடக்கு</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">இந்த பயன்பாடு-இல் இருந்து  விடாப்பிடியான அறிவுறுத்தலை பூட்டுத் திரையில் எப்போதும் காட்டாதே</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 882ff88..3c1b5f4 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1011,4 +1011,6 @@
   <string name="app_notification_show_on_keyguard_summary">ఈ ప్రోగ్రాం నుండి వచ్చే నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపుము</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">లాక్ స్క్రీన్ పైన నిరంతర నోటిఫికేషన్లను నిలిపివేయుము</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ఎప్పుడూ కూడా ఈ ప్రోగ్రాం నుండి వచ్చే నిరంతర నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపవద్దు</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 3e560d2..e3d5a97 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1045,4 +1045,6 @@
   <string name="app_notification_show_on_keyguard_summary">แสดงการแจ้งเตือนจากแอปนี้บนหน้าจอล็อค</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ปิดใช้งานการแจ้งเตือนแบบถาวรบนหน้าจอล็อค</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ไม่ต้องแสดงการแจ้งเตือนแบบถาวรจากแอปนี้บนหน้าจอล็อค</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 6d0edbf..c2f6849 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1046,4 +1046,6 @@
   <string name="app_notification_show_on_keyguard_summary">Kilit ekranında bu uygulamanın bildirimlerini göster</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Kilit ekranında kalıcı bildirimleri devre dışı bırak</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilit ekranında bu uygulamanın kalıcı bildirimlerini asla gösterme</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index d47bec4..487370e 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1020,4 +1020,6 @@
   <string name="app_notification_show_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ ئۇقتۇرۇشلىرىنى كۆرسىتىدۇ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">قۇلۇپ ئېكراندا دائىملىق ئۇقتۇرۇشنى چەكلەيدۇ</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ دائىملىق ئۇقتۇرۇشىنى مەڭگۈ كۆرسەتمەيدۇ</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 0147596..19d74d4 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -947,4 +947,6 @@
   <string name="app_notification_show_on_keyguard_summary">Відображати сповіщення із цієї програми на екрані блокування</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Відключити сповіщення на екрані блокування</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не відображувати сповіщення від цієї програми на екрані блокування</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 915596c..01efbbf 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1045,4 +1045,6 @@
   <string name="app_notification_show_on_keyguard_summary">Hiển thị các thông báo từ ứng dụng này trên màn hình khóa</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Tắt thông báo liên tục trên màn hình khóa</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Không bao giờ hiển thị các thông báo liên tục từ ứng dụng này trên màn hình khóa</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 7841d44..37d3582 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1044,4 +1044,6 @@
   <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">禁用锁屏上的持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">永不在锁屏上显示来自此应用的持久通知</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 13d7af9..0570e57 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -839,4 +839,6 @@
   <string name="app_notification_show_on_keyguard_summary">在鎖定螢幕中顯示此應用程式的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">在鎖定螢幕上停用持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定螢幕上不再顯示來自此應用程式的持久通知</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 248586a..9c5b7e9 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -876,4 +876,6 @@
   <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">在鎖屏上停用持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 727d532..68d7b7d 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -182,4 +182,6 @@
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
 </resources>
-- 
cgit v1.1


From 6716780ab9fa557da806c92a4b3602569f314b63 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Wed, 1 Jun 2016 10:39:30 -0700
Subject: Settings: use subid & imsi for MSIM apn lookups

Ticket: PAELLA-158

Change-Id: Icca65a9a46533e1bbcfd4dd08e974d736ea1253b
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 src/com/android/settings/ApnSettings.java | 40 +++++++++++++++++++++++++------
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 697094a..0459a13 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -72,8 +72,12 @@ public class ApnSettings extends SettingsPreferenceFragment implements
     public static final String PREFERRED_APN_URI =
         "content://telephony/carriers/preferapn";
 
+    public static final Uri PREFERRED_MSIM_APN_URI =
+            Uri.parse("content://telephony/carriers/preferapn/subIdImsi");
+
     public static final String APN_ID = "apn_id";
     public static final String SUB_ID = "sub_id";
+    public static final String EXTRA_IMSI = "imsi";
     public static final String MVNO_TYPE = "mvno_type";
     public static final String MVNO_MATCH_DATA = "mvno_match_data";
 
@@ -117,6 +121,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements
     private boolean mHideImsApn;
     private boolean mAllowAddingApns;
 
+    private String mImsi;
+
     private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -157,6 +163,11 @@ public class ApnSettings extends SettingsPreferenceFragment implements
         final int subId = activity.getIntent().getIntExtra(SUB_ID,
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
+        mImsi = activity.getIntent().getStringExtra(EXTRA_IMSI);
+        if (mImsi == null) {
+            mImsi = "";
+        }
+
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
         mMobileStateFilter = new IntentFilter(
@@ -408,19 +419,34 @@ public class ApnSettings extends SettingsPreferenceFragment implements
 
         ContentValues values = new ContentValues();
         values.put(APN_ID, mSelectedKey);
-        resolver.update(PREFERAPN_URI, values, null, null);
+        if (TelephonyManager.getDefault().getPhoneCount() > 1) {
+            Uri qUri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI,
+                    String.valueOf(mSubscriptionInfo.getSubscriptionId()));
+            qUri = Uri.withAppendedPath(qUri, mImsi);
+            resolver.update(qUri, values, null, null);
+        } else {
+            resolver.update(PREFERAPN_URI, values, null, null);
+        }
     }
 
     private String getSelectedApnKey() {
         String key = null;
 
-        Cursor cursor = getContentResolver().query(PREFERAPN_URI, new String[] {"_id"},
-                null, null, Telephony.Carriers.DEFAULT_SORT_ORDER);
-        if (cursor.getCount() > 0) {
-            cursor.moveToFirst();
-            key = cursor.getString(ID_INDEX);
+        Uri uri;
+        if (TelephonyManager.getDefault().getPhoneCount() > 1) {
+            uri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI,
+                    String.valueOf(mSubscriptionInfo.getSubscriptionId()));
+            uri = Uri.withAppendedPath(uri, mImsi);
+        } else {
+            uri = PREFERAPN_URI;
+        }
+        try (Cursor cursor = getContentResolver().query(uri, new String[] {"_id"},
+                null, null, Telephony.Carriers.DEFAULT_SORT_ORDER)) {
+            if (cursor != null && cursor.getCount() > 0) {
+                cursor.moveToFirst();
+                key = cursor.getString(ID_INDEX);
+            }
         }
-        cursor.close();
         return key;
     }
 
-- 
cgit v1.1


From d5c496cb7a2134316bb91424093947920f2512e7 Mon Sep 17 00:00:00 2001
From: Artem Shvadskiy <ashvadskiy@cyngn.com>
Date: Fri, 3 Jun 2016 14:19:45 -0700
Subject: Use child fragment manager for nested dialog fragment

Change-Id: I7748b15f45c88b00bc1251121d6760cf16e25646
issue-id: CYNGNOS-2911
---
 .../settings/blacklist/EntryEditDialogFragment.java  | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/com/android/settings/blacklist/EntryEditDialogFragment.java b/src/com/android/settings/blacklist/EntryEditDialogFragment.java
index 6a387bc..57797b9 100644
--- a/src/com/android/settings/blacklist/EntryEditDialogFragment.java
+++ b/src/com/android/settings/blacklist/EntryEditDialogFragment.java
@@ -20,6 +20,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
+import android.app.FragmentManager;
 import android.content.ContentUris;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -73,6 +74,8 @@ public class EntryEditDialogFragment extends DialogFragment
     private static final String STATE_MESSAGE = "message";
     private static final String STATE_EDIT_ENABLED = "edit_enabled";
 
+    private static final String DELETE_CONFIRM_FRAGMENT_TAG = "delete_confirm";
+
     public static EntryEditDialogFragment newInstance(long id) {
         Bundle args = new Bundle();
         args.putLong("id", id);
@@ -114,9 +117,11 @@ public class EntryEditDialogFragment extends DialogFragment
         neutralButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                EntryEditDialogFragment parent = EntryEditDialogFragment.this;
-                DialogFragment confirm = DeleteConfirmationFragment.newInstance(parent);
-                confirm.show(getFragmentManager(), "delete_confirm");
+                FragmentManager fragMan = getChildFragmentManager();
+                if (fragMan.findFragmentByTag(DELETE_CONFIRM_FRAGMENT_TAG) == null) {
+                    DeleteConfirmationFragment.newInstance()
+                            .show(fragMan, DELETE_CONFIRM_FRAGMENT_TAG);
+                }
             }
         });
 
@@ -297,10 +302,9 @@ public class EntryEditDialogFragment extends DialogFragment
             implements DialogInterface.OnClickListener {
         public DeleteConfirmationFragment() {
         }
-        public static DialogFragment newInstance(EntryEditDialogFragment parent) {
-            DialogFragment fragment = new DeleteConfirmationFragment();
-            fragment.setTargetFragment(parent, 0);
-            return fragment;
+
+        public static DialogFragment newInstance() {
+            return new DeleteConfirmationFragment();
         }
 
         @Override
@@ -317,7 +321,7 @@ public class EntryEditDialogFragment extends DialogFragment
 
         @Override
         public void onClick(DialogInterface dialog, int which) {
-            EntryEditDialogFragment parent = (EntryEditDialogFragment) getTargetFragment();
+            EntryEditDialogFragment parent = (EntryEditDialogFragment) getParentFragment();
             parent.onDeleteConfirmResult(which == DialogInterface.BUTTON_POSITIVE);
         }
     }
-- 
cgit v1.1


From e6790767f7db7db09e1c6936b217c35264c18247 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Mon, 6 Jun 2016 09:45:48 -0700
Subject: Keyguard: Get your weather on... the lock screen [3/3]

Change-Id: I9b411c86ea02dd95379fe6fcd1814c81c1c7ef0b
---
 res/values/cm_strings.xml              | 2 ++
 res/xml/security_settings_chooser.xml  | 5 +++++
 res/xml/security_settings_password.xml | 5 +++++
 res/xml/security_settings_pattern.xml  | 5 +++++
 res/xml/security_settings_pin.xml      | 5 +++++
 5 files changed, 22 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a0e811b..e111154 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1216,6 +1216,8 @@
 
     <!-- title for lock screen blur preference -->
     <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
+    <!-- title for lock screen weather preference -->
+    <string name="lockscreen_weather_enabled_title">Show weather</string>
 
     <!-- Per app controls for LP keyguard notifications -->
     <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index cad2534..0f8a9bc 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -56,6 +56,11 @@
             android:title="@string/lockscreen_blur_enabled_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index f926378..cecb26d 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -82,6 +82,11 @@
             android:title="@string/lockscreen_blur_enabled_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index 1e04839..a4d77d5 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -98,6 +98,11 @@
             android:title="@string/lockscreen_blur_enabled_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index c5d849d..869c16b 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -87,6 +87,11 @@
             android:title="@string/lockscreen_blur_enabled_title"
             android:defaultValue="true"/>
 
+        <com.android.settings.cyanogenmod.CMSecureSettingSwitchPreference
+            android:key="lock_screen_weather_enabled"
+            android:title="@string/lockscreen_weather_enabled_title"
+            android:defaultValue="false"/>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
-- 
cgit v1.1


From dc7a181d25860be8f0a96c5542f368540636d51b Mon Sep 17 00:00:00 2001
From: Roman Royer <romanroyer@yahoo.com>
Date: Wed, 4 May 2016 19:04:36 -0700
Subject: Settings: Allow sorting Applications by size

Allow sorting applications by size in Settings->Apps just like in Settings->Storage/USB->Apps
Removed extra whitespace

Change-Id: I9e022162110e1feff20f257992086e66735e0f5e
---
 src/com/android/settings/applications/ManageApplications.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 668f381..ba93038 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -539,9 +539,11 @@ public class ManageApplications extends InstrumentedFragment
         }
         mOptionsMenu.findItem(R.id.advanced).setVisible(mListType == LIST_TYPE_MAIN);
 
-        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(mListType == LIST_TYPE_STORAGE
+        mOptionsMenu.findItem(R.id.sort_order_alpha).setVisible(
+                (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
                 && mSortOrder != R.id.sort_order_alpha);
-        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(mListType == LIST_TYPE_STORAGE
+        mOptionsMenu.findItem(R.id.sort_order_size).setVisible(
+                (mListType == LIST_TYPE_STORAGE || mListType == LIST_TYPE_MAIN)
                 && mSortOrder != R.id.sort_order_size);
 
         mOptionsMenu.findItem(R.id.show_system).setVisible(!mShowSystem
-- 
cgit v1.1


From 7e96664a155363aef390e239d518e0bcd2c6ab4d Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Thu, 9 Jun 2016 14:50:57 -0700
Subject: Automatic translation import

Change-Id: I66b9ba2d1c8c4d52b55208b1e3042f52aa9173bb
---
 res/values-bg/cm_strings.xml     | 13 +++++++++++++
 res/values-ca/cm_strings.xml     | 13 +++++++++++++
 res/values-de/cm_strings.xml     | 13 +++++++++++++
 res/values-es/cm_strings.xml     | 13 +++++++++++++
 res/values-fi/cm_strings.xml     | 13 +++++++++++++
 res/values-it/cm_strings.xml     | 13 +++++++++++++
 res/values-iw/cm_strings.xml     |  4 ++++
 res/values-pt-rBR/cm_strings.xml | 13 +++++++++++++
 res/values-sr/cm_strings.xml     |  2 +-
 9 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 9e5f859..abc15ba 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Забрани постоянна нотификация при заключен екран</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никога не показвай постоянни нотификации от това приложение при заключен екран</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Подобрен радио контрол</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Изключване на автоматичното зареждане MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Включване на автоматичното зареждане MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Изключване на VoLTE dbg</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Включване на VoLTE dbg</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Изклячване на VT dbg</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Включване на VT dbg</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Изклячване на WFC dbg</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Включване на WFC dbg</string>
+  <string name="cm_radio_info_adb_log_on_label">Изключване на ADB радио лог</string>
+  <string name="cm_radio_info_adb_log_off_label">Включване на ADB радио лог</string>
+  <string name="cm_radio_info_diag_log_on_label">Изключване не Diag log</string>
+  <string name="cm_radio_info_diag_log_off_label">Включване на Diag log</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 38a2099..fd221e1 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Deshabilita les notificacions persistents a la pantalla de bloqueig</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostris mai notificacions persistents d\'aquesta aplicació a la pantalla de bloqueig</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Control millorat de la ràdio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desactiva la càrrega automàtica del MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Activa la càrrega automàtica del MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactiva el depurador de VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activa el depurador de VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactiva el depurador de VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activa el depurador de VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactiva el depurador de WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activa el depurador de WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desactiva el registre ADB de la ràdio</string>
+  <string name="cm_radio_info_adb_log_off_label">Activa el registre ADB de la ràdio</string>
+  <string name="cm_radio_info_diag_log_on_label">Desactiva el registre Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Activa el registre Diag</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index f0c5ec7..ce2a027 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhafte Benachrichtigungen auf dem Sperrbildschirm deaktivieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Keine dauerhaften Benachrichtigungen dieser App auf dem Sperrbildschirm anzeigen</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Erweiterte Modemfunktionen</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">MBN-Autoladen ausschalten</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">MBN-Autoladen einschalten</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">VoLTE-Debugging ausschalten</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">VoLTE-Debugging einschalten</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">VT-Debugging ausschalten</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">VT-Debugging einschalten</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">WFC-Debugging ausschalten</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">WFC-Debugging einschalten</string>
+  <string name="cm_radio_info_adb_log_on_label">ADB-Modemprotokoll ausschalten</string>
+  <string name="cm_radio_info_adb_log_off_label">ADB-Modemprotokoll einschalten</string>
+  <string name="cm_radio_info_diag_log_on_label">Diagnoseprotokoll ausschalten</string>
+  <string name="cm_radio_info_diag_log_off_label">Diagnoseprotokoll einschalten</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 1f785c8..eab99a2 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla de bloqueo</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Control avanzado de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar la carga automática del MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Activar la carga automática del MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactivar el depurador de VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activar el depurador de VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar el depurador de VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar el depurador de VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar el depurador de WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar el depurador de WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desactivar el registro en ADB de la radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Activar el registro en ADB de la radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Activar el registro Diag</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index b49a4cc..6dcb5ae 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Älä näytä pysyviä ilmoituksia lukitusnäytöllä</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Älä koskaan näytä pysyviä ilmoituksia tästä sovelluksesta lukitusnäytöllä</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Parannettu radion ohjaus</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Poista MBN auto load käytöstä</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Ota MBN auto load käyttöön</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Poista VoLTE dbg käytöstä</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Ota VoLTE dbg käyttöön</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Poista VT dbg käytöstä</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Ota VT dbg käyttöön</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Poista WFC dbg käytöstä</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ota WFC dbg käyttöön</string>
+  <string name="cm_radio_info_adb_log_on_label">Poista ADB radio log käytöstä</string>
+  <string name="cm_radio_info_adb_log_off_label">Ota ADB radio log käyttöön</string>
+  <string name="cm_radio_info_diag_log_on_label">Poista Diag log käytöstä</string>
+  <string name="cm_radio_info_diag_log_off_label">Ota Diag log käyttöön</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 8653182..f9aed1f 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1050,5 +1050,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nella schermata di blocco</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nella schermata di blocco</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Controlli radio avanzati</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Disattiva caricamento MBN automatico</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Attiva caricamento MBN automatico</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Disattiva dbg VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Attiva dbg VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Disattiva dbg VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Attiva dbg VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Disattiva dbg WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Attiva dbg WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Disattiva log radio ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Attiva log radio ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Disattiva log Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Attiva log Diag</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 6347600..c76b386 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1043,11 +1043,15 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ספקי סלולר</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">טשטוש מסך נעילה</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">הצג על מסך הנעילה</string>
   <string name="app_notification_show_on_keyguard_summary">הצג הודעות מיישום זה במסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">השבתת התראות תמידיות על מסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">אל תציג התראות תמידיות מיישום זה על מסך הנעילה</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">שליטת רדיו משופרת</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">כיבוי טעינת MBN אוטומטית</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">הפעלת טעינת MBN אוטומטית</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 34f216b..b8470ea 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1048,5 +1048,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar notificação persistente na tela de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar notificações persistentes deste aplicativo na tela de bloqueio</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Controle avançado do rádio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desligar o carregamento automático MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Ligar o carregamento automático MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desligar o depurador VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Ligar o depurador VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desligar o depurador VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Ligar o depurador VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desligar o depurador WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ligar o depurador WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desligar os registros de rádio ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Desligar os registros de rádio ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Desligar os registros de Diagnóstico</string>
+  <string name="cm_radio_info_diag_log_off_label">Ligar os registros de Diagnóstico</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 603e670..347fe9a 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -337,7 +337,7 @@
   <string name="app_ops_summaries_notification_volume">јачина обавештења</string>
   <string name="app_ops_summaries_bluetooth_volume">Јачина bluetooth-а</string>
   <string name="app_ops_summaries_keep_awake">остани будан</string>
-  <string name="app_ops_summaries_monitor_location">локација монитора</string>
+  <string name="app_ops_summaries_monitor_location">праћење локације</string>
   <string name="app_ops_summaries_monitor_high_power_location">високо напајање локације монитора</string>
   <string name="app_ops_summaries_get_usage_stats">добиј статистику коришћења</string>
   <string name="app_ops_summaries_mute_unmute_microphone">укључи/искључи микрофон</string>
-- 
cgit v1.1


From 99ef9dc0b9a7db441ab643f27faf34503dcd4933 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Fri, 10 Jun 2016 18:38:17 +0300
Subject: String improvements

Change-Id: I36662b94a4f2f020c756446b7b2a039eb451fd62
---
 res/values/cm_strings.xml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e111154..386d090 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1215,7 +1215,7 @@
     <string name="shortcut_carrier_title">Network operators</string>
 
     <!-- title for lock screen blur preference -->
-    <string name="lockscreen_blur_enabled_title">Lock screen blur</string>
+    <string name="lockscreen_blur_enabled_title">Blur background</string>
     <!-- title for lock screen weather preference -->
     <string name="lockscreen_weather_enabled_title">Show weather</string>
 
@@ -1231,12 +1231,12 @@
     <!-- Radio Control (IMS/MBN etc.) -->
     <string name="cm_radio_info_mbn_auto_load_on_label">Turn off MBN auto load</string>
     <string name="cm_radio_info_mbn_auto_load_off_label">Turn on MBN auto load</string>
-    <string name="cm_radio_info_volte_avail_ovr_on_label">Turn off VoLTE dbg</string>
-    <string name="cm_radio_info_volte_avail_ovr_off_label">Turn on VoLTE dbg</string>
-    <string name="cm_radio_info_vt_avail_ovr_on_label">Turn off VT dbg</string>
-    <string name="cm_radio_info_vt_avail_ovr_off_label">Turn on VT dbg</string>
-    <string name="cm_radio_info_wfc_avail_ovr_on_label">Turn off WFC dbg</string>
-    <string name="cm_radio_info_wfc_avail_ovr_off_label">Turn on WFC dbg</string>
+    <string name="cm_radio_info_volte_avail_ovr_on_label">Turn off VoLTE debug</string>
+    <string name="cm_radio_info_volte_avail_ovr_off_label">Turn on VoLTE debug</string>
+    <string name="cm_radio_info_vt_avail_ovr_on_label">Turn off VT debug</string>
+    <string name="cm_radio_info_vt_avail_ovr_off_label">Turn on VT debug</string>
+    <string name="cm_radio_info_wfc_avail_ovr_on_label">Turn off WFC debug</string>
+    <string name="cm_radio_info_wfc_avail_ovr_off_label">Turn on WFC debug</string>
     <string name="cm_radio_info_adb_log_on_label">Turn off ADB radio log</string>
     <string name="cm_radio_info_adb_log_off_label">Turn on ADB radio log</string>
     <string name="cm_radio_info_diag_log_on_label">Turn off Diag log</string>
-- 
cgit v1.1


From 2813862d85c3fa624e869b1bd1af969a5ab8e52e Mon Sep 17 00:00:00 2001
From: Ankit Gupta <agupta@cyngn.com>
Date: Tue, 7 Jun 2016 16:11:40 -0700
Subject: Settings: fix crash when reset App preference

1. mExtraInfoBridge is null when there is no change
made in any app. Calling reset app preference cause
crash in this state.

2. move initialization of mApplication to onViewCreated
from onCreateView to make sure View has been created.

Issue-id: OPO-760

Change-Id: I7a26b27325b54694d2513e8365482c221a5c6b13
---
 .../settings/applications/ManageApplications.java  | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index ba93038..5902fc2 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -303,13 +303,6 @@ public class ManageApplications extends InstrumentedFragment
             lv.setItemsCanFocus(true);
             lv.setTextFilterEnabled(true);
             mListView = lv;
-            mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter);
-            if (savedInstanceState != null) {
-                mApplications.mHasReceivedLoadEntries =
-                        savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
-            }
-            mListView.setAdapter(mApplications);
-            mListView.setRecyclerListener(mApplications);
 
             Utils.prepareCustomPreferencesList(container, mRootView, mListView, false);
         }
@@ -320,8 +313,6 @@ public class ManageApplications extends InstrumentedFragment
             ((PreferenceFrameLayout.LayoutParams) mRootView.getLayoutParams()).removeBorders = true;
         }
 
-        createHeader();
-
         mResetAppsHelper.onRestoreInstanceState(savedInstanceState);
 
         return mRootView;
@@ -366,6 +357,14 @@ public class ManageApplications extends InstrumentedFragment
             FrameLayout pinnedHeader = (FrameLayout) mRootView.findViewById(R.id.pinned_header);
             AppHeader.createAppHeader(getActivity(), null, mVolumeName, null, pinnedHeader);
         }
+        mApplications = new ApplicationsAdapter(mApplicationsState, this, mFilter);
+        if (savedInstanceState != null) {
+            mApplications.mHasReceivedLoadEntries =
+                    savedInstanceState.getBoolean(EXTRA_HAS_ENTRIES, false);
+        }
+        mListView.setAdapter(mApplications);
+        mListView.setRecyclerListener(mApplications);
+        createHeader();
     }
 
     private int getDefaultFilter() {
@@ -623,7 +622,10 @@ public class ManageApplications extends InstrumentedFragment
 
     @Override
     public void onResetCompleted() {
-        mApplications.mExtraInfoBridge.onPackageListChanged();
+        /* mExtraInfoBridge can be null when doing reset app preference without
+         * any changes on apps */
+        if (mApplications.mExtraInfoBridge != null)
+            mApplications.mExtraInfoBridge.onPackageListChanged();
     }
 
     static class FilterSpinnerAdapter extends ArrayAdapter<CharSequence> {
-- 
cgit v1.1


From 6c6d0e68be18a61d20ead5a01297425839118f8c Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Tue, 14 Jun 2016 09:44:34 -0700
Subject: Settings: Remove hide navigation bar settings

Remove hide navigation bar settings in Expanded
desktop if the device has no on-screen navigation
bar currently available.

FEIJ-1194

Change-Id: I4d0a5cc453a13140236f5e2e9f39e970fe759607
---
 .../settings/applications/ExpandedDesktopExtraPrefs.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/applications/ExpandedDesktopExtraPrefs.java b/src/com/android/settings/applications/ExpandedDesktopExtraPrefs.java
index f709a98..f729aa3 100644
--- a/src/com/android/settings/applications/ExpandedDesktopExtraPrefs.java
+++ b/src/com/android/settings/applications/ExpandedDesktopExtraPrefs.java
@@ -23,10 +23,12 @@ import android.net.Uri;
 import android.os.Bundle;
 
 import android.os.Handler;
+import android.os.RemoteException;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.provider.Settings;
 import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
 import android.view.WindowManagerPolicyControl;
 
 import com.android.internal.logging.MetricsLogger;
@@ -55,9 +57,17 @@ public class ExpandedDesktopExtraPrefs extends SettingsPreferenceFragment
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        addPreferencesFromResource(R.xml.expanded_desktop_prefs);
-        mExpandedDesktopStyle = getExpandedDesktopStyle();
-        createPreferences();
+        boolean hasNavigationBar = true;
+        try {
+            hasNavigationBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar();
+        } catch (RemoteException e) {
+            // Do nothing
+        }
+        if (hasNavigationBar) {
+            addPreferencesFromResource(R.xml.expanded_desktop_prefs);
+            mExpandedDesktopStyle = getExpandedDesktopStyle();
+            createPreferences();
+        }
     }
 
     @Override
-- 
cgit v1.1


From be7d45fd0d063cff25f186a7ca45fa485ebdf048 Mon Sep 17 00:00:00 2001
From: Adnan Begovic <adnan@cyngn.com>
Date: Fri, 20 May 2016 12:28:25 -0700
Subject: Settings: Dissallow privacy guarding system apps on overlay.

  Bandaid fix for google play services inundating the permission
  dialog request queue within AppOps service and causing watchdog
  to consistently kill the system server's activity manager service
  which is deadlocked retrieving dialogs from the queue.

Change-Id: I10c432cebe6a4199517839598046eee7d19dcf72
TICKET: CYNGNOS-2869
---
 res/values/config.xml                                         |  3 +++
 src/com/android/settings/applications/AppOpsSummary.java      | 10 ++++++++--
 .../android/settings/privacyguard/PrivacyGuardManager.java    | 11 ++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index b036b89..259927a 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -122,4 +122,7 @@
 
     <!-- When true, weather options will be displayed in settings dashboard -->
     <bool name="config_showWeatherMenu">true</bool>
+
+    <!-- When true, "show built-in" option in Privacy Guard will be available -->
+    <bool name="config_showBuiltInAppsForPG">true</bool>
 </resources>
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index be153de..31641e2 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -26,6 +26,7 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.PreferenceFrameLayout;
 import android.support.v13.app.FragmentPagerAdapter;
@@ -186,7 +187,8 @@ public class AppOpsSummary extends InstrumentedFragment {
     }
 
     private boolean shouldShowSystemApps() {
-        return mPreferences.getBoolean("show_system_apps", true);
+        return mPreferences.getBoolean("show_system_apps", true) &&
+                mActivity.getResources().getBoolean(R.bool.config_showBuiltInAppsForPG);
     }
 
     @Override
@@ -204,7 +206,11 @@ public class AppOpsSummary extends InstrumentedFragment {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.appops_manager, menu);
         menu.findItem(R.id.show_user_apps).setChecked(shouldShowUserApps());
-        menu.findItem(R.id.show_system_apps).setChecked(shouldShowSystemApps());
+        if (!mActivity.getResources().getBoolean(R.bool.config_showBuiltInAppsForPG)) {
+            menu.removeItem(R.id.show_system_apps);
+        } else {
+            menu.findItem(R.id.show_system_apps).setChecked(shouldShowSystemApps());
+        }
     }
 
     private void resetCounters() {
diff --git a/src/com/android/settings/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
index adbe8cc..c2f485a 100644
--- a/src/com/android/settings/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/privacyguard/PrivacyGuardManager.java
@@ -17,6 +17,7 @@
 package com.android.settings.privacyguard;
 
 import android.app.FragmentTransaction;
+import android.os.Build;
 import android.view.animation.AnimationUtils;
 import android.app.Activity;
 import android.app.AlertDialog;
@@ -297,9 +298,9 @@ public class PrivacyGuardManager extends Fragment
         return true;
     }
 
-
     private boolean shouldShowSystemApps() {
-        return mPreferences.getBoolean("show_system_apps", false);
+        return mPreferences.getBoolean("show_system_apps", true) &&
+                mActivity.getResources().getBoolean(R.bool.config_showBuiltInAppsForPG);
     }
 
     public static class HelpDialogFragment extends DialogFragment {
@@ -372,7 +373,11 @@ public class PrivacyGuardManager extends Fragment
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.privacy_guard_manager, menu);
-        menu.findItem(R.id.show_system_apps).setChecked(shouldShowSystemApps());
+        if (!mActivity.getResources().getBoolean(R.bool.config_showBuiltInAppsForPG)) {
+            menu.removeItem(R.id.show_system_apps);
+        } else {
+            menu.findItem(R.id.show_system_apps).setChecked(shouldShowSystemApps());
+        }
     }
 
     @Override
-- 
cgit v1.1


From a700fff80a3dd3c175603fea1d95c5f2a54a7d2a Mon Sep 17 00:00:00 2001
From: Scott Mertz <scott@cyngn.com>
Date: Mon, 13 Jun 2016 15:52:18 -0700
Subject: Settings: Apply decor padding in landscape storage wizard

The header was appearing below the status bar when in landscape
mode.  Add a padding in landscape so the text appears below the
status bar.

FEIJ-1157
Change-Id: I4d3c46958442b517186cc7d796bdd1552c0bdffe
---
 res/values-land/dimens.xml | 2 ++
 res/values/dimens.xml      | 2 ++
 res/values/styles.xml      | 1 +
 3 files changed, 5 insertions(+)

diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index d15c254..bfdebc9 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -48,4 +48,6 @@
     <!-- Fingerprint -->
     <item name="fingerprint_illustration_aspect_ratio" format="float" type="dimen">0.0</item>
     <dimen name="fingerprint_decor_padding_top">24dp</dimen>
+
+    <dimen name="storage_decor_padding_top">24dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 67d77b6..f94131c 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -269,4 +269,6 @@
     <dimen name="fab_icon_size">24dp</dimen>
     <dimen name="fab_elevation_normal">8dp</dimen>
     <dimen name="fab_elevation_pressed">6dp</dimen>
+
+    <dimen name="storage_decor_padding_top">0dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index a3581f2..dfff31f 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -356,6 +356,7 @@
 
     <style name="SetupWizardStorageStyle" parent="@style/SuwThemeMaterial.Light">
         <item name="android:colorAccent">#ff009688</item>
+        <item name="suwDecorPaddingTop">@dimen/storage_decor_padding_top</item>
     </style>
 
     <style name="ProfilesPreferenceStyle">
-- 
cgit v1.1


From 693ea85e11209f943bb3989f44cc44db33958c75 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Fri, 17 Jun 2016 14:02:01 -0700
Subject: Automatic translation import

Change-Id: I553fea6885f7da29740630a236f986a6b1a135fe
---
 res/values-af/cm_strings.xml      |   2 +
 res/values-am/cm_strings.xml      |   1 +
 res/values-ar/cm_strings.xml      |   2 +
 res/values-as-rIN/cm_strings.xml  |   2 +
 res/values-ast-rES/arrays.xml     |  43 ++++++++-----
 res/values-ast-rES/cm_strings.xml | 108 ++++++++++++++++++++++++++++++++
 res/values-ast-rES/strings.xml    | 128 ++++++++++++++++++++++++++++++++++++++
 res/values-az-rAZ/cm_strings.xml  |   1 +
 res/values-be/cm_strings.xml      |   2 +
 res/values-bg/cm_strings.xml      |  16 ++---
 res/values-bn-rBD/cm_strings.xml  |   1 +
 res/values-br-rFR/cm_strings.xml  |   1 +
 res/values-ca/cm_strings.xml      |  16 ++---
 res/values-cs/cm_strings.xml      |  17 ++++-
 res/values-csb-rPL/cm_strings.xml |   1 +
 res/values-cy/cm_strings.xml      |   1 +
 res/values-da/cm_strings.xml      |   2 +
 res/values-de/cm_strings.xml      |   3 +-
 res/values-el/cm_strings.xml      |   4 +-
 res/values-en-rAU/cm_strings.xml  |   2 +
 res/values-en-rGB/cm_strings.xml  |   1 +
 res/values-en-rIN/cm_strings.xml  |   2 +
 res/values-en-rPT/cm_strings.xml  |   1 +
 res/values-eo/cm_strings.xml      |   2 +
 res/values-es-rMX/cm_strings.xml  |   1 +
 res/values-es-rUS/cm_strings.xml  |   3 +-
 res/values-es/cm_strings.xml      |   9 +--
 res/values-et-rEE/cm_strings.xml  |   2 +
 res/values-eu-rES/cm_strings.xml  |  17 ++++-
 res/values-fa/cm_strings.xml      |   2 +
 res/values-fi/cm_strings.xml      |  16 ++---
 res/values-fil-rPH/cm_strings.xml |   1 +
 res/values-fr-rCA/cm_strings.xml  |   1 +
 res/values-fr/cm_strings.xml      |   3 +-
 res/values-frp-rIT/cm_strings.xml |   1 +
 res/values-fy-rNL/cm_strings.xml  |   1 +
 res/values-gd-rGB/cm_strings.xml  |   1 +
 res/values-gl-rES/cm_strings.xml  |   1 +
 res/values-gu-rIN/cm_strings.xml  |   2 +
 res/values-hi/cm_strings.xml      |   2 +
 res/values-hr/cm_strings.xml      |  17 ++++-
 res/values-hu/cm_strings.xml      |   2 +
 res/values-hy-rAM/cm_strings.xml  |   1 +
 res/values-in/cm_strings.xml      |   2 +
 res/values-is-rIS/cm_strings.xml  |   1 +
 res/values-it/cm_strings.xml      |  18 +++---
 res/values-iw/cm_strings.xml      |   3 +-
 res/values-ja/cm_strings.xml      |   3 +-
 res/values-ka-rGE/cm_strings.xml  |   1 +
 res/values-kk-rKZ/cm_strings.xml  |   1 +
 res/values-km-rKH/cm_strings.xml  |   1 +
 res/values-kn-rIN/cm_strings.xml  |   2 +
 res/values-ko/cm_strings.xml      |   2 +
 res/values-ku/cm_strings.xml      |   2 +
 res/values-ky-rKG/cm_strings.xml  |   1 +
 res/values-lb/cm_strings.xml      |   2 +
 res/values-lo-rLA/cm_strings.xml  |   1 +
 res/values-lt/cm_strings.xml      |   2 +
 res/values-lv/cm_strings.xml      |   1 +
 res/values-mk-rMK/cm_strings.xml  |   1 +
 res/values-ml-rIN/cm_strings.xml  |   2 +
 res/values-mn-rMN/cm_strings.xml  |   1 +
 res/values-mr-rIN/cm_strings.xml  |   2 +
 res/values-ms-rMY/cm_strings.xml  |   1 +
 res/values-my-rMM/cm_strings.xml  |   1 +
 res/values-nb/cm_strings.xml      |   3 +-
 res/values-ne-rNP/cm_strings.xml  |   1 +
 res/values-nl/cm_strings.xml      |   2 +
 res/values-oc-rFR/cm_strings.xml  |   1 +
 res/values-or-rIN/cm_strings.xml  |   2 +
 res/values-pa-rIN/cm_strings.xml  |   1 +
 res/values-pl/cm_strings.xml      |   3 +-
 res/values-pt-rBR/cm_strings.xml  |   4 +-
 res/values-pt-rPT/cm_strings.xml  |  37 +++++++----
 res/values-rm/cm_strings.xml      |   1 +
 res/values-ro/cm_strings.xml      |   2 +
 res/values-ru/cm_strings.xml      |   3 +-
 res/values-si-rLK/cm_strings.xml  |   1 +
 res/values-sk/cm_strings.xml      |   2 +
 res/values-sl/cm_strings.xml      |  17 ++++-
 res/values-sq-rAL/cm_strings.xml  |   1 +
 res/values-sr/cm_strings.xml      |  21 +++++++
 res/values-sv/cm_strings.xml      |   2 +
 res/values-sw/cm_strings.xml      |   1 +
 res/values-ta-rIN/cm_strings.xml  |   2 +
 res/values-te-rIN/cm_strings.xml  |   2 +
 res/values-th/cm_strings.xml      |   2 +
 res/values-tr/cm_strings.xml      |   2 +
 res/values-ug/cm_strings.xml      |   2 +
 res/values-uk/cm_strings.xml      |   2 +
 res/values-ur-rPK/cm_strings.xml  |   1 +
 res/values-uz-rUZ/cm_strings.xml  |   1 +
 res/values-vi/cm_strings.xml      |   2 +
 res/values-zh-rCN/cm_strings.xml  |  17 ++++-
 res/values-zh-rHK/cm_strings.xml  |   2 +
 res/values-zh-rTW/cm_strings.xml  |   2 +
 res/values-zu/cm_strings.xml      |   1 +
 97 files changed, 560 insertions(+), 76 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 96bd07b..b0eea45 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1013,6 +1013,8 @@
   <string name="weather_settings_general_settings_title">Algemeen</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Wys weer</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Vertoon op slotskerm</string>
   <string name="app_notification_show_on_keyguard_summary">Vertoon kennisgewings vanuit hierdie program op die slotskerm</string>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 732e796..a4e5c41 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1047,6 +1047,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">مشغلات الشبكات</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">إظهار حالة الطقس</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">إظهار على شاشة التأمين</string>
   <string name="app_notification_show_on_keyguard_summary">إظهار إشعارات من هذا التطبيق على شاشة التأمين</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 60e9410..6772321 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1006,6 +1006,8 @@
   <string name="weather_settings_general_settings_title">সাধাৰণ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">বতৰ প্ৰদৰ্শন কৰক</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
   <string name="app_notification_show_on_keyguard_summary">এই এপ্প্‌ৰ পৰা অধিসূচনা লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
diff --git a/res/values-ast-rES/arrays.xml b/res/values-ast-rES/arrays.xml
index 74d8928..3179cdf 100644
--- a/res/values-ast-rES/arrays.xml
+++ b/res/values-ast-rES/arrays.xml
@@ -211,6 +211,13 @@
   </string-array>
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <string-array name="wifi_ap_band_config_full">
+    <item>@string/wifi_ap_choose_2G</item>
+    <item>@string/wifi_ap_choose_5G</item>
+  </string-array>
+  <string-array name="wifi_ap_band_config_2G_only">
+    <item>@string/wifi_ap_choose_2G</item>
+  </string-array>
   <!-- Wi-Fi WPS setup for p2p connections.  -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <string-array name="wifi_p2p_wps_setup">
@@ -452,9 +459,9 @@
     <item>Silenciar/dar volume micrófonu</item>
     <item>Proyeutu Media</item>
     <item>activar VPN</item>
-    <item>write wallpaper</item>
-    <item>assist structure</item>
-    <item>assist screenshot</item>
+    <item>escribir fondu de pantalla</item>
+    <item>encontu a la estructura</item>
+    <item>encontu a la captura de pantalla</item>
   </string-array>
   <!-- User display names for app ops codes -->
   <string-array name="app_ops_labels">
@@ -505,9 +512,9 @@
     <item>Silenciar/dar volume micrófonu</item>
     <item>Proyeutu Media</item>
     <item>Activar VPN</item>
-    <item>Write wallpaper</item>
-    <item>Assist structure</item>
-    <item>Assist screenshot</item>
+    <item>Escribir fondu de pantalla</item>
+    <item>Encontu a la estructura</item>
+    <item>Encontu a la captura de pantalla</item>
   </string-array>
   <!-- Titles for the list of long press timeout options. -->
   <string-array name="long_press_timeout_selector_titles">
@@ -644,16 +651,16 @@
   <string-array name="overlay_display_devices_entries">
     <item>Nenguna</item>
     <item>480p</item>
-    <item>480p (secure)</item>
+    <item>480p (seguru)</item>
     <item>720p</item>
-    <item>720p (secure)</item>
+    <item>720p (seguru)</item>
     <item>1080p</item>
-    <item>1080p (secure)</item>
+    <item>1080p (seguru)</item>
     <item>4K</item>
-    <item>4K (secure)</item>
-    <item>4K (upscaled)</item>
-    <item>4K (upscaled, secure)</item>
-    <item>720p, 1080p (dual screen)</item>
+    <item>4K (seguru)</item>
+    <item>4 K (ameyoráu)</item>
+    <item>4 K (ameyoráu, seguru)</item>
+    <item>720p, 1080p (pantalla doble)</item>
   </string-array>
   <!-- Values for overlay display devices preference. -->
   <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
@@ -745,7 +752,7 @@
     <!-- Memory is critical. -->
     <item>Críticu</item>
     <!-- Unknown memory state -->
-    <item>\?</item>
+    <item>\¿?</item>
   </string-array>
   <!-- Display color space adjustment modes for accessibility -->
   <!-- Values for display color space adjustment modes for accessibility -->
@@ -779,6 +786,14 @@
   <!-- Array of titles for sim color for multi-sim -->
   <!-- USB configuration names for Developer Settings.
          This can be overridden by devices with additional USB configurations. -->
+  <string-array name="usb_configuration_titles">
+    <item>@string/usb_use_charging_only</item>
+    <item>MTP (Protocolu de tresferencia de medios)</item>
+    <item>PTP (Protocolu de tresferencia de semeyes)</item>
+    <item>RNDIS (Ethernet USB)</item>
+    <item>Fonte d\'audiu</item>
+    <item>MIDI</item>
+  </string-array>
   <!-- USB configuration values for Developer Settings.
          These are lists of USB functions passed to the USB Manager to change USB configuraton.
          This can be overridden by devices with additional USB configurations.
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index e99a904..aff4dab 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -161,6 +161,7 @@
   <string name="toggleData">Conexón de datos</string>
   <string name="toggleSync">Sincronización automática</string>
   <string name="toggle2g3g4g">Triba de rede preferida</string>
+  <string name="toggle2g3g4g_msim">Triba de rede preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Códigu de rexón Wi\u2011Fi</string>
@@ -261,10 +262,13 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="notification_light_default_value">Por defeutu</string>
   <string name="notification_light_missed_call_title">Llamada perdida</string>
   <string name="notification_light_voicemail_title">Buzón de voz</string>
+  <string name="notification_light_zen_mode">Lluces nel Mou Nun molestar</string>
   <string name="notification_light_use_multiple_leds">Múltiples LEDs</string>
   <string name="keywords_lights_brightness_level">amatagar el rellumu de los leds</string>
+  <string name="notification_light_automagic">Escoyer colores automáticamente</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Axustes de lluz</string>
+  <string name="led_notification_text">Luz LED activada por axustes</string>
   <string name="notification_light_no_apps_summary">P\'amestar control d\'aplicaciones, activa «%1$s» y primi «\u002b» na barra de menú</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Depuración Android</string>
@@ -298,6 +302,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_summaries_read_calendar">lleer calendariu</string>
   <string name="app_ops_summaries_modify_calendar">modificar calendariu</string>
   <string name="app_ops_summaries_wifi_scan">Escanéu Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notific/not. emerxent</string>
   <string name="app_ops_summaries_cell_scan">guetar redes</string>
   <string name="app_ops_summaries_call_phone">Llamar per teléfonu</string>
   <string name="app_ops_summaries_read_sms">lleer SMS</string>
@@ -325,15 +330,39 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_summaries_media_volume">volume de multimedia</string>
   <string name="app_ops_summaries_alarm_volume">volume d\'alarma</string>
   <string name="app_ops_summaries_notification_volume">volume de notificación</string>
+  <string name="app_ops_summaries_bluetooth_volume">volume de bluetooth</string>
   <string name="app_ops_summaries_keep_awake">caltener encesu</string>
   <string name="app_ops_summaries_monitor_location">monitorizar llocalización</string>
   <string name="app_ops_summaries_monitor_high_power_location">monitorizar llocalización n\'alta precisión</string>
+  <string name="app_ops_summaries_get_usage_stats">consiguir estadístiques d\'usu</string>
   <string name="app_ops_summaries_mute_unmute_microphone">activar/desactivar el micrófonu</string>
   <string name="app_ops_summaries_toast_window">amosar notificaciones emerxentes</string>
   <string name="app_ops_summaries_project_media">proyeutar conteníu multimedia</string>
   <string name="app_ops_summaries_activate_vpn">activar VPN</string>
+  <string name="app_ops_summaries_write_wallpaper">escribir fondu de pantalla</string>
+  <string name="app_ops_summaries_assist_structure">encontu a la estructura</string>
+  <string name="app_ops_summaries_assist_screenshot">encontu a captura pantalla</string>
+  <string name="app_ops_summaries_read_phone_state">lleer estáu del teléfonu</string>
+  <string name="app_ops_summaries_add_voicemail">amestar buzón de voz</string>
+  <string name="app_ops_summaries_use_sip">usar SIP</string>
+  <string name="app_ops_summaries_make_call">facer llamada</string>
+  <string name="app_ops_summaries_use_fingerprint">usar buelga</string>
+  <string name="app_ops_summaries_use_body_sensors">usar sensores corporales</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">lleer tresmisiones celulares</string>
+  <string name="app_ops_summaries_mock_location">llocalización falsa</string>
+  <string name="app_ops_summaries_read_external_storage">lleer almacenamientu esternu</string>
+  <string name="app_ops_summaries_write_external_storage">escribir al almacenamientu esternu</string>
+  <string name="app_ops_summaries_turn_screen_on">prender pantalla</string>
+  <string name="app_ops_summaries_get_accounts">consiguir cuentes</string>
+  <string name="app_ops_summaries_toggle_wifi">alternar Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">alternar bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">aniciar nel arranque</string>
+  <string name="app_ops_summaries_toggle_nfc">alternar NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">alternar datos móviles</string>
   <string name="app_ops_summaries_superuser">accesu alministrativu</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">Llocalización aproximada</string>
+  <string name="app_ops_labels_fine_location">Llocalización fina</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">Vibrar</string>
   <string name="app_ops_labels_read_contacts">Lleer contautos</string>
@@ -342,11 +371,19 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_labels_modify_call_log">Modificar rexistru de llamaes</string>
   <string name="app_ops_labels_read_calendar">Lleer calendariu</string>
   <string name="app_ops_labels_modify_calendar">Modificar calendariu</string>
+  <string name="app_ops_labels_wifi_scan">Escanear Wi-Fi</string>
   <string name="app_ops_labels_notification">Notificación/Mensaxe</string>
+  <string name="app_ops_labels_cell_scan">Escanéu de rede móvil</string>
   <string name="app_ops_labels_call_phone">Llamar</string>
+  <string name="app_ops_labels_read_sms">Lleer SMS</string>
+  <string name="app_ops_labels_write_sms">Escribir SMS</string>
   <string name="app_ops_labels_receive_sms">Recibir SMS</string>
+  <string name="app_ops_labels_receive_emergency_sms">Recibir mensaxes d\'emerxencia SMS</string>
   <string name="app_ops_labels_receive_mms">Recibir MMS</string>
+  <string name="app_ops_labels_receive_wap_push">Recibir mensaxes WAP</string>
   <string name="app_ops_labels_send_sms">Unviar SMS</string>
+  <string name="app_ops_labels_read_icc_sms">Lleer mensaxes ICC</string>
+  <string name="app_ops_labels_write_icc_sms">Escribir mensaxes ICC</string>
   <string name="app_ops_labels_modify_settings">Modificar axustes</string>
   <string name="app_ops_labels_draw_on_top">Amosar encima</string>
   <string name="app_ops_labels_access_notifications">Accesu a notificaciones</string>
@@ -365,19 +402,33 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_labels_notification_volume">Volume de notificación</string>
   <string name="app_ops_labels_bluetooth_volume">Volume de Bluetooth</string>
   <string name="app_ops_labels_keep_awake">Caltener encesu</string>
+  <string name="app_ops_labels_monitor_location">Monitorear llocalización</string>
+  <string name="app_ops_labels_monitor_high_power_location">Monitorear llocalización fina</string>
+  <string name="app_ops_labels_get_usage_stats">Obtener estadístiques d\'usu</string>
   <string name="app_ops_labels_mute_unmute_microphone">Silenciar/nun silenciar micrófonu</string>
   <string name="app_ops_labels_toast_window">Amosar notificaciones emerxentes</string>
   <string name="app_ops_labels_project_media">Proyeutu Media</string>
   <string name="app_ops_labels_activate_vpn">Activar VPN</string>
+  <string name="app_ops_labels_write_wallpaper">Escribir fondu de pantalla</string>
+  <string name="app_ops_labels_assist_structure">Encontu d\'estructura</string>
+  <string name="app_ops_labels_assist_screenshot">encontu a captura pantalla</string>
+  <string name="app_ops_labels_read_phone_state">lleer estáu del teléfonu</string>
+  <string name="app_ops_labels_add_voicemail">amestar buzón de voz</string>
   <string name="app_ops_labels_use_sip">Usar SIP</string>
   <string name="app_ops_labels_make_call">Facer llamada</string>
   <string name="app_ops_labels_use_fingerprint">Usar buelga</string>
+  <string name="app_ops_labels_use_body_sensors">Usar sensores corporales</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Lleer tresmisiones celulares</string>
+  <string name="app_ops_labels_mock_location">Llocalización falsa</string>
+  <string name="app_ops_labels_read_external_storage">Lleer almacenamientu esternu</string>
+  <string name="app_ops_labels_write_external_storage">Escribir al almacenamientu esternu</string>
   <string name="app_ops_labels_turn_screen_on">Prender pantalla</string>
   <string name="app_ops_labels_get_accounts">Consiguir cuentes</string>
   <string name="app_ops_labels_toggle_wifi">Alternar Wi-Fi</string>
   <string name="app_ops_labels_toggle_bluetooth">Alternar bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Aniciar nel arranque</string>
   <string name="app_ops_labels_toggle_nfc">Alternar NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Conmutar datos móviles</string>
   <string name="app_ops_labels_superuser">Accesu alministrativu</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Permitíu</string>
@@ -388,6 +439,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_ops_allowed_count">Permitíu <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Refugáu <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Permitíu <xliff:g id="count">%1$s</xliff:g>, refugáu <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desactiváu pol optimizador de batería</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Aplicaciones d\'usuariu</string>
   <string name="app_ops_show_system_apps">Amuesa les app del sistema</string>
@@ -549,6 +601,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="live_display_color_profile_astronomy_title">Astronomía</string>
   <string name="live_display_color_profile_photography_title">Fotografía</string>
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfeuta pa semeyes</string>
+  <string name="live_display_color_profile_basic_title">Básicu</string>
   <string name="live_display_color_profile_basic_summary">Usa la pantalla ensin calibrar</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seleutor d\'iconu</string>
@@ -689,6 +742,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Amosar visualizador de música</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">Desactiváu pola configuración rápida de los controles</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Calca p\'habilitar la pantalla de bloquéu</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">¡Habilitóse la pantalla de bloquéu!</string>
   <!-- Battery saver -->
@@ -726,6 +780,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="voice_wakeup_retrain_title">Calibra la to voz</string>
   <string name="voice_wakeup_activity_title">Actividá a executar</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">L\'activación por voz tien de tener permisos de llamada pa esbillar un contautu direutu.</string>
   <string name="picker_activities">Actividaes</string>
   <string name="select_custom_app_title">Seleicionar aplicación personalizada</string>
   <string name="select_custom_activity_title">Seleicionar actividá personalizada</string>
@@ -818,11 +873,14 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Númberu teléfonu PPP d\'APN</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN Duplicáu</string>
+  <string name="duplicate_apn_error_message">Yá esiste esti APN. Descártalu o camuda los parámetros.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> ta <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">deshabilitada</string>
   <string name="sim_missing">ausente o defeutuosa</string>
   <string name="sim_enabler_need_disable_sim">Desactivaráse la tarxeta SIM. ¿Quies siguir?</string>
   <string name="sim_enabler_will_disable_sim_title">Atención</string>
+  <string name="sim_enabler_need_switch_data_service">Esta SIM va desactivase y la SIM <xliff:g id="slotid">%1$s </xliff:g> va usase pa servicios de datos. ¿De xuru que quies continuar?</string>
   <string name="sim_enabler_airplane_on">Nun pue facese la operación entrín el mou avión tea activáu.</string>
   <string name="sim_enabler_in_call">Nun pue facese la operación entrín teas llamando.</string>
   <string name="sim_enabler_both_inactive">Nun puen deshabilitase toles tarxetes SIM</string>
@@ -833,14 +891,18 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="sub_deactivate_success">Desactivóse la SIM.</string>
   <string name="sub_deactivate_failed">Falló la desactivación.</string>
   <string name="primary_sub_select_title">Soscripción 3G/LTE por defeutu</string>
+  <string name="select_sim_card">Seleicionar tarxeta SIM</string>
   <!-- MSIM SIM status -->
+  <string name="sim_mobile_network_settings_category_title">Axustes de rede móvil</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
   <string name="zen_mode_summary_reminders">recordatorios</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">eventos</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_callers">llamaes esbillaes</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">mensaxes esbillaos</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -851,6 +913,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- label for application name -->
   <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Postrer vegada usáu:</string>
   <!-- label for usage time -->
   <string name="usage_time_label_cm">Tiempu d\'usu:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -860,18 +923,24 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="factory_reset_warning_text_reset_now">REAFITAR AGORA</string>
   <string name="factory_reset_warning_text_message">Desaniciaránse d\'esti preséu toles cuentes, aplicaciones, datos d\'aplicaciones y axustes del sistema. Esto nun pue desfacese.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Otros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tiempu d\'espera del puntu d\'accesu Wi\u2011Fi</string>
   <string name="hotstpot_inactivity_timeout_never">Enxamás</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 minutu</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">El puntu d\'accesu portable Wi\u2011Fi nun va apagase enxamás</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">El puntu d\'accesu portable Wi\u2011Fi va apagase dempués de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Pantalla de bloquéu animada</string>
   <!-- Live lock screen summary -->
   <string name="live_lock_screen_summary">Habilita y configura les pantalles de bloquéu animaes</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Axustes</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Pa ver les pantalles de bloquéu animaes disponibles, activa la opción de pantalles de bloquéu.</string>
   <string name="interruptions_ignore_while_media_summary">Nun amenorga\'l volume de reproducción cuando aporten avisos</string>
   <!-- CM Legal -->
   <string name="cmlicense_title">Llicencia CyanogenMod</string>
@@ -880,23 +949,62 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="restrict_app_wlan_title">Desactivar l\'usu de l\'aplicación Wi\u2011Fi</string>
   <string name="restrict_app_wlan_summary">Evita que l\'aplicación use la conexón de datos Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Desactivar l\'usu de la rede celular</string>
   <string name="restrict_app_cellular_summary">Evita que l\'aplicación use conexón de datos móviles</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Clima</string>
+  <string name="weather_settings_no_services_prompt">Nun hai fornidores de clima instalaos</string>
+  <string name="weather_settings_button">Axustes de fornidor</string>
+  <string name="weather_settings_activity_not_found">Nun pue llanzase\'l menú d\'axustes d\'esti fornidor</string>
+  <string name="weather_settings_add_weather_provider">Amestar fornidor climatolóxicu</string>
   <string name="weather_settings_general_settings_title">Xeneral</string>
+  <string name="weather_settings_providers_title">Fornidores</string>
+  <string name="weather_settings_temp_units_title">Unidá de temperatura</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">clima</string>
+  <string name="background_data_access">Accesu a datos en segundu planu</string>
+  <string name="allow_background_both">Sobre datos celulares y Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Namái per Wi-Fi</string>
+  <string name="allow_background_none">Ensin accesu</string>
+  <string name="mobile_data_alert">Alerta de datos móviles</string>
   <string name="mobile_data_alert_summary">Avisa cuando l\'aplicación use una cantidá grande de datos</string>
+  <string name="data_usage_menu_enable_data_alerts">Activar les alertes d\'usu de datos</string>
+  <string name="data_usage_menu_disable_data_alerts">Desactivar les alertes d\'usu de datos</string>
+  <string name="data_usage_menu_reset_stats">Reafitar los datos estadísticos</string>
+  <string name="reset_data_stats_msg">Esto va desaniciar tolos datos d\'información de rastrexu</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restrinxir accesu a datos móviles</string>
   <string name="restrict_cellular_access_summary">Deshabilita l\'accesu de datos en redes móviles</string>
+  <string name="restrict_cellular_access_dialog_title">¿Restrinxir accesu a datos móviles?</string>
+  <string name="restrict_cellular_access_dialog_summary">Esta carauterística pue facer qu\'una aplicación que depende del accesu a la rede dexe de trabayar cuando namái esistan redes móviles disponibles.\n\nPues atopar los controles d\'usu de datos más afayadizos nos axustes disponibles dientro de l\'aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfocar el fondu</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Amosar clima</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Amosar na pantalla de bloquéu</string>
   <string name="app_notification_show_on_keyguard_summary">Amosar notificaciones d\'esta aplicación na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nun amosar nunca notificaciones persistentes d\'esta aplicación na pantalla de bloquéu</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Control avanzáu de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar la carga automática del MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Activar la carga automática del MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactivar el depurador VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activar el depurador VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar el depurador VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar el depurador VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar el depurador WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar el depurador WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desactivar el rexistru en ADB de la radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Activar el rexistru en ADB de la radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Desactivar el rexistru Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Activar el rexistru Diag</string>
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 45bf44d..29518a8 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -267,7 +267,9 @@
   <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
   <string name="bluetooth_map_acceptance_dialog_text">%1$s quier acceder a los mensaxes. ¿Quies permitir l\'accesu a %2$s?</string>
   <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <string name="bluetooth_sap_request">"Solicitú d'accesu a SIM"</string>
   <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <string name="bluetooth_sap_acceptance_dialog_text"><xliff:g id="device_name">%1$s</xliff:g> quier acceder a la to tarxeta SIM. Dar laude pal accesu de la tarxeta SIM, deshabilitará los datos de coneutividá nel to preséu na duración de la conexón. ¿Dar accesu a <xliff:g id="device_name">%2$s</xliff:g>?</string>
   <!-- Date & time settings screen title -->
   <string name="date_and_time">Data y hora</string>
   <!-- The title of the activity to pick a time zone. -->
@@ -636,10 +638,14 @@
   <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
   <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
   <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <string name="security_settings_fingerprint_enroll_repeat_title">¡Perfeuto! Agora repiti</string>
   <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
   <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <string name="security_settings_fingerprint_enroll_finish_title">¡Amestóse la buelga!</string>
   <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <string name="security_settings_fingerprint_enroll_finish_message">Siempres que veas esti iconu, podrás usar la to buelga pa identificate o dar laude a una merca.</string>
   <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <string name="setup_fingerprint_enroll_finish_message">Namái toca\'l sensor de buelgues pa esconsoñar y desbloquiar el to preséu.</string>
   <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
   <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
   <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
@@ -659,9 +665,13 @@
   <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
   <!-- Text shown when "Add fingerprint" button is disabled -->
   <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <string name="fingerprint_last_delete_title">¿Desaniciar toles buelgues?</string>
   <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <string name="fingerprint_last_delete_message">Nun sedrás a usar les tos buelgues pa desbloquiar el teléfonu, dar laude a merques o roblar n\'aplicaciones con elles.</string>
   <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <string name="fingerprint_last_delete_confirm">Sí, desaniciar</string>
   <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <string name="confirm_fingerprint_icon_content_description">Usa la to buelga pa siguir.</string>
   <!-- Title of the preferences category for preference items to control encryption -->
   <string name="crypt_keeper_settings_title">Cifráu</string>
   <!-- Title of the preferences item to control encryption -->
@@ -1024,8 +1034,11 @@
   <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
   <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <string name="wifi_band_24ghz">2.4 GHz</string>
   <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <string name="wifi_band_5ghz">5 GHz</string>
   <!-- Link speed on Wifi Status screen -->
+  <string name="link_speed">%1$d Mbps</string>
   <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
   <!-- NFC settings -->
   <!-- Used in the 1st-level settings screen to turn on NFC -->
@@ -1417,6 +1430,10 @@
   <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
   <!-- WFC mode [CHAR LIMIT=30] -->
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <string-array name="wifi_calling_mode_values">
+    <item>"2"</item>
+    <item>"1"</item>
+  </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
   <!-- Main Settings screen setting option name to go into the display settings screen -->
@@ -1548,6 +1565,7 @@
   <string name="auto_brightness_summary">Optimiza\'l nivel de rellumu pa la lluz disponible</string>
   <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <string name="night_mode_summary">%s</string>
   <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
@@ -1872,7 +1890,9 @@
   <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
   <string name="storage_detail_apps">Aplicaciones</string>
   <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <string name="storage_detail_images">Imáxenes</string>
   <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <string name="storage_detail_videos">Vídeos</string>
   <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
   <string name="storage_detail_audio">Audiu</string>
   <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
@@ -1896,12 +1916,16 @@
   <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
   <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
   <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <string name="storage_wizard_migrate_now">Mover agora</string>
   <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <string name="storage_wizard_migrate_later">Mover más sero</string>
   <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <string name="storage_wizard_migrate_confirm_title">Mover datos agora</string>
   <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
   <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
   <string name="storage_wizard_migrate_confirm_next">Mover</string>
   <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <string name="storage_wizard_migrate_progress_title">Moviendo datos\u2026</string>
   <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
   <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
   <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
@@ -2188,6 +2212,7 @@
   <!-- About phone settings screen, setting option name to see a list of contributors -->
   <string name="contributors_title">Collaboradores</string>
   <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <string name="manual">Manual</string>
   <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
   <string name="regulatory_information">Información regulatoria</string>
   <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
@@ -2206,6 +2231,7 @@
   <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
   <string name="wallpaper_attributions_values">Fornidores d\'imáxenes de satélite:\n©2014 CNES / Astrium, DigitalGlobe, Bluesky</string>
   <!-- Phone Manual -->
+  <string name="settings_manual_activity_title">Manual</string>
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
   <!-- Title for actual Settings license activity. -->
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
@@ -2258,6 +2284,7 @@
          draws incorrect pattern [CHAR LIMIT=30] -->
   <!-- Lock Pattern settings -->
   <!-- Security & location settings screen, header -->
+  <string name="lock_settings_title">Seguranza de preséu</string>
   <!-- Security & location settings screen, setting option name -->
   <string name="lockpattern_change_lock_pattern_label">Camudar patrón desbloquéu</string>
   <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
@@ -2405,6 +2432,7 @@
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
   <string name="show_background_processes">Procesos en caché</string>
   <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <string name="default_emergency_app">Aplicación d\'emerxencia</string>
   <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
   <string name="reset_app_preferences">Restablecer preferencies</string>
   <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
@@ -2444,6 +2472,7 @@
   <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
   <string name="internal_storage">Almacenamientu internu</string>
   <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <string name="internal_storage_sentence">almacenamientu internu</string>
   <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
   <string name="sd_card_storage" product="nosdcard">Almacenamientu USB</string>
   <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
@@ -3206,6 +3235,7 @@
   <!-- Label for power consumed by the flashlight -->
   <string name="power_flashlight">Llinterna</string>
   <!-- Label for power consumed by the camera -->
+  <string name="power_camera">Cámara</string>
   <!-- Label for power consumed by Wi-Fi -->
   <string name="power_wifi">Wi-Fi</string>
   <!-- Label for power consumed by Bluetooth -->
@@ -3248,6 +3278,7 @@
   <!-- Label for Video usage time -->
   <string name="usage_type_video">Videu</string>
   <!-- Label for Camera usage time -->
+  <string name="usage_type_camera">Cámara</string>
   <!-- Label for Flashlight usage time -->
   <string name="usage_type_flashlight">Llinterna</string>
   <!-- Label for time that a feature has been on -->
@@ -3366,7 +3397,9 @@
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
   <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <string name="process_stats_ram_use">Usu de RAM</string>
   <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <string name="process_stats_bg_ram_use">Usu de RAM ( de fondu)</string>
   <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
   <string name="process_stats_run_time">Duración</string>
   <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
@@ -3404,6 +3437,7 @@
   <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
   <string name="menu_show_system">Amosar sistema</string>
   <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <string name="menu_hide_system">Anubrir sistema</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
          as percentages-->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
@@ -4044,8 +4078,12 @@
   <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
   <string name="overlay_display_devices_title">Simular pantallaes secundaries</string>
   <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <string name="enable_multi_window">Mou multi ventana</string>
   <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <string name="enable_multi_window_summary">Actividaes múltiples na pantalla al empar.</string>
+  <string name="confirm_enable_multi_window_title">¿Habilitar mou multi ventana?</string>
   <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <string name="confirm_enable_multi_window_text">ALVERTENCIA: Esto ye una carauterística peresperimental que permite actividaes múltiples na pantalla al empar pente la interfaz d\'Aplicaciones recientes. Delles aplicaciones puen cascar o nun furrular correutamente al usase con esta carauterística.</string>
   <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
   <string name="debug_applications_category">Aplicaciones</string>
   <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
@@ -4068,6 +4106,7 @@
   <!-- Title for app usage. [CHAR LIMIT=40] -->
   <string name="data_usage_app_info_label">INFORMACIÓN D\'APLICACIÓN</string>
   <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <string name="data_usage_cellular_data">Datos móviles</string>
   <!-- Title for setting data limit. [CHAR LIMIT=40] -->
   <string name="data_usage_data_limit">Afitar llende de datos</string>
   <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
@@ -4097,6 +4136,7 @@
   <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
   <string name="data_usage_menu_sim_cards">Tarxetes SIM</string>
   <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <string name="data_usage_menu_cellular_networks">Redes móviles</string>
   <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
   <string name="account_settings_menu_auto_sync">Sincronización automática</string>
@@ -4117,7 +4157,9 @@
   <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
   <string name="data_usage_app_restricted">con restricción</string>
   <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <string name="data_usage_disable_mobile">¿Desactivar datos móviles?</string>
   <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <string name="data_usage_disable_mobile_limit">Afitar llende de datos móviles</string>
   <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
   <string name="data_usage_disable_4g_limit">Llendar datos 4G</string>
   <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
@@ -4129,14 +4171,17 @@
   <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
   <string name="data_usage_tab_ethernet">Ethernet</string>
   <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <string name="data_usage_tab_mobile">Móvil</string>
   <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
   <string name="data_usage_tab_4g">4G</string>
   <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
   <string name="data_usage_tab_3g">2G-3G</string>
   <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <string name="data_usage_list_mobile">Móvil</string>
   <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
   <string name="data_usage_list_none">Nenguna</string>
   <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <string name="data_usage_enable_mobile">Datos móviles</string>
   <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
   <string name="data_usage_enable_3g">Datos 2G-3G</string>
   <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
@@ -4203,6 +4248,7 @@
   <string name="data_usage_metered_title">Restricciones de rede</string>
   <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
   <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <string name="data_usage_metered_mobile">Redes móviles</string>
   <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
   <string name="data_usage_metered_wifi">Redes Wi‑Fi d\'usu midíu</string>
   <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
@@ -4269,6 +4315,7 @@
   <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_disconnect">Desconeutar</string>
   <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <string name="vpn_version">Versión <xliff:g id="version" example="3.3.0">%s</xliff:g></string>
   <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
   <string name="vpn_title">VPN</string>
   <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
@@ -4352,6 +4399,7 @@
   <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
   <string name="user_summary_restricted_profile">Perfil llendáu</string>
   <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <string name="user_need_lock_message">Enantes que pueas crear un perfil restrinxíu, precisarás configurar una pantalla de bloquéu pa protexer les tos aplicaciones y datos personales.</string>
   <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
   <string name="user_set_lock_button">Afitar bloquéu</string>
   <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
@@ -4369,6 +4417,7 @@
   <!-- Title for add user type dialog [CHAR LIMIT=45] -->
   <string name="user_add_user_type_title">Amestar</string>
   <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <string name="user_add_max_count">Pues amestar fasta <xliff:g id="user_count">%1$d</xliff:g> usuarios</string>
   <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
   <string name="user_add_user_item_summary">Los usuarios tienen conteníu y aplicaciones propios</string>
   <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
@@ -4380,6 +4429,7 @@
   <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
   <string name="user_add_user_title">Amestar usuariu nuevu?</string>
   <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <string name="user_add_user_message_long">Pues compartir esti preséu con otra xente creando usuarios adicionales. Cada usuariu tien el so propiu espaciu que podrán personalizar coles aplicaciones, fondu de pantalla y más. Los usuarios tamién puen configurar axustes como\'l Wi\u2011 qu\'afeuten a toos.\n\nCuando amiestes un usuariu nuevu, esa persona precisa configurar el so espaciu.\n\nCualesquier usuariu pue anovar aplicaciones d\'otros usuarios.</string>
   <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
   <string name="user_add_user_message_short">Cuando amiestes un usuariu nuevu, esa persona necesita configurar el so espaciu.\n\nCualesquier usuariu pue anovar les aplicaciones pa tolos otros usuarios. </string>
   <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
@@ -4393,7 +4443,9 @@
   <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
   <string name="user_setup_button_setup_later">Agora non</string>
   <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <string name="user_cannot_manage_message" product="tablet">Namái\u2019l dueñu la tableta pue xestionar usuarios.</string>
   <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <string name="user_cannot_manage_message" product="default">Namái\u2019l dueñu\u2019l teléfonu pue xestionar usuarios.</string>
   <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
   <string name="user_cannot_add_accounts_message">Los perfiles restrinxíos nun puen amestar cuentes</string>
   <!-- User details remove user menu [CHAR LIMIT=20] -->
@@ -4413,10 +4465,13 @@
   <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
   <string name="work_profile_confirm_remove_title">Desaniciar perfil de trabayu?</string>
   <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <string name="user_confirm_remove_self_message" product="tablet">Vas perder el to espaciu y datos nesta tablet. Nun pues desfacer esta aición.</string>
   <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <string name="user_confirm_remove_self_message" product="default">Vas perder el to espaciu y datos nesti teléfonu. Nun pues desfacer esta aición.</string>
   <!-- User removal confirmation message [CHAR LIMIT=none] -->
   <string name="user_confirm_remove_message">Van desaniciase toles apps y datos.</string>
   <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <string name="work_profile_confirm_remove_message">Van desaniciase toles aplicaciones y datos nesti perfil si sigues.</string>
   <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
   <string name="user_profile_confirm_remove_message">Van desaniciase toles apps y datos.</string>
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
@@ -4474,6 +4529,7 @@
   <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
   <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
   <!-- Always use the default app (independent of what app is open) -->
+  <string name="nfc_payment_favor_default">Siempres</string>
   <!-- If open app supports TapPay, use that app instead of the default -->
   <!-- Header for a dialog asking the user which payment app to use -->
   <!-- Header for text explaning how to pay at a payment terminal in a store -->
@@ -4738,9 +4794,12 @@
   <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <string name="zen_mode_automation_settings_title">Regles automátiques</string>
   <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
   <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <string name="zen_mode_option_alarms">Namái alarmes</string>
   <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <string name="zen_mode_option_no_interruptions">Silenciu total</string>
   <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
   <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
   <string name="ringtone_title">Tonu del teléfonu</string>
@@ -4779,6 +4838,7 @@
   <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
   <string name="screen_locking_sounds_title">Soníos al bloquiar pantalla</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <string name="charging_sounds_title">Soníos de carga</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
   <string name="docking_sounds_title">Soníos al coneutar</string>
   <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
@@ -4814,9 +4874,11 @@
           listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
   <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
   <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <string name="zen_access_empty_text">Denguna aplicación instalada solicitó l\'accesu a Nun molestar</string>
   <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
   <string name="loading_notification_apps">Cargando apps...</string>
   <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <string name="app_notification_block_title">Bloquialo too</string>
   <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
   <string name="app_notification_block_summary">Nunca nun amosar notificaciones d\'esta aplicación</string>
   <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
@@ -4834,6 +4896,7 @@
   <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
   <string name="app_notifications_dialog_done">Fecho</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <string name="zen_mode_rule_name">Nome de regla</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
   <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
@@ -4857,6 +4920,7 @@
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <string name="zen_mode_event_rule_reply_yes_or_maybe">Sí o quiciabes</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
   <string name="zen_mode_event_rule_reply_yes">Sí</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
@@ -4978,20 +5042,27 @@
   <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
   <!-- Summary for app storage preference [CHAR LIMIT=15] -->
   <!-- Category name for App Launch -->
+  <string name="app_launch_supported_domain_urls_title">Enllaces sofitaos</string>
   <!-- Summary for app storage preference -->
   <!-- Internal storage label -->
+  <string name="storage_type_internal">memoria interna</string>
   <!-- External storage label -->
+  <string name="storage_type_external">memoria esterna</string>
   <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <string name="storage_type_internal">memoria interna</string>
   <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <string name="storage_type_external">memoria esterna</string>
   <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
   <string name="app_data_usage">Usu de datos d\'aplicación</string>
   <!-- Summary for data usage preference [CHAR LIMIT=15] -->
   <!-- Title of storage preference to control where app is stored -->
+  <string name="storage_used">Almacenamientu usáu</string>
   <!-- Title of button to change storage [CHAR LIMIT=25] -->
   <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
   <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
   <string name="notifications_label">Notificaciones</string>
   <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <string name="notifications_enabled">Normal</string>
   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
   <string name="notifications_disabled">Bloquiar</string>
   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
@@ -5008,6 +5079,7 @@
   <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
   <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
   <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <string name="filter_all_apps">Toles apliciones</string>
   <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
   <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
   <string name="filter_personal_apps">Personal</string>
@@ -5026,6 +5098,7 @@
   <string name="advanced_apps">Axustes avanzaos</string>
   <!-- Title for application configuration settings [CHAR LIMIT=30] -->
   <!-- Warning toast shown when data usage screen can't find specified app -->
+  <string name="unknown_app">Aplicación desconocida</string>
   <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
   <!-- Label for list that shows all permissions -->
   <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
@@ -5052,44 +5125,62 @@
   <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
          displayed as a dialog message when the user selects an assistant. -->
   <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <string name="assistant_security_warning_agree">Aceuto</string>
   <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <string name="assistant_security_warning_disagree">Refugo</string>
   <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
   <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <string name="default_browser_title">Aplicación de restolador</string>
   <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
   <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <string name="default_phone_title">Aplicación de teléfonu</string>
   <!-- Label of default app for current setting [CHAR LIMIT=40] -->
   <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <string name="apps_storage">Almacenamientu d\'aplicaciones</string>
   <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <string name="usage_access">Accesu d\'usu</string>
   <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
   <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <string name="app_usage_preference">Preferencies d\'usu d\'aplicaciones</string>
   <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
   <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <string name="memory_settings_title">Memoria</string>
   <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
   <string name="memory_details_title">Detalles de memoria</string>
   <!-- Description of app always running [CHAR LIMIT=45] -->
   <!-- Description of app sometimes running [CHAR LIMIT=45] -->
   <!-- Description of app rarely running [CHAR LIMIT=45] -->
   <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <string name="memory_max_use">Máximu</string>
   <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <string name="memory_avg_use">Promediu</string>
   <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
   <!-- Average memory used by an app [CHAR LIMIT=25] -->
   <!-- Formatting for memory description [CHAR LIMIT=25] -->
   <!-- Label for process [CHAR LIMIT=25] -->
   <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <string name="high_power_apps">Optimización de batería</string>
   <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <string name="high_power_filter_on">Nun s\'optimizó</string>
   <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <string name="high_power_on">Inorando optimización de batería</string>
   <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <string name="high_power_off">Optimizando usu de batería</string>
   <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <string name="high_power_system">Nun ta disponible la optimización de batería</string>
   <!-- Description of high power switch [CHAR LIMIT=NONE] -->
   <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
   <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <string name="high_power_prompt_title">¿Inorar optimizaciones de batería?</string>
   <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
   <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
   <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <string name="no_battery_summary">Ensin usu de batería dende la cabera carga completa</string>
   <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
   <string name="app_notification_preferences">Axustes d\'aplicación</string>
   <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
   <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <string name="additional_permissions">Permisos adicionales</string>
   <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
   <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
@@ -5098,34 +5189,45 @@
   <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
          user select what the USB connection for this device should be used for. This choice
          is for charging only. -->
+  <string name="usb_use_charging_only_desc">Namái carga esti preséu</string>
   <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for powering the other device only. -->
+  <string name="usb_use_power_only">Fonte d\'enerxía</string>
   <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
          user select what the USB connection for this device should be used for. This choice
          is for powering the other device only. -->
+  <string name="usb_use_power_only_desc">Carga l\'otru preséu coneutáu</string>
   <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring files via MTP. -->
+  <string name="usb_use_file_transfers">Tresferencies de ficheros</string>
   <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring files via MTP. -->
+  <string name="usb_use_file_transfers_desc">Tresfier ficheros a Linux, Mac o Windows (MTP)</string>
   <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
+  <string name="usb_use_photo_transfers">Tresferencia de ficheros (PTP)</string>
   <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for transferring photos via PTP. -->
+  <string name="usb_use_photo_transfers_desc">Tresferir semeyes o ficheros si MTP nun ta sofitáu (PTP)</string>
   <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
+  <string name="usb_use_MIDI">MIDI</string>
   <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
          select what the USB connection for this device should be used for. This choice
          is for entering MIDI mode. -->
+  <string name="usb_use_MIDI_desc">Usa\'l preséu pa la entrada de MIDI</string>
   <!-- The title used in a dialog which lets the user select what the USB connection
          for this device should be used for. Choices are usb_use_charging_only,
          usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <string name="usb_use">Usar USB pa</string>
   <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <string name="inactive_apps_title">Aplicaciones inactives</string>
   <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
   <!-- Settings item summary for active app [CHAR LIMIT=100] -->
   <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
@@ -5136,30 +5238,42 @@
   <!-- Label for average memory use section [CHAR LIMIT=30] -->
   <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
   <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <string name="memory_usage">Usu de memoria</string>
   <!-- Label for app list of memory use [CHAR LIMIT=30] -->
   <string name="app_list_memory_use">Usu d\'aplicación</string>
   <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <string name="memory_details">Detalles</string>
   <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
   <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <string name="no_memory_use_summary">Nun s\'usó memoria nes caberes 3 hores</string>
   <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
   <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
   <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <string name="memory_performance">Rindimientu</string>
   <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <string name="total_memory">Memoria total</string>
   <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
   <!-- Label for free memory of device [CHAR LIMIT=25] -->
   <string name="free_memory">Llibre</string>
   <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <string name="memory_usage_apps">Memoria usada poles aplicaciones</string>
   <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
   <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
   <string name="running_frequency">Frecuencia</string>
   <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <string name="memory_maximum_usage">Usu máximu</string>
   <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <string name="no_data_usage">Nun s\'usaron datos</string>
   <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
   <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
   <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <string name="ignore_optimizations_on">Nun optimizar</string>
   <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <string name="ignore_optimizations_off">Optimizar</string>
   <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <string name="ignore_optimizations_on_desc">Quiciabes escose aína la batería</string>
   <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <string name="ignore_optimizations_off_desc">Aconséyase pa mayor vida de batería</string>
   <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
   <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
   <string name="app_list_preference_none">Ensin seguridá</string>
@@ -5179,6 +5293,7 @@
   <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
   <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
   <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <string name="filter_overlay_apps">Aplicaciones con permisu</string>
   <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
   <string name="system_alert_window_on">Sí</string>
   <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
@@ -5193,6 +5308,7 @@
   <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
   <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
   <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <string name="write_settings_description">Esti permisu permite qu\'una aplicación modifique los axustes del sistema.</string>
   <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
   <string name="write_settings_on">Sí</string>
   <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
@@ -5202,10 +5318,22 @@
   <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
   <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
   <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <string-array name="color_mode_names">
+    <item>Vibrant (default)</item>
+    <item>Natural</item>
+    <item>Estándar</item>
+  </string-array>
   <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <string-array name="color_mode_descriptions">
+    <item>Colores ameyoraos</item>
+    <item>Natural colors as seen by the eye</item>
+    <item>Colors optimized for digital content</item>
+  </string-array>
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <string name="picture_color_mode_desc">Usar sRGB</string>
   <!-- Name of the setting to change the display's color temperature -->
   <!-- Description of the setting to change the display's color temperature -->
   <!-- Toast message letting the user know the color temperature setting is not immediate -->
+  <string name="color_temperature_toast">P\'aplicar el cambéu de color, apaga la pantalla</string>
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 4078c27..3fd7fed 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -709,6 +709,7 @@
   <string name="weather_settings_general_settings_title">Ümumi</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Kilik ekranında göstər</string>
   <string name="app_notification_show_on_keyguard_summary">Kilid ekranında bu tətbiqetmənin bildirişlərini göstər</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index caaaa78..379014b 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -1012,6 +1012,8 @@
   <string name="weather_settings_keyword">надвор\'е</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Звесткі пра надвор\'е</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">На экране блакавання</string>
   <string name="app_notification_show_on_keyguard_summary">Паказваць апавяшчэнні з гэтага дадатку на экране блакавання</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index abc15ba..6325ae4 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1041,7 +1041,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Мрежови оператори</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Замъгляване на заключен екран</string>
+  <string name="lockscreen_blur_enabled_title">Замъгляване на фона</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Показване на времето</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Покажи при заключен екран</string>
   <string name="app_notification_show_on_keyguard_summary">Показвай известия от това приложение при заключен екран</string>
@@ -1052,12 +1054,12 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Изключване на автоматичното зареждане MBN</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Включване на автоматичното зареждане MBN</string>
-  <string name="cm_radio_info_volte_avail_ovr_on_label">Изключване на VoLTE dbg</string>
-  <string name="cm_radio_info_volte_avail_ovr_off_label">Включване на VoLTE dbg</string>
-  <string name="cm_radio_info_vt_avail_ovr_on_label">Изклячване на VT dbg</string>
-  <string name="cm_radio_info_vt_avail_ovr_off_label">Включване на VT dbg</string>
-  <string name="cm_radio_info_wfc_avail_ovr_on_label">Изклячване на WFC dbg</string>
-  <string name="cm_radio_info_wfc_avail_ovr_off_label">Включване на WFC dbg</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Изключване на режим VoLTE debug</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Включване на режим VoLTE debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Изключване на режим VT debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Включване на режим VT debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Изключване на режим WFC debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Включване на режим WFC debug</string>
   <string name="cm_radio_info_adb_log_on_label">Изключване на ADB радио лог</string>
   <string name="cm_radio_info_adb_log_off_label">Включване на ADB радио лог</string>
   <string name="cm_radio_info_diag_log_on_label">Изключване не Diag log</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 02b544a..4f1a832 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -560,6 +560,7 @@
   <string name="weather_settings_general_settings_title">সাধারণ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index fd221e1..179558f 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1041,7 +1041,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadors de xarxa</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Desenfocament de la pantalla de bloqueig</string>
+  <string name="lockscreen_blur_enabled_title">Desenfoca el fons</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Mostra el temps</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostra a la pantalla de bloqueig</string>
   <string name="app_notification_show_on_keyguard_summary">Mostra les notificacions d\'aquesta aplicació a la pantalla de bloqueig</string>
@@ -1052,12 +1054,12 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Desactiva la càrrega automàtica del MBN</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Activa la càrrega automàtica del MBN</string>
-  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactiva el depurador de VoLTE</string>
-  <string name="cm_radio_info_volte_avail_ovr_off_label">Activa el depurador de VoLTE</string>
-  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactiva el depurador de VT</string>
-  <string name="cm_radio_info_vt_avail_ovr_off_label">Activa el depurador de VT</string>
-  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactiva el depurador de WFC</string>
-  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activa el depurador de WFC</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactiva el depurador VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activa el depurador VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactiva el depurador VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activa el depurador VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactiva el depurador WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activa el depurador WFC</string>
   <string name="cm_radio_info_adb_log_on_label">Desactiva el registre ADB de la ràdio</string>
   <string name="cm_radio_info_adb_log_off_label">Activa el registre ADB de la ràdio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactiva el registre Diag</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 839ebbc..4ed25ce 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1041,12 +1041,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Síťový poskytovatelé</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Rozostření zamykací obrazovky</string>
+  <string name="lockscreen_blur_enabled_title">Rozostření pozadí</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Zobrazit počasí</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Zobrazit na zamykací obrazovce</string>
   <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Zakázat trvalé upozornění na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikdy nezobrazovat trvalé upozornění na zamykací obrazovce</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Rozšířené řízení rádia</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Vypnout automatické spuštění MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Zapnout automatické spuštění MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Vypnout VoLTE ladění</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Zapnout VoLTE ladění</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Vypnout VT ladění</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Zapnout VT ladění</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Vypnout WFC ladění</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Zapnout WFC ladění</string>
+  <string name="cm_radio_info_adb_log_on_label">Vypnout protokol ADB radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Zapnout protokol ADB radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Vypnout protokol Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Zapnout protokol Diag</string>
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index f47614a..850e49f 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1007,6 +1007,8 @@
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Vis vejr</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Vis på låseskærmen</string>
   <string name="app_notification_show_on_keyguard_summary">Vis meddelelser fra denne app på låseskærmen</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index ce2a027..42b96ef 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1041,7 +1041,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netzbetreiber</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Sperrbildschirm-Unschärfe</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Wetter anzeigen</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Auf dem Sperrbildschirm anzeigen</string>
   <string name="app_notification_show_on_keyguard_summary">Benachrichtigungen von dieser App auf dem Sperrbildschirm anzeigen</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 356afd6..d86a9f3 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1045,7 +1045,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Εταιρίες δικτύου</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Θόλωμα οθόνης κλειδώματος</string>
+  <string name="lockscreen_blur_enabled_title">Θολό παρασκήνιο</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Εμφάνιση καιρού</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Εμφάνιση στην οθόνη κλειδώματος</string>
   <string name="app_notification_show_on_keyguard_summary">Εμφάνιση ειδοποιήσεων από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index ca6ceaa..b81f4f6 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -767,6 +767,8 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Show weather</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 143a6d2..01f2007 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -194,6 +194,7 @@
   <string name="restrict_cellular_access_dialog_summary">This feature may cause an app that depends on network access to stop working when only mobile networks are available.\n\nYou can find more appropriate data usage controls in the settings available within the app.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 2c51b92..75cacb5 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -911,6 +911,8 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Show weather</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Show on lock screen</string>
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 161ee54..ac95f07 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -846,6 +846,8 @@
   <string name="weather_settings_general_settings_title">Ĝeneralo</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Montri veteron</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Montri sur la ŝlosa ekrano</string>
   <string name="app_notification_show_on_keyguard_summary">Montri atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 95ea32f..dd11186 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -296,6 +296,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index cd507dd..a80b1b1 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1041,7 +1041,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Mostrar clima</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostrar en la pantalla bloqueada</string>
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla bloqueada</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index eab99a2..d97e793 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1041,7 +1041,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Desenfoque de la pantalla de bloqueo</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Mostrar el clima</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostrar en la pantalla de bloqueo</string>
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla de bloqueo</string>
@@ -1052,12 +1053,6 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar la carga automática del MBN</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Activar la carga automática del MBN</string>
-  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactivar el depurador de VoLTE</string>
-  <string name="cm_radio_info_volte_avail_ovr_off_label">Activar el depurador de VoLTE</string>
-  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar el depurador de VT</string>
-  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar el depurador de VT</string>
-  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar el depurador de WFC</string>
-  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar el depurador de WFC</string>
   <string name="cm_radio_info_adb_log_on_label">Desactivar el registro en ADB de la radio</string>
   <string name="cm_radio_info_adb_log_off_label">Activar el registro en ADB de la radio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index f7980fa..fbde428 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -886,6 +886,8 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="weather_settings_general_settings_title">Üldine</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Näita Ilmateadet</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Kuva lukustusekraanil</string>
   <string name="app_notification_show_on_keyguard_summary">Kuva selle rakenduse teavitusi lukustusekraanil</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 20dfe7f..0781914 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1041,12 +1041,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Sare operadoreak</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Blokeo-pantailaren lausotzea</string>
+  <string name="lockscreen_blur_enabled_title">Lausotu atzealtea</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Bistaratu eguraldia</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Bistaratu blokeo-pantailan</string>
   <string name="app_notification_show_on_keyguard_summary">Bistaratu aplikazio honen jakinarazpenak blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Ezgaitu jakinarazpen iraunkorra blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ez bistaratu inoiz aplikazio honen jakinarazpen iraunkorrak blokeo-pantailan</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Irrati kontrol hobetua</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Ezgaitu MBN deskarga automatikoa</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Gaitu MBN deskarga automatikoa</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Ezgaitu VoLTE debug</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Gaitu VoLTE debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Ezgaitu VT debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Gaitu VT debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Ezgaitu WFC debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Gaitu WFC debug</string>
+  <string name="cm_radio_info_adb_log_on_label">Ezgaitu ADB irrati egunkaria</string>
+  <string name="cm_radio_info_adb_log_off_label">Gaitu ADB irrati egunkaria</string>
+  <string name="cm_radio_info_diag_log_on_label">Ezgaitu Diag egunkaria</string>
+  <string name="cm_radio_info_diag_log_off_label">Gaitu Diag egunkaria</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 938f7e2..c6d55f6 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -895,6 +895,8 @@
   <string name="weather_settings_general_settings_title">عمومي</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">نمایش آب و هوا</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">نمایش در قفل صفحه</string>
   <string name="app_notification_show_on_keyguard_summary">نمایش اعلان‌های این برنامه در قفل صفحه</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 6dcb5ae..4463fa7 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1041,7 +1041,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Verkko-operaattorit</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Lukitusnäytön sumennus</string>
+  <string name="lockscreen_blur_enabled_title">Sumennettu tausta</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Näytä sää</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Näytä lukitusnäytöllä</string>
   <string name="app_notification_show_on_keyguard_summary">Näytä tämän sovelluksen ilmoitukset lukitusnäytöllä</string>
@@ -1052,12 +1054,12 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Poista MBN auto load käytöstä</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Ota MBN auto load käyttöön</string>
-  <string name="cm_radio_info_volte_avail_ovr_on_label">Poista VoLTE dbg käytöstä</string>
-  <string name="cm_radio_info_volte_avail_ovr_off_label">Ota VoLTE dbg käyttöön</string>
-  <string name="cm_radio_info_vt_avail_ovr_on_label">Poista VT dbg käytöstä</string>
-  <string name="cm_radio_info_vt_avail_ovr_off_label">Ota VT dbg käyttöön</string>
-  <string name="cm_radio_info_wfc_avail_ovr_on_label">Poista WFC dbg käytöstä</string>
-  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ota WFC dbg käyttöön</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Poista VoLTE debug käytöstä</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Ota VoLTE debug käyttöön</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Poista VT debug käytöstä</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Ota VT debug käyttöön</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Poista WFC debug käytöstä</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ota WFC debug käyttöön</string>
   <string name="cm_radio_info_adb_log_on_label">Poista ADB radio log käytöstä</string>
   <string name="cm_radio_info_adb_log_off_label">Ota ADB radio log käyttöön</string>
   <string name="cm_radio_info_diag_log_on_label">Poista Diag log käytöstä</string>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 027edcf..7866d69 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -698,7 +698,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="status_bar_notif_count_summary">Afficher le nombre de notifications en attente</string>
   <string name="status_bar_quick_qs_pulldown_title">Ouverture rapide</string>
   <string name="status_bar_quick_qs_pulldown_summary">Tirer le côté %1$s pour ouvrir la configuration rapide</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Gauche</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Droite</string>
   <string name="status_bar_quick_qs_pulldown_off">Désactivé</string>
   <string name="status_bar_quick_qs_pulldown_left">Gauche</string>
@@ -1042,6 +1041,8 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Opérateurs réseau</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Afficher la météo</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Afficher sur l\'écran de verrouillage</string>
   <string name="app_notification_show_on_keyguard_summary">Afficher les notifications de cette application sur l\'écran de verrouillage</string>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 140a922..03a24b3 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -190,6 +190,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 9fcdcdd..9904da1 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -436,6 +436,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 556d8b2..c6eed40 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1008,6 +1008,8 @@
   <string name="weather_settings_general_settings_title">સામાન્ય</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">હવામાન દર્શાવો</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">લૉક ચાલુ સ્ક્રીન દર્શાવો</string>
   <string name="app_notification_show_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી સૂચનાઓ દર્શાવો</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index f47e365..7a96fbc 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -859,6 +859,8 @@
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">मौसम दिखाएँ</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">लॉक स्क्रीन पर दिखाएँ</string>
   <string name="app_notification_show_on_keyguard_summary">इस ऐप की अधिसूचनाओं को लॉक स्क्रीन पर दिखाएँ</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 068f2b3..4f57bf5 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1042,12 +1042,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Mrežni operateri</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Zamućen Zaključani zaslon</string>
+  <string name="lockscreen_blur_enabled_title">Zamagli pozadinu</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Pokaži prognozu</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Prikaži na zaključanom zaslonu</string>
   <string name="app_notification_show_on_keyguard_summary">Prikaži obavijesti iz ove aplikacije na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onemogući trajne obavijesti na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikad ne prikazuj trajne obavijesti ove aplikacije na zaključanom zaslonu</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Poboljšana radio kontrola</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Isključi MBN auto opterećenje</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Uključi MBN auto opterećenje</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Isključi VoLTE ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Uključi VoLTE ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Isključi VT ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Uključi VT ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Isključi WFC ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Uključi WFC ispravljanje pogrešaka</string>
+  <string name="cm_radio_info_adb_log_on_label">Isključi ADB radio zapisnik</string>
+  <string name="cm_radio_info_adb_log_off_label">Uključi ADB radio zapisnik</string>
+  <string name="cm_radio_info_diag_log_on_label">Isključi Diag zapisnik</string>
+  <string name="cm_radio_info_diag_log_off_label">Uključi Diag zapisnik</string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 9e799e3..332caf6 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1008,6 +1008,8 @@
   <string name="weather_settings_general_settings_title">Általános</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Időjárás megjelenítése</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Megjelenítés a zárképernyőn</string>
   <string name="app_notification_show_on_keyguard_summary">Ezen alkalmazáshoz tartozó értesítések megjelenítése a zárképernyőn</string>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 5277890..1da7aec 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1040,6 +1040,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operator jaringan</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Tampilkan cuaca</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Tampilkan pada layar kunci</string>
   <string name="app_notification_show_on_keyguard_summary">Tampilkan pemberitahuan dari aplikasi ini pada layar kunci</string>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index f9aed1f..4fdb62e 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -534,7 +534,7 @@
   <string name="double_tap_to_wake_title">Risveglio con doppio tocco</string>
   <string name="double_tap_to_wake_summary">Doppio tocco sullo schermo per accenderlo</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">Doppio tocco per sospendere</string>
+  <string name="double_tap_to_sleep_title">Sospensione con doppio tocco</string>
   <string name="double_tap_to_sleep_summary">Doppio tocco sulla barra di stato per spegnere il display</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Previeni risvegli accidentali</string>
@@ -1043,7 +1043,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatori di rete</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Blocco schermo sfuocato</string>
+  <string name="lockscreen_blur_enabled_title">Sfocatura sfondo</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Visualizza meteo</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostra nella schermata di blocco</string>
   <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
@@ -1054,12 +1056,12 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Disattiva caricamento MBN automatico</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Attiva caricamento MBN automatico</string>
-  <string name="cm_radio_info_volte_avail_ovr_on_label">Disattiva dbg VoLTE</string>
-  <string name="cm_radio_info_volte_avail_ovr_off_label">Attiva dbg VoLTE</string>
-  <string name="cm_radio_info_vt_avail_ovr_on_label">Disattiva dbg VT</string>
-  <string name="cm_radio_info_vt_avail_ovr_off_label">Attiva dbg VT</string>
-  <string name="cm_radio_info_wfc_avail_ovr_on_label">Disattiva dbg WFC</string>
-  <string name="cm_radio_info_wfc_avail_ovr_off_label">Attiva dbg WFC</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Disattiva debug VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Attiva debug VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Disattiva debug VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Attiva debug VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Disattiva debug WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Attiva debug WFC</string>
   <string name="cm_radio_info_adb_log_on_label">Disattiva log radio ADB</string>
   <string name="cm_radio_info_adb_log_off_label">Attiva log radio ADB</string>
   <string name="cm_radio_info_diag_log_on_label">Disattiva log Diag</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index c76b386..a88f4e8 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1043,7 +1043,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ספקי סלולר</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">טשטוש מסך נעילה</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">הראה מזג אוויר</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">הצג על מסך הנעילה</string>
   <string name="app_notification_show_on_keyguard_summary">הצג הודעות מיישום זה במסך הנעילה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 3f79141..55efcf0 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1040,7 +1040,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">通信事業者</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">ロック画面のぼかし</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">天気を表示</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">ロック画面に表示</string>
   <string name="app_notification_show_on_keyguard_summary">このアプリからの通知をロック画面に表示する</string>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 265b2df..7a3f7f0 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1008,6 +1008,8 @@
   <string name="weather_settings_general_settings_title">ಸಾಮಾನ್ಯ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">ಹವಾಮಾನ ಪ್ರದರ್ಶಿಸು</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_notification_show_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಈ ಆಪ್‍ನಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 8e30371..80ade0a 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1034,6 +1034,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">네트워크 영업자</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">날씨 표시</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">잠금 화면에 표시</string>
   <string name="app_notification_show_on_keyguard_summary">잠금화면에 알림을 표시</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index fb17df9..690574d 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -768,6 +768,8 @@
   <string name="weather_settings_general_settings_title">گشتی</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">پیشاندانی کەش و هەوا</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">پیشاندانی لەسەر قوفڵی شاشە</string>
   <string name="app_notification_show_on_keyguard_summary">پیشاندانی تێبینی لەم بەرنامەیە لەسەر قوفڵی شاشە</string>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f7b9ed6..64fb28c 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -889,6 +889,8 @@
   <string name="weather_settings_general_settings_title">Allgemeng</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Wieder uweisen</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Um Spärschierm uweisen</string>
   <string name="app_notification_show_on_keyguard_summary">Notifikatioune vun dëser App op dem Spärschierm uweisen</string>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 505c2fd..fb3a491 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -894,6 +894,8 @@
   <string name="weather_settings_general_settings_title">Bendra</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Rodyti orus</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Rodyti ekrano užrakte</string>
   <string name="app_notification_show_on_keyguard_summary">Rodyti pranešimus iš šios programos ekrano užrakte</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 4b9fa81..5c988b2 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -552,6 +552,7 @@
   <string name="weather_settings_general_settings_title">Vispārīgi</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 23ad807..3cbbe24 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1007,6 +1007,8 @@
   <string name="weather_settings_general_settings_title">പൊതുവായത്</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">കാലാവസ്ഥ ദൃശ്യമാക്കുക</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">ലോക്ക് സ്ക്രീനിൽ ദൃശ്യമാക്കുക</string>
   <string name="app_notification_show_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index edf30c5..0171dac 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1006,6 +1006,8 @@
   <string name="weather_settings_general_settings_title">सामान्य</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">हवामान दर्शवा</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">लॉक स्क्रीनवर दर्शवा</string>
   <string name="app_notification_show_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सूचना लॉक स्क्रीनवर दर्शवा</string>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 1059add..0f00860 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1041,7 +1041,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nettverksoperatører</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Låseskjerm utydelighet</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Vis været</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Vis på låseskjerm</string>
   <string name="app_notification_show_on_keyguard_summary">Vis varslinger fra denne appen på låseskjermen</string>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 8072bbf..b073016 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1015,6 +1015,8 @@
   <string name="reset_stats_confirm">Bevestigen</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Weer weergeven</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Weergeven op vergrendelingsscherm</string>
   <string name="app_notification_show_on_keyguard_summary">Meldingen van deze app weergeven op het vergrendelingsscherm</string>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 274d19d..fb13b16 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1006,6 +1006,8 @@
   <string name="weather_settings_general_settings_title">ସାଧାରଣ</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">ପାଣିପାଗ ଦେଖାନ୍ତୁ</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଦେଖା୍ନ୍ତୁ</string>
   <string name="app_notification_show_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ନିର୍ଦେଶାବଳି ଦେଖା୍ନ୍ତୁ</string>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 15d2286..4d5ce72 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1038,7 +1038,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Rozmycie blokady ekranu</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Pokaż pogodę</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Pokaż na ekranie blokady</string>
   <string name="app_notification_show_on_keyguard_summary">Pokaż powiadomienia z tej aplikacji na ekranie blokady</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index b8470ea..359e7be 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1041,7 +1041,9 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Tela de bloqueio embaçada</string>
+  <string name="lockscreen_blur_enabled_title">Desfocar fundo</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Mostrar o tempo</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostrar na tela de bloqueio</string>
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações deste aplicativo na tela de bloqueio</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 2ceab37..5d71c1c 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -211,7 +211,7 @@
   <string name="profile_appgroup_name_title">Nome</string>
   <string name="duplicate_appgroup_name">Este nome já existe!</string>
   <string name="profile_app_delete_confirm">Remover esta aplicação?</string>
-  <string name="no_bluetooth_triggers">Não há dispositivos bluetooth emparelhados.\nToque para emparelhar um dispositivo bluetooth antes de configurar os atuadores.</string>
+  <string name="no_bluetooth_triggers">Não há dispositivos bluetooth emparelhados.\nToque para emparelhar um dispositivo Bluetooth antes de configurar os atuadores.</string>
   <string name="no_wifi_triggers">Não há pontos de acesso Wi\u2011Fi configurados.\nToque para conectar o Wi\u2011Fi antes de configurar os atuadores.</string>
   <string name="no_triggers_configured">Não há atuadores configurados. Toque para adicionar.</string>
   <string name="no_triggers_configured_nfc">Toque para establecer um novo atuador NFC.</string>
@@ -260,7 +260,7 @@
   <string name="notification_light_title">Luz de notificação</string>
   <string name="notification_light_general_title">Geral</string>
   <string name="notification_light_applist_title">Aplicações</string>
-  <string name="notification_light_phonelist_title">Telemóvel</string>
+  <string name="notification_light_phonelist_title">Telefone</string>
   <string name="notification_light_use_custom">Utilizar valores personalizados</string>
   <string name="notification_light_default_value">Padrão</string>
   <string name="notification_light_missed_call_title">Chamada perdida</string>
@@ -334,7 +334,7 @@
   <string name="app_ops_summaries_media_volume">volume de multimédia</string>
   <string name="app_ops_summaries_alarm_volume">volume do alarme</string>
   <string name="app_ops_summaries_notification_volume">volume de notificações</string>
-  <string name="app_ops_summaries_bluetooth_volume">volume bluetooth</string>
+  <string name="app_ops_summaries_bluetooth_volume">volume do bluetooth</string>
   <string name="app_ops_summaries_keep_awake">manter o ecrã ligado</string>
   <string name="app_ops_summaries_monitor_location">vigiar a localização</string>
   <string name="app_ops_summaries_monitor_high_power_location">vigiar a localização de potência alta</string>
@@ -359,7 +359,7 @@
   <string name="app_ops_summaries_turn_screen_on">ligar o ecrã</string>
   <string name="app_ops_summaries_get_accounts">obter contas</string>
   <string name="app_ops_summaries_toggle_wifi">alternar o estado do Wi-Fi</string>
-  <string name="app_ops_summaries_toggle_bluetooth">alternar o estado do bluetooth</string>
+  <string name="app_ops_summaries_toggle_bluetooth">ligar/desligar o bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">iniciar no arranque</string>
   <string name="app_ops_summaries_toggle_nfc">alternar o estado do NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">alternar o estado dos dados móveis</string>
@@ -429,7 +429,7 @@
   <string name="app_ops_labels_turn_screen_on">Ligar o ecrã</string>
   <string name="app_ops_labels_get_accounts">Obter contas</string>
   <string name="app_ops_labels_toggle_wifi">Alternar o estado do Wi-Fi</string>
-  <string name="app_ops_labels_toggle_bluetooth">Alternar o estado do bluetooth</string>
+  <string name="app_ops_labels_toggle_bluetooth">Ligar/Desligar o bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Iniciar no arranque</string>
   <string name="app_ops_labels_toggle_nfc">Alternar o estado do NFC</string>
   <string name="app_ops_labels_toggle_mobile_data">Alternar o estado dos dados móveis</string>
@@ -1013,12 +1013,12 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Meteorologia</string>
-  <string name="weather_settings_no_services_prompt">Não há serviços de provedor de meteorologia instalados</string>
-  <string name="weather_settings_button">Definições do provedor</string>
-  <string name="weather_settings_activity_not_found">Não é possível iniciar o menu de definições deste provedor</string>
-  <string name="weather_settings_add_weather_provider">Adicionar provedor de meteorologia</string>
+  <string name="weather_settings_no_services_prompt">Não há serviços de fornecedor de meteorologia instalados</string>
+  <string name="weather_settings_button">Definições do fornecedor</string>
+  <string name="weather_settings_activity_not_found">Não é possível iniciar o menu de definições deste fornecedor</string>
+  <string name="weather_settings_add_weather_provider">Adicionar fornecedor de meteorologia</string>
   <string name="weather_settings_general_settings_title">Geral</string>
-  <string name="weather_settings_providers_title">Provedores</string>
+  <string name="weather_settings_providers_title">Fornecedores</string>
   <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
@@ -1041,12 +1041,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Desfocagem do ecrã de bloqueio</string>
+  <string name="lockscreen_blur_enabled_title">Desfocar fundo</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Mostrar o tempo</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostrar no ecrã de bloqueio</string>
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações desta aplicação no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar as notificações persistentes no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar as notificações persistentes desta aplicação no ecrã de bloqueio</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Controlo avançado de rádio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desativar o carregamento automático de MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Ativar o carregamento automático de MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desativar o depurador VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Ativar o depurador VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desativar o depurador VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Ativar o depurador VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desativar o depurador WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ativar o depurador WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desativar os registos de rádio ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Ativar os registos de rádio ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Desativar os registos de Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Ativar os registos de Diag</string>
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 2bb3888..797f148 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -930,6 +930,8 @@
   <string name="weather_settings_general_settings_title">General</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Arată vremea</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Afișează pe ecranul de blocare</string>
   <string name="app_notification_show_on_keyguard_summary">Afișează notificări de la acestă aplicație pe ecranul de blocare</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 36e9758..95d499a 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1042,7 +1042,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Операторы сети</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Размытие экрана блокировки</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Сведения о погоде</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">На экране блокировки</string>
   <string name="app_notification_show_on_keyguard_summary">Показывать уведомления из этого приложения на экране блокировки</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 7f90982..0ad0d2a 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -560,6 +560,7 @@
   <string name="weather_settings_general_settings_title">ප්‍රධාන</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 1c2e679..50b5baf 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -894,6 +894,8 @@
   <string name="weather_settings_general_settings_title">Všeobecné</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Zobraziť počasie</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Zobraziť na obrazovke uzamknutia</string>
   <string name="app_notification_show_on_keyguard_summary">Zobraziť oznámenia z tejto aplikácie na uzamknutej obrazovke</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 74e6188..5a89145 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1045,12 +1045,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Omrežni operaterji</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">Zamegljenost zaklenjenega zaslona</string>
+  <string name="lockscreen_blur_enabled_title">Zamegli ozadje</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Prikaži vreme</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Prikaži na zaslonu za zakl.</string>
   <string name="app_notification_show_on_keyguard_summary">Na zaklenjenem zaslonu prikaži obvestila iz te aplikacije</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onem. vztr. obv. na zas. za zakl.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikoli ne prikaži vztrajnih obvestil iz te aplikacije na zaklenjenem zaslonu</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Izboljšan nadzor oddajnika</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Izklopi samodejno nalaganje MBN-a</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Vklopi samodejno nalaganje MBN-a</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Izklopi razhroščevanje VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Vklopi razhroščevanje VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Izklopi razhroščevanje VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Vklopi razhroščevanje VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Izklopi razhroščevanje WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Vklopi razhroščevanje WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Izklopi dnevnik oddajnika ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Vklopi dnevnik oddajnika ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Izklopi dnevnik prepoz. težav</string>
+  <string name="cm_radio_info_diag_log_off_label">Vklopi dnevnik prepoz. težav</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 347fe9a..d6a3057 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1017,7 +1017,12 @@
   <string name="weather_settings_no_services_prompt">Нема инсталираног добављача услуга временске прогнозе</string>
   <string name="weather_settings_button">Поставке добављача</string>
   <string name="weather_settings_activity_not_found">Није могуће покренути подешавање менија овог добављача</string>
+  <string name="weather_settings_add_weather_provider">Додај добављача временске услуге</string>
   <string name="weather_settings_general_settings_title">Опште</string>
+  <string name="weather_settings_providers_title">Добављачи</string>
+  <string name="weather_settings_temp_units_title">Јединица температуре</string>
+  <string name="weather_settings_temp_celsius">Целзијуси</string>
+  <string name="weather_settings_temp_fahrenheit">Фаренхајти</string>
   <string name="weather_settings_keyword">време</string>
   <string name="background_data_access">Приступ подацима у позадини</string>
   <string name="allow_background_both">Преко мрежних података &amp; Wi\u2011Fi</string>
@@ -1037,11 +1042,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Оператор мреже</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Замућење позадине</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Прикажи време</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Прикажи на закључаном екрану</string>
   <string name="app_notification_show_on_keyguard_summary">Прикажи обавештење ове апликације на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Онемогућити трајна обавештења на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никад не приказуј трајна обавештења ове апликације на закључаном екрану</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Проширена радио контрола</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Искључи MBN ауто учитавање</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Укључи MBN ауто учитавање</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Искључи VoLTE отклањање грешака</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Укључи VoLTE отклањање грешака</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Искључи VT отклањање грешака</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Укључи VT отклањање грешака</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Искључи WFC отклањање грешака</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Укључи WFC отклањање грешака</string>
+  <string name="cm_radio_info_adb_log_on_label">Искључи ADB радио евиденцију</string>
+  <string name="cm_radio_info_adb_log_off_label">Укључи ADB радио евиденцију</string>
+  <string name="cm_radio_info_diag_log_on_label">Искључи евиденцију дијагностике</string>
+  <string name="cm_radio_info_diag_log_off_label">Укључи евиденцију дијагностике</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index bcc15ba..4dc3d7d 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1026,6 +1026,8 @@ inkluderar en unik identifikation,
   <string name="reset_stats_confirm">Bekräfta</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Visa väder</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Visa på låsskärmen</string>
   <string name="app_notification_show_on_keyguard_summary">Visa aviseringar från denna app på låsskärmen</string>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 86184c0..c4af11f 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1006,6 +1006,8 @@
   <string name="weather_settings_general_settings_title">பொது</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">வானிலையை காட்டு</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">லாக் திரையில் காட்டு</string>
   <string name="app_notification_show_on_keyguard_summary">லாக் திரையில் இந்த பயன்பாடு-இல் இருந்து அறிவுறுத்தல்களை காட்டு</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 3c1b5f4..2a747eb 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1006,6 +1006,8 @@
   <string name="weather_settings_general_settings_title">సాధారణం</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">వాతావరణాన్ని చూపించు</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">లాక్ స్క్రీనును చూపుము</string>
   <string name="app_notification_show_on_keyguard_summary">ఈ ప్రోగ్రాం నుండి వచ్చే నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపుము</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index e3d5a97..787a08f 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1040,6 +1040,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ผู้ให้บริการเครือข่าย</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">แสดงสภาพอากาศ</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">แสดงบนหน้าจอล็อค</string>
   <string name="app_notification_show_on_keyguard_summary">แสดงการแจ้งเตือนจากแอปนี้บนหน้าจอล็อค</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index c2f6849..b714efd 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1041,6 +1041,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Ağ operatörleri</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Hava durumunu göster</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Kilit ekranında göster</string>
   <string name="app_notification_show_on_keyguard_summary">Kilit ekranında bu uygulamanın bildirimlerini göster</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 487370e..c4d2ab5 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1015,6 +1015,8 @@
   <string name="restrict_cellular_access_dialog_summary">كۆچمە تورغىلا باغلىنىدىغان ئەھۋالدا، بۇ ئىقتىدار تەگلىك سانلىق مەلۇماتىغا ئېھتىياجلىق پىروگراممىنىڭ خىزمەت قىلىشىنى توختىتىپ قويۇشى مۇمكىن.\n\nسىز شۇ ئەپنىڭ تەمىنلىگەن تەڭشىكىدىن سانلىق مەلۇمات ئېقىمىنى تىزگىنلەيدىغان تېخىمۇ مۇۋاپىق تاللانمىنى تاپالىشىڭىز مۇمكىن.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">ھاۋارايىنى كۆرسەت</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">قۇلۇپ ئېكراندا كۆرسىتىدۇ</string>
   <string name="app_notification_show_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ ئۇقتۇرۇشلىرىنى كۆرسىتىدۇ</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 19d74d4..33fb7c1 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -942,6 +942,8 @@
   <string name="weather_settings_general_settings_title">Головні</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Показати погоду</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">На екрані блокування</string>
   <string name="app_notification_show_on_keyguard_summary">Відображати сповіщення із цієї програми на екрані блокування</string>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 01efbbf..a7d2db9 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1040,6 +1040,8 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nhà điều hành mạng</string>
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Hiển thị thời tiết</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Hiển thị trên màn hình khóa</string>
   <string name="app_notification_show_on_keyguard_summary">Hiển thị các thông báo từ ứng dụng này trên màn hình khóa</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 37d3582..63d46c5 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1038,12 +1038,27 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">网络运营商</string>
   <!-- title for lock screen blur preference -->
-  <string name="lockscreen_blur_enabled_title">锁屏模糊</string>
+  <string name="lockscreen_blur_enabled_title">模糊背景</string>
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">显示天气</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在锁屏上显示</string>
   <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">禁用锁屏上的持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">永不在锁屏上显示来自此应用的持久通知</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">增强的无线通信控制</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">关闭 MBN 自动载入</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">开启 MBN 自动载入</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">关闭 VoLTE 调试</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">开启 VoLTE 调试</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">关闭 VT 调试</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">开启 VT 调试</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">关闭 WFC 调试</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">开启 WFC 调试</string>
+  <string name="cm_radio_info_adb_log_on_label">关闭 ADB 无线日志</string>
+  <string name="cm_radio_info_adb_log_off_label">开启 ADB 无线日志</string>
+  <string name="cm_radio_info_diag_log_on_label">关闭诊断日志</string>
+  <string name="cm_radio_info_diag_log_off_label">开启诊断日志</string>
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 0570e57..44491f5a 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -834,6 +834,8 @@
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">顯示天氣</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
   <string name="app_notification_show_on_keyguard_summary">在鎖定螢幕中顯示此應用程式的通知</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 9c5b7e9..952868b 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -871,6 +871,8 @@
   <string name="weather_settings_general_settings_title">一般</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">顯示天氣資訊</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在鎖定螢幕上顯示</string>
   <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 68d7b7d..d7e3691 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -181,6 +181,7 @@
   <!-- Weather -->
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
-- 
cgit v1.1


From 5004f924851585be3b2bb149eede87c35f3f28c8 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Tue, 7 Jun 2016 15:35:50 -0700
Subject: Bring back the custom wallpaper picker [3/5]

Change-Id: I546a6ce67627c22cfbc7f6f061c21954183936b7
TICKET: OSS-62
---
 res/values/cm_strings.xml              | 3 +++
 res/xml/security_settings_chooser.xml  | 7 +++++++
 res/xml/security_settings_password.xml | 7 +++++++
 res/xml/security_settings_pattern.xml  | 7 +++++++
 res/xml/security_settings_pin.xml      | 7 +++++++
 5 files changed, 31 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 386d090..68bd97c 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1242,4 +1242,7 @@
     <string name="cm_radio_info_diag_log_on_label">Turn off Diag log</string>
     <string name="cm_radio_info_diag_log_off_label">Turn on Diag log</string>
 
+    <!-- Lock screen wallpaper -->
+    <string name="lockscreen_wallpaper_title">Wallpaper</string>
+
 </resources>
diff --git a/res/xml/security_settings_chooser.xml b/res/xml/security_settings_chooser.xml
index 0f8a9bc..d82ad11 100644
--- a/res/xml/security_settings_chooser.xml
+++ b/res/xml/security_settings_chooser.xml
@@ -61,6 +61,13 @@
             android:title="@string/lockscreen_weather_enabled_title"
             android:defaultValue="false"/>
 
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_password.xml b/res/xml/security_settings_password.xml
index cecb26d..188f986 100644
--- a/res/xml/security_settings_password.xml
+++ b/res/xml/security_settings_password.xml
@@ -87,6 +87,13 @@
             android:title="@string/lockscreen_weather_enabled_title"
             android:defaultValue="false"/>
 
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pattern.xml b/res/xml/security_settings_pattern.xml
index a4d77d5..44fe95f 100644
--- a/res/xml/security_settings_pattern.xml
+++ b/res/xml/security_settings_pattern.xml
@@ -103,6 +103,13 @@
             android:title="@string/lockscreen_weather_enabled_title"
             android:defaultValue="false"/>
 
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
diff --git a/res/xml/security_settings_pin.xml b/res/xml/security_settings_pin.xml
index 869c16b..2547079 100644
--- a/res/xml/security_settings_pin.xml
+++ b/res/xml/security_settings_pin.xml
@@ -92,6 +92,13 @@
             android:title="@string/lockscreen_weather_enabled_title"
             android:defaultValue="false"/>
 
+        <PreferenceScreen
+            android:key="lockscreen_wallpaper"
+            android:title="@string/lockscreen_wallpaper_title" >
+            <intent
+                android:action="android.intent.action.SET_KEYGUARD_WALLPAPER" />
+        </PreferenceScreen>
+
     </PreferenceCategory>
 
 </PreferenceScreen>
-- 
cgit v1.1


From 55249369f762d7eb1b10f6e9d857f75b59e93347 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Fri, 17 Jun 2016 14:15:00 -0700
Subject: Settings : Move trust agent search index to LockscreenSettings

Ensure smart lock takes you to LockscreenSettings instead of
SecuritySettings
CYNGNOS-3053

Change-Id: I2d6f4b29cfad259cebfb3ee97b055f59a131d3de
---
 src/com/android/settings/SecuritySettings.java          | 17 +----------------
 src/com/android/settings/TrustAgentUtils.java           |  2 +-
 .../settings/cyanogenmod/LockscreenSettingsAlias.java   | 17 +++++++++++++++++
 .../android/settings/search/IndexDatabaseHelper.java    |  2 +-
 4 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 0fd5d2c..17775ab 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -1010,20 +1010,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 result.add(data);
             }
 
-            // Advanced
-            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
-            if (lockPatternUtils.isSecure(MY_USER_ID)) {
-                ArrayList<TrustAgentComponentInfo> agents =
-                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils,
-                                context.getSystemService(DevicePolicyManager.class));
-                for (int i = 0; i < agents.size(); i++) {
-                    final TrustAgentComponentInfo agent = agents.get(i);
-                    data = new SearchIndexableRaw(context);
-                    data.title = agent.title;
-                    data.screenTitle = screenTitle;
-                    result.add(data);
-                }
-            }
+
             return result;
         }
 
@@ -1032,8 +1019,6 @@ public class SecuritySettings extends SettingsPreferenceFragment
             final List<String> keys = new ArrayList<String>();
 
             LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
-            // Add options for lock/unlock screen
-            int resId = getResIdForLockUnlockScreen(context, lockPatternUtils);
 
             // Do not display SIM lock for devices without an Icc card
             TelephonyManager tm = TelephonyManager.getDefault();
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
index 109663a..7fed4ec 100644
--- a/src/com/android/settings/TrustAgentUtils.java
+++ b/src/com/android/settings/TrustAgentUtils.java
@@ -55,7 +55,7 @@ public class TrustAgentUtils {
 
     public static class TrustAgentComponentInfo {
         ComponentName componentName;
-        String title;
+        public String title;
         String summary;
         boolean disabledByAdministrator;
     }
diff --git a/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java b/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java
index d6ca06a..f89de89 100644
--- a/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java
+++ b/src/com/android/settings/cyanogenmod/LockscreenSettingsAlias.java
@@ -16,8 +16,10 @@
 
 package com.android.settings.cyanogenmod;
 
+import android.app.admin.DevicePolicyManager;
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.SecuritySettings;
+import com.android.settings.TrustAgentUtils;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.SearchIndexableRaw;
 
@@ -110,6 +112,21 @@ public class LockscreenSettingsAlias extends SecuritySettings {
                 result.add(data);
             }
 
+            // Advanced
+            final LockPatternUtils lockPatternUtils = new LockPatternUtils(context);
+            if (lockPatternUtils.isSecure(MY_USER_ID)) {
+                ArrayList<TrustAgentUtils.TrustAgentComponentInfo> agents =
+                        getActiveTrustAgents(context.getPackageManager(), lockPatternUtils,
+                                context.getSystemService(DevicePolicyManager.class));
+                for (int i = 0; i < agents.size(); i++) {
+                    final TrustAgentUtils.TrustAgentComponentInfo agent = agents.get(i);
+                    data = new SearchIndexableRaw(context);
+                    data.title = agent.title;
+                    data.screenTitle = screenTitle;
+                    result.add(data);
+                }
+            }
+
             return result;
         }
     }
diff --git a/src/com/android/settings/search/IndexDatabaseHelper.java b/src/com/android/settings/search/IndexDatabaseHelper.java
index 4fc93db..146c640 100644
--- a/src/com/android/settings/search/IndexDatabaseHelper.java
+++ b/src/com/android/settings/search/IndexDatabaseHelper.java
@@ -28,7 +28,7 @@ public class IndexDatabaseHelper extends SQLiteOpenHelper {
     private static final String TAG = "IndexDatabaseHelper";
 
     private static final String DATABASE_NAME = "search_index.db";
-    private static final int DATABASE_VERSION = 120;
+    private static final int DATABASE_VERSION = 121;
 
     public interface Tables {
         public static final String TABLE_PREFS_INDEX = "prefs_index";
-- 
cgit v1.1


From d40bcafd7b62e7e8c9ba73e7ebcd8a69f1e7b0a1 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Mon, 20 Jun 2016 13:29:59 -0700
Subject: Automatic translation import

Change-Id: I25897fe9a0ce867df8c7df0a6e3f232e23519a49
---
 res/values-af/cm_strings.xml      |   3 +-
 res/values-am/cm_strings.xml      |   1 +
 res/values-ar/cm_strings.xml      |   1 +
 res/values-as-rIN/cm_strings.xml  |   1 +
 res/values-ast-rES/cm_strings.xml |   1 +
 res/values-ast-rES/strings.xml    | 123 ++++++++++++++++++++++++++++++++++++++
 res/values-az-rAZ/cm_strings.xml  |   1 +
 res/values-be/cm_strings.xml      |   1 +
 res/values-bg/cm_strings.xml      |   1 +
 res/values-bn-rBD/cm_strings.xml  |   1 +
 res/values-br-rFR/cm_strings.xml  |   1 +
 res/values-ca/cm_strings.xml      |   1 +
 res/values-cs/cm_strings.xml      |   1 +
 res/values-csb-rPL/cm_strings.xml |   1 +
 res/values-cy/cm_strings.xml      |   1 +
 res/values-da/cm_strings.xml      |  11 ++++
 res/values-de/cm_strings.xml      |   2 +
 res/values-el/cm_strings.xml      |  15 +++++
 res/values-en-rAU/cm_strings.xml  |   1 +
 res/values-en-rGB/cm_strings.xml  |   1 +
 res/values-en-rIN/cm_strings.xml  |   1 +
 res/values-en-rPT/cm_strings.xml  |   1 +
 res/values-eo/cm_strings.xml      |   1 +
 res/values-es-rMX/cm_strings.xml  |   1 +
 res/values-es-rUS/cm_strings.xml  |   1 +
 res/values-es/cm_strings.xml      |   1 +
 res/values-et-rEE/cm_strings.xml  |   1 +
 res/values-eu-rES/cm_strings.xml  |   2 +
 res/values-fa/cm_strings.xml      |   1 +
 res/values-fi/cm_strings.xml      |   2 +
 res/values-fil-rPH/cm_strings.xml |   1 +
 res/values-fr-rCA/cm_strings.xml  |   1 +
 res/values-fr/cm_strings.xml      |   1 +
 res/values-frp-rIT/cm_strings.xml |   1 +
 res/values-fy-rNL/cm_strings.xml  |   1 +
 res/values-gd-rGB/cm_strings.xml  |   1 +
 res/values-gl-rES/cm_strings.xml  |   1 +
 res/values-gu-rIN/cm_strings.xml  |   1 +
 res/values-hi/cm_strings.xml      |   1 +
 res/values-hr/cm_strings.xml      |   1 +
 res/values-hu/cm_strings.xml      |   1 +
 res/values-hy-rAM/cm_strings.xml  |   1 +
 res/values-in/cm_strings.xml      |   1 +
 res/values-is-rIS/cm_strings.xml  |   1 +
 res/values-it/cm_strings.xml      |   4 +-
 res/values-iw/cm_strings.xml      |   1 +
 res/values-ja/cm_strings.xml      |   1 +
 res/values-ka-rGE/cm_strings.xml  |   1 +
 res/values-kk-rKZ/cm_strings.xml  |   1 +
 res/values-km-rKH/cm_strings.xml  |   1 +
 res/values-kn-rIN/cm_strings.xml  |   1 +
 res/values-ko/cm_strings.xml      |   1 +
 res/values-ku/cm_strings.xml      |   1 +
 res/values-ky-rKG/cm_strings.xml  |   1 +
 res/values-lb/cm_strings.xml      |   1 +
 res/values-lo-rLA/cm_strings.xml  |   1 +
 res/values-lt/cm_strings.xml      |   1 +
 res/values-lv/cm_strings.xml      |   1 +
 res/values-mk-rMK/cm_strings.xml  |   1 +
 res/values-ml-rIN/cm_strings.xml  |   1 +
 res/values-mn-rMN/cm_strings.xml  |   1 +
 res/values-mr-rIN/cm_strings.xml  |   1 +
 res/values-ms-rMY/cm_strings.xml  |   1 +
 res/values-my-rMM/cm_strings.xml  |   1 +
 res/values-nb/cm_strings.xml      |  16 +++++
 res/values-ne-rNP/cm_strings.xml  |   1 +
 res/values-nl/cm_strings.xml      |   1 +
 res/values-oc-rFR/cm_strings.xml  |   1 +
 res/values-or-rIN/cm_strings.xml  |   1 +
 res/values-pa-rIN/cm_strings.xml  |   1 +
 res/values-pl/cm_strings.xml      |  14 +++++
 res/values-pt-rBR/cm_strings.xml  |   1 +
 res/values-pt-rPT/cm_strings.xml  |   1 +
 res/values-rm/cm_strings.xml      |   1 +
 res/values-ro/cm_strings.xml      |   1 +
 res/values-ru/cm_strings.xml      |   1 +
 res/values-si-rLK/cm_strings.xml  |   1 +
 res/values-sk/cm_strings.xml      |   1 +
 res/values-sl/cm_strings.xml      |   2 +
 res/values-sq-rAL/cm_strings.xml  |   1 +
 res/values-sr/cm_strings.xml      |   2 +
 res/values-sv/cm_strings.xml      |   1 +
 res/values-sw/cm_strings.xml      |   1 +
 res/values-ta-rIN/cm_strings.xml  |   1 +
 res/values-te-rIN/cm_strings.xml  |   1 +
 res/values-th/cm_strings.xml      |   1 +
 res/values-tr/cm_strings.xml      |   1 +
 res/values-ug/cm_strings.xml      |   1 +
 res/values-uk/cm_strings.xml      |   1 +
 res/values-ur-rPK/cm_strings.xml  |   1 +
 res/values-uz-rUZ/cm_strings.xml  |   1 +
 res/values-vi/cm_strings.xml      |   1 +
 res/values-zh-rCN/cm_strings.xml  |   1 +
 res/values-zh-rHK/cm_strings.xml  |   1 +
 res/values-zh-rTW/cm_strings.xml  |   1 +
 res/values-zu/cm_strings.xml      |   1 +
 96 files changed, 278 insertions(+), 2 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index b0eea45..85fe607 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -826,7 +826,7 @@
   <string name="blacklist_summary_type_calls_only">oproepe</string>
   <string name="blacklist_summary_type_messages_only">boodskappe</string>
   <string name="blacklist_summary_type_calls_and_messages">oproepe en boodskappe</string>
-  <string name="blacklist_regex_title">Gebtuik jokers</string>
+  <string name="blacklist_regex_title">Gebruik jokers</string>
   <string name="blacklist_regex_summary">Gebruik . as \'n joker en * vir herhaling. Bv 123.* blokkeer nommers wat begin met 123 en .*123.* blokkeer nommers wat 123 bevat</string>
   <string name="blacklist_policy_block_calls">Blokkeer inkomende oproepe</string>
   <string name="blacklist_policy_block_messages">Blokkeer inkomende boodskappe</string>
@@ -1022,4 +1022,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Moet nooit aanhoudende kennisgewings vertoon vanuit hierdie program op die slotskerm</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index a4e5c41..fc3d58a 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1056,4 +1056,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">عدم إظهار إشعارات ثابتة من هذا التطبيق على شاشة التأمين</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 6772321..c8c4b8f 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">এই এপ্প্‌ৰ পৰা নেৰানেপেৰা অধিসূচনা লক স্ক্ৰীণত নেদেখুৱাব</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index aff4dab..ce45c03 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -1007,4 +1007,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="cm_radio_info_adb_log_off_label">Activar el rexistru en ADB de la radio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactivar el rexistru Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activar el rexistru Diag</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 29518a8..6561960 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -26,7 +26,9 @@
   <!-- Strings for Dialog deny button -->
   <string name="deny">Refugar</string>
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <string name="dlg_close">Zarrar</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <string name="dlg_switch">Camudar</string>
   <!-- Device Info -->
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
   <string name="device_info_default">Desconocíu</string>
@@ -195,6 +197,7 @@
   <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_disconnect_all_profiles">Va finar la conexón con&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;.</string>
   <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <string name="bluetooth_empty_list_user_restricted">Nun tienes permisu pa camudar los axustes de Bluetooth.</string>
   <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
   <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
   <string name="bluetooth_is_disconnect_question">Desconeutar <xliff:g id="device_name">%1$s</xliff:g>?</string>
@@ -224,6 +227,7 @@
   <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
   <string name="bluetooth_permission_request">"Solicitú de permisu de Bluetooth"</string>
   <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <string name="bluetooth_ask_enablement">Una app quier activar Bluetooth nesti preséu.</string>
   <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
   <string name="bluetooth_ask_discovery" product="tablet">Una aplicación quier facer visible la to tablet pa otros preseos Bluetooth mientres <xliff:g id="TIMEOUT">%1$d</xliff:g> segundos.</string>
   <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
@@ -261,7 +265,9 @@
   <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
   <string name="bluetooth_pb_acceptance_dialog_text">%1$s quier acceder a los contautos y al historial de llamaes. ¿Quies permitir l\'accesu a %2$s?</string>
   <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <string name="bluetooth_remember_choice">Nun volver a entrugar</string>
   <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <string name="bluetooth_pb_remember_choice">Nun volver a entrugar</string>
   <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
   <string name="bluetooth_map_request">"Solicitú d'accesu a mensaxes"</string>
   <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
@@ -314,12 +320,15 @@
   <!-- HTTP proxy settings. Button to get rid of error box-->
   <string name="proxy_error_dismiss">Aceutar</string>
   <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <string name="proxy_error_invalid_host">El nome de host inxertáu nun ye válidu.</string>
   <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <string name="proxy_error_invalid_exclusion_list">La llista d\'esclusión qu\'escribisti nun ye correcta. Escribi una llista separtada por comes de dominios escluyíos.</string>
   <!-- HTTP proxy settings. Error msg -->
   <string name="proxy_error_empty_port">Tienes de completar el campu de puertu.</string>
   <!-- HTTP proxy settings. Error msg -->
   <string name="proxy_error_empty_host_set_port">El campu de puertu tien de tar baleru si\'l campu de host tamién lo ta.</string>
   <!-- HTTP proxy settings. Error msg -->
+  <string name="proxy_error_invalid_port">El nome de host inxertáu nun ye válidu.</string>
   <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
   <string name="proxy_warning_limited_support">El restolador usa\'l proxy HTTP, pero nun puen usalu otres aplicaciones.</string>
   <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
@@ -419,7 +428,9 @@
   <!-- Message when the SD card is being used by the computer as mass storage -->
   <string name="sdcard_settings_mass_storage_status" product="default">La tarxeta SD ta usándose como preséu d\'almacenamientu masivu.</string>
   <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <string name="sdcard_settings_unmounted_status" product="nosdcard">Ye seguro estrayer l\'almacenamientu USB.</string>
   <!-- Message when it is safe to remove the SD card -->
+  <string name="sdcard_settings_unmounted_status" product="default">Ye seguro estrayer la tarxeta SD.</string>
   <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
   <string name="sdcard_settings_bad_removal_status" product="nosdcard">USB estrayíu n\'usu</string>
   <!-- Error message when the SD card was removed without properly unmounting -->
@@ -485,11 +496,14 @@
   <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
   <string name="wireless_networks_settings_title">Conexones inalámbriques y redes</string>
   <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <string name="radio_controls_summary">Alministrar Wi‑Fi, Bluetooth, mou avión, redes móviles y redes VPN</string>
   <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <string name="cellular_data_title">Datos móviles</string>
   <!-- check box Calls title [CHAR LIMIT=30] -->
   <string name="calls_title">Llamaes</string>
   <!-- check box SMS Messges title [CHAR LIMIT=30] -->
   <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <string name="cellular_data_summary">Permitir usu de datos en redes móviles</string>
   <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
   <string name="allow_data_usage_title">Permitir usu de datos n\'itinerancia</string>
   <!-- mobile network settings screen, setting check box title -->
@@ -569,11 +583,13 @@
   <!-- Security settings screen, setting option summary to change screen timeout -->
   <string name="lock_after_timeout_summary">Tres <xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> dempués de suspender</string>
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <string name="lock_immediately_summary_with_exception">Inmediatamente dempués de la suspensión, sacante cuando <xliff:g id="trust_agent_name">%1$s</xliff:g> caltién la pantalla desbloquiada</string>
   <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
   <string name="lock_after_timeout_summary_with_exception"><xliff:g id="timeout_string">%1$s</xliff:g> dempués d\'activar el mou de suspensión, sacante si <xliff:g id="trust_agent_name">%2$s</xliff:g> caltién el preséu desbloquiáu</string>
   <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
   <string name="show_owner_info_on_lockscreen_label">Amosar datos del propietariu na pantalla de bloquéu</string>
   <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <string name="owner_info_settings_title">Mensaxe bloq. pant.</string>
   <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
   <string name="security_enable_widgets_title">Habilitar widgets</string>
   <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
@@ -581,7 +597,9 @@
   <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
   <string name="owner_info_settings_summary">Ensin seguridá</string>
   <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <string name="owner_info_settings_status"><xliff:g id="count" example="90">%1$d</xliff:g> / <xliff:g id="count" example="100">%2$d</xliff:g></string>
   <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <string name="owner_info_settings_edit_text_hint">Por exemplu, Android de Xurde.</string>
   <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
   <string name="user_info_settings_title">Información del usuariu</string>
   <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
@@ -604,20 +622,34 @@
   <string name="security_passwords_title">Contraseñes</string>
   <!-- Fingerprint enrollment and settings -->
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <string name="security_settings_fingerprint_preference_title">Buelga dixital</string>
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <string name="fingerprint_manage_category_title">Remanar buelgues dixitales</string>
   <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <string name="fingerprint_usage_category_title">Usar buelga dixital pa</string>
   <!-- Preference to add another fingerprint -->
+  <string name="fingerprint_add_title">Amestar buelga dixital</string>
   <!-- switch for allowing fingerprint to be used for keyguard -->
+  <string name="fingerprint_enable_keyguard_toggle_title">bloquéu de pantalla</string>
   <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <plurals name="security_settings_fingerprint_preference_summary">
+    <item quantity="one">Configuróse <xliff:g id="count">%1$d</xliff:g> buelga dixital</item>
+    <item quantity="other">Configuráronsese <xliff:g id="count">%1$d</xliff:g> buelgues dixitales</item>
+  </plurals>
   <!-- message shown in summary field when no fingerprints are registered -->
   <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <string name="security_settings_fingerprint_enroll_onboard_title">Configuración de buelga dixital</string>
   <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
          alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <string name="security_settings_fingerprint_enroll_onboard_message">Si quies usar la to buelga dixital pa desbloquiar la pantalla o confirmar compres, tienes de facer lo siguiente:</string>
   <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
          the user needs to do. -->
+  <string name="security_settings_fingerprint_enroll_onboard_message_1">Axustar el métodu secundariu de bloquéu de pantalla</string>
   <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
          the user needs to do. -->
+  <string name="security_settings_fingerprint_enroll_onboard_message_2">Amestar buelga dixital</string>
   <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <string name="security_settings_fingerprint_enroll_introduction_title">Desbloquiar con buelga dixital</string>
   <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
   <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
   <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
@@ -1779,6 +1811,7 @@
   <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <string name="memory_music_usage">Audiu (música, tonos, etc.)</string>
   <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <string name="memory_media_misc_usage">Otros ficheros</string>
   <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
   <string name="memory_media_cache_usage">Datos almacenaos en caché</string>
   <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
@@ -1826,7 +1859,9 @@
   <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
   <!-- SD card eject error dialog title   -->
   <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <string name="dlg_error_unmount_text" product="nosdcard">Nun pudo desmontase l\'almacenamientu USB. Inténtalo dempués.</string>
   <!-- SD card eject error dialog text   -->
+  <string name="dlg_error_unmount_text" product="default">Nun pudo desmontase la tarxeta SD. Inténtalo dempués.</string>
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
   <string name="unmount_inform_text" product="nosdcard">Va desactivase l\'almacenamientu USB.</string>
   <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
@@ -1842,15 +1877,23 @@
   <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
   <string name="storage_menu_rename">Camudar nome</string>
   <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_mount">Montar</string>
   <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_unmount">Espulsar</string>
   <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_format">Formatu</string>
   <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_format_public">Formatiar como almac. portátil</string>
   <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_format_private">Formatiar como almac. internu</string>
   <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_migrate">Migrar los datos</string>
   <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
   <string name="storage_menu_forget">Desaniciar</string>
   <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_set_up">Configurar</string>
   <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <string name="storage_menu_explore">Esplorar</string>
   <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
   <string name="storage_title_usb">Conexón USB a equipu</string>
   <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
@@ -1862,26 +1905,48 @@
   <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
   <string name="usb_ptp_title">Cámara (PTP)</string>
   <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <string name="usb_ptp_summary">Permitir tresferir semeyes col software de la cámara y ficheros a equipos que nun almitan MTP</string>
   <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <string name="usb_midi_title">MIDI</string>
   <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <string name="usb_midi_summary">Permite que les apps compatibles con MIDI funcionen con software MIDI per aciu d\'USB nel to equipu.</string>
   <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
   <string name="storage_other_users">Otros usuarios</string>
   <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <string name="storage_internal_title">Almacenamientu del preséu</string>
   <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <string name="storage_external_title">Almacenamientu portátil</string>
   <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <string name="storage_volume_summary"><xliff:g id="used" example="1.2GB">%1$s</xliff:g> n\'usu de <xliff:g id="total" example="32GB">%2$s</xliff:g></string>
   <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <string name="storage_size_large"><xliff:g id="number" example="128">^1</xliff:g>"<small><small> <xliff:g id="unit" example="KB">^2</xliff:g>"</small></small></string>
   <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <string name="storage_volume_used">Usaos de <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
   <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <string name="storage_volume_used_total">Usu total de <xliff:g id="total" example="32GB">%1$s</xliff:g></string>
   <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <string name="storage_mount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> ta montáu</string>
   <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <string name="storage_mount_failure">Nun pudo montase <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <string name="storage_unmount_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> espulsóse de mou seguru</string>
   <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <string name="storage_unmount_failure"><xliff:g id="name" example="SD card">%1$s</xliff:g> nun pudo espulsase de mou seguru</string>
   <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <string name="storage_format_success"><xliff:g id="name" example="SD card">%1$s</xliff:g> formatióse</string>
   <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <string name="storage_format_failure">Nun pudo montase <xliff:g id="name" example="SD card">%1$s</xliff:g></string>
   <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <string name="storage_rename_title">Renomar almacenamientu</string>
   <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <string name="storage_dialog_unmounted">Esti <xliff:g id="name" example="SD card">^1</xliff:g> espulsóse de mou seguru pero aínda ta disponible.
+\n\nPa usar <xliff:g id="name" example="SD card">^1</xliff:g>, tienes d\'activalu primero.</string>
   <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <string name="storage_dialog_unmountable"><xliff:g id="name" example="SD card">^1</xliff:g> ta toyíu.
+\n\nPa usar <xliff:g id="name" example="SD card">^1</xliff:g>, tienes de configuralo primero.</string>
   <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <string name="storage_dialog_unsupported">Esti preséu nun sofita <xliff:g id="name" example="SD card">^1</xliff:g>.
+\n\nPa usar <xliff:g id="name" example="SD card">^1</xliff:g> nesti preséu, tienes de configuralo primero.</string>
   <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
   <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
   <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
@@ -1907,6 +1972,7 @@
   <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
   <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
   <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <string name="storage_wizard_format_confirm_title">Formatiar como almacenamientu internu</string>
   <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
   <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
   <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
@@ -2092,6 +2158,7 @@
   <!-- USB tethered subtext - shown when USB is connected and being tethered -->
   <string name="usb_tethering_active_subtext">Ancláu a rede</string>
   <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <string name="usb_tethering_storage_active_subtext">Nun pue facese l\'anclaxe a rede si l\'almacenamientu USB ta n\'usu</string>
   <!-- USB unavailable subtext - shown when USB is not connected -->
   <string name="usb_tethering_unavailable_subtext">USB non coneutáu</string>
   <!-- USB unavailable subtext - shown when USB is not connected -->
@@ -2102,24 +2169,37 @@
   <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
   <string name="bluetooth_tether_checkbox_text">Anclaxe de Bluetooth</string>
   <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_available_subtext" product="tablet">Compartiendo conexón a Internet de la tablet</string>
   <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_available_subtext" product="default">Compartiendo conexón a Internet del teléfonu</string>
   <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <string name="bluetooth_tethering_device_connected_subtext" product="tablet">Compartiendo conexón a Internet de la tablet con 1 preséu</string>
   <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <string name="bluetooth_tethering_device_connected_subtext" product="default">Compartiendo conexón a Internet del teléfonu con 1 preséu</string>
   <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <string name="bluetooth_tethering_devices_connected_subtext" product="tablet">Compartiendo conexón a Internet de la tablet con <xliff:g id="connectedDeviceCount">%1$d</xliff:g> preseos</string>
   <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <string name="bluetooth_tethering_devices_connected_subtext" product="default">Compartiendo conexón a Internet del teléfonu con <xliff:g id="connectedDeviceCount">%1$d</xliff:g> preseos</string>
   <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_off_subtext_config">Compartiendo la conexón a Internet de <xliff:g id="device_name">%1$d</xliff:g></string>
   <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_off_subtext" product="tablet">Nun se ta compartiendo conexón a Internet de la tablet</string>
   <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_off_subtext" product="default">Nun se ta compartiendo conexón a Internet del teléfonu</string>
   <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
   <string name="bluetooth_tethering_errored_subtext">Non ancláu</string>
   <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <string name="bluetooth_tethering_overflow_error">Nun pue anclase a más de <xliff:g id="maxConnection">%1$d</xliff:g> preseos.</string>
   <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
   <string name="bluetooth_untether_blank">Va desactivase l\'anclaxe a rede de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.</string>
   <!-- Tethering help button - calls up a web view with general tethering info -->
   <string name="tethering_help_button_text">Ayuda</string>
   <!-- Wireless controls, item title to go into the network settings -->
+  <string name="network_settings_title">Redes móviles</string>
   <!-- Mobile plan [CHAR LIMIT=35]-->
+  <string name="manage_mobile_plan_title" translatable="true">Plan móvil</string>
   <!-- SMS Application [CHAR LIMIT=35]-->
+  <string name="sms_application_title" translatable="true">Aplicación de SMS</string>
   <string name="sms_change_default_dialog_title" translatable="true">¿Camudar aplicación de SMS?</string>
   <string name="sms_change_default_dialog_text" translatable="true">Usar <xliff:g id="new_app">%1$s</xliff:g> en cuenta de <xliff:g id="current_app">%2$s</xliff:g> como aplicación de SMS?</string>
   <string name="sms_change_default_no_previous_dialog_text" translatable="true">¿Usar <xliff:g id="NEW_APP">%s</xliff:g> como aplicación de SMS?</string>
@@ -2165,17 +2245,31 @@
   <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
   <string name="location_mode_screen_title">Mou de llocalización</string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <string name="location_mode_high_accuracy_description">Usar GPS, Wi-Fi, Bluetooth o redes móviles pa determinar la llocalización </string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <string name="location_mode_battery_saving_description">Usar Wi-Fi, Bluetooth o redes móviles pa determinar la llocalización</string>
   <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <string name="location_mode_sensors_only_description">Determinar llocalización con GPS</string>
   <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
       to scanning settings activity -->
+  <string name="location_menu_scanning">Analizando</string>
   <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <string name="location_scanning_screen_title">Analizando</string>
   <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <string name="location_scanning_wifi_always_scanning_title">Escanéu Wi‑Fi</string>
   <!-- Preference description text for Wi-Fi always scanning -->
+  <string name="location_scanning_wifi_always_scanning_description">Ameyorar precisión de la llocalización
+      permitiendo que los servicios y les apps del sistema deteuten redes Wi-Fi en cualquier momentu.</string>
   <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <string name="location_scanning_bluetooth_always_scanning_title">Escanéu de Bluetooth</string>
   <!-- Description text for Bluetooth always scanning -->
+  <string name="location_scanning_bluetooth_always_scanning_description">
+        Ameyorar precisión de la llocalización permitiendo que los servicios y les apps del sistema deteuten preseos
+        Bluetooth en cualquier momentu.</string>
   <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <string name="location_network_based">Llocalización de Wi-Fi y rede móvil</string>
   <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <string name="location_neighborhood_level">Permitir que les apps usen el serviciu de llocalización de Google pa calcular el to allugamientu (van unviase datos anónimos a Google)</string>
   <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
   <string name="location_neighborhood_level_wifi">Llocalización determinada por Wi-Fi</string>
   <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
@@ -2233,6 +2327,7 @@
   <!-- Phone Manual -->
   <string name="settings_manual_activity_title">Manual</string>
   <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <string name="settings_manual_activity_unavailable">Hebo un fallu al cargar el manual.</string>
   <!-- Title for actual Settings license activity. -->
   <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
   <string name="settings_license_activity_title">Llicencies de códigu abiertu</string>
@@ -2245,6 +2340,7 @@
   <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
   <string name="settings_safetylegal_activity_title">Información de seguridá</string>
   <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <string name="settings_safetylegal_activity_unreachable">Nun tienes conexón de datos. Pa ver esta información, vete a %s dende cualquier equipu coneutáu a Internet.</string>
   <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
   <string name="settings_safetylegal_activity_loading">Cargando…</string>
   <!-- Lock Pattern settings -->
@@ -2261,7 +2357,9 @@
   <!-- Header on password confirm screen [CHAR LIMIT=30] -->
   <string name="lockpassword_confirm_your_pin_header">Confirma\'l númberu PIN</string>
   <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <string name="lockpassword_confirm_passwords_dont_match">Les contraseñes nun concasen</string>
   <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <string name="lockpassword_confirm_pins_dont_match">Los númberos PIN nun concasen</string>
   <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
   <string name="lockpassword_choose_lock_generic_header">Métodu de desbloquéu</string>
   <!-- Toast shown if setting password was successful -->
@@ -2272,16 +2370,21 @@
   <string name="lockpassword_pattern_set_toast">Afitóse\'l patrón.</string>
   <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
          particular operation. [CHAR LIMIT=70]-->
+  <string name="lockpassword_confirm_your_pattern_generic">Pa continuar, usa\'l patrón del preséu.</string>
   <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
          particular operation. [CHAR LIMIT=70]-->
+  <string name="lockpassword_confirm_your_pin_generic">Pa continuar, inxerta\'l PIN del preséu.</string>
   <!-- Message to be used to explain the user that he needs to enter his password to continue a
          particular operation. [CHAR LIMIT=70]-->
+  <string name="lockpassword_confirm_your_password_generic">Pa continuar, inxerta la contraseña del preséu.</string>
   <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect PIN [CHAR LIMIT=30] -->
   <!-- Security & location settings screen, change security method screen instruction if user
          enters incorrect password [CHAR LIMIT=30] -->
+  <string name="lockpassword_invalid_password">Contraseña incorreuta</string>
   <!-- Security & location settings screen, change unlock pattern screen instruction if user
          draws incorrect pattern [CHAR LIMIT=30] -->
+  <string name="lockpattern_need_to_unlock_wrong">Patrón incorreutu</string>
   <!-- Lock Pattern settings -->
   <!-- Security & location settings screen, header -->
   <string name="lock_settings_title">Seguranza de preséu</string>
@@ -2332,6 +2435,7 @@
   <string name="lockpattern_settings_help_how_to_record">Cómo crear un patrón de desbloquéu</string>
   <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
          too many incorrect attempts [CHAR LIMIT=120]-->
+  <string name="lockpattern_too_many_failed_confirmation_attempts">Abondos intento incorreutos. Vuelvi intentalo en <xliff:g id="number">%d</xliff:g> segundos.</string>
   <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
   <string name="activity_not_found">L\'aplicación nun ta instalada nel teléfonu.</string>
   <!-- Applications Settings -->
@@ -2366,6 +2470,7 @@
   <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
   <string name="storage_label">Almacenamientu</string>
   <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <string name="auto_launch_label">Abrir de mou predetermináu</string>
   <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
   <string name="auto_launch_label_generic">Valores predeterminaos</string>
   <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
@@ -2409,7 +2514,9 @@
   <!-- Manage applications, restore updated system application to factory version -->
   <string name="app_factory_reset">Desinstalar anovamientos</string>
   <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <string name="auto_launch_enable_text">Escoyisti aniciar esta app de mou predetermináu pa dalgunes aiciones.</string>
   <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <string name="always_allow_bind_appwidgets_text">Permitisti qu\'esta aplicación pueda crear widgets y acceder a los datos.</string>
   <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
   <string name="auto_launch_disable_text">Nun s\'afitaron valores predeterminaos</string>
   <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
@@ -2482,13 +2589,16 @@
   <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
   <string name="clear_data_dlg_title">¿Desaniciar datos de l\'aplicación?</string>
   <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <string name="clear_data_dlg_text">Tolos datos d\'esta aplicación van desaniciase de mou permanente. Esto inclúi tolos ficheros, axustes, cuentes, bases de datos, etc.</string>
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <string name="dlg_ok">Aceutar</string>
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
   <string name="dlg_cancel">Encaboxar</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <string name="app_not_found_dlg_text"> Nun s\'atopó l\'aplicación na llista d\'aplicaciones instalaes.</string>
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <string name="clear_data_failed">Nun pudieron llipiase los datos d\'aplicaciones.</string>
   <!-- Manage applications, factory reset dialog title for system applications. -->
   <string name="app_factory_reset_dlg_title">¿Desinstalar aplicaciones?</string>
   <!-- Manage applications, factory reset option dialog text for system applications. -->
@@ -2496,6 +2606,7 @@
   <!-- Manage applications, title for dialog if clear data fails-->
   <string name="clear_failed_dlg_title">Desaniciar datos</string>
   <!-- Manage applications, text for dialog if clear data fails-->
+  <string name="clear_failed_dlg_text">Nun pudieron llimpiase los datos de l\'aplicación.</string>
   <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
   <string name="security_settings_desc" product="tablet">Esta aplicación pue acceder a los siguientes elementos de la tablet:</string>
   <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
@@ -2521,7 +2632,9 @@
   <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
   <string name="security_settings_premium_sms_desc">Unviar SMS premium</string>
   <string name="computing_size">Calculando…</string>
+  <string name="invalid_size_value">Nun pudo calculase\'l tamañu del paquete.</string>
   <!-- String displayed when list is empty -->
+  <string name="empty_list_msg">Nun tienes instalada nenguna aplicación esterna.</string>
   <!-- Manage applications, version string displayed in app snippet -->
   <string name="version_text">versión <xliff:g id="VERSION_NUM">%1$s</xliff:g></string>
   <!-- Manage applications, text for Move button -->
@@ -2539,12 +2652,16 @@
   <string name="moving">Moviendo</string>
   <!-- Manage applications, text for move error messages -->
   <string name="insufficient_storage">Nun hai espaciu abondu d\'almacenamientu.</string>
+  <string name="does_not_exist">L\'aplicación nun esiste.</string>
   <string name="app_forward_locked">L\'aplicación ta protexida escontra copies.</string>
+  <string name="invalid_location">L\'allugamientu d\'instalación nun ye válidu.</string>
+  <string name="system_package">Los anovamientos del sistema nun pue instalase en medios esternos.</string>
   <string name="force_stop_dlg_title">¿Forciar detención?</string>
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
   <string name="force_stop_dlg_text">Si se detién una aplicación, ye dable que nun funcione correcho.</string>
   <!-- Manage applications, text for dialog when moving an app -->
   <!-- Manage applications, text for dialog moving an app -->
+  <string name="move_app_failed_dlg_text">Nun pudo movese l\'aplicación. <xliff:g id="reason">%1$s</xliff:g></string>
   <!-- Manage applications, application installation location title -->
   <string name="app_install_location_title">Llocalización d\'instalación preferida</string>
   <!-- Manage applications. application installation location summary -->
@@ -2552,7 +2669,9 @@
   <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
   <string name="app_disable_dlg_title">¿Inhabilitar aplicación integrada?</string>
   <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <string name="app_disable_dlg_positive">Deshabilitar app</string>
   <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <string name="app_disable_dlg_text">Si deshabilites esta app, ye dable qu\'otres apps nun funcionen correutamente.</string>
   <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
   <string name="app_special_disable_dlg_title">¿Quies desaniciar los datos ya inhabilitar l\'aplicación?</string>
   <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
@@ -3951,6 +4070,7 @@
   <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
   <string name="sync_item_title"><xliff:g id="authority" example="Calendar">%s</xliff:g></string>
   <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <string name="cant_sync_dialog_title">Nun pue sincronizase de mou manual</string>
   <!-- Messaage shown in dialog when you can't manually sync -->
   <string name="cant_sync_dialog_message">La sincronización d\'esti elementu nun ta disponible nesti momentu. Pa modificar la preferencia, activa temporalmente les conexones automátiques y la sincronización automática.</string>
   <string name="wimax_settings">4G</string>
@@ -4087,6 +4207,7 @@
   <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
   <string name="debug_applications_category">Aplicaciones</string>
   <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <string name="immediately_destroy_activities">Nun caltener actividaes</string>
   <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
   <string name="immediately_destroy_activities_summary">Destruir actividaes cuando l\'usuariu dexe d\'usales</string>
   <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
@@ -4138,6 +4259,7 @@
   <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
   <string name="data_usage_menu_cellular_networks">Redes móviles</string>
   <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <string name="data_usage_cellular_data_summary">Posáu na llende</string>
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
   <string name="account_settings_menu_auto_sync">Sincronización automática</string>
   <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
@@ -4195,6 +4317,7 @@
   <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
   <string name="data_usage_app_restrict_background">Restrinxir datos d\'apps de fondu</string>
   <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <string name="data_usage_app_restrict_background_summary">Deshabilita los datos de fondu en redes móviles.</string>
   <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
   <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
   <string name="data_usage_app_restrict_dialog_title">¿Restrinxir conexones automátiques?</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 3fd7fed..f738da1 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -717,4 +717,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilid ekranında bu tətbiqmənin davamlı bildirişlərini heç vaxt göstərmə</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 379014b..64dfb5c 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -1021,4 +1021,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць шторазовыя апавяшчэнні з гэтага дадатку на экране блакавання</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 6325ae4..1e611e6 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1064,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">Включване на ADB радио лог</string>
   <string name="cm_radio_info_diag_log_on_label">Изключване не Diag log</string>
   <string name="cm_radio_info_diag_log_off_label">Включване на Diag log</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 4f1a832..1545980 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -564,4 +564,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 179558f..33e39a2 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1064,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">Activa el registre ADB de la ràdio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactiva el registre Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activa el registre Diag</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 4ed25ce..763be4d 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1064,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">Zapnout protokol ADB radio</string>
   <string name="cm_radio_info_diag_log_on_label">Vypnout protokol Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Zapnout protokol Diag</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 850e49f..cae5f56 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -999,14 +999,23 @@
   <!-- Weather -->
   <string name="weather_settings_title">Vejr</string>
   <string name="weather_settings_button">Udbyderindstillinger</string>
+  <string name="weather_settings_add_weather_provider">Tilføj vejrudbyder</string>
   <string name="weather_settings_general_settings_title">Generelt</string>
+  <string name="weather_settings_providers_title">Udbydere</string>
+  <string name="weather_settings_temp_units_title">Temperaturenhed</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">vejr</string>
+  <string name="allow_background_wlan">Kun via Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen adgang</string>
   <string name="mobile_data_alert">Mobildata alarm</string>
   <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
   <string name="reset_stats_confirm">Bekræft</string>
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Netværksoperatører</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Sløring af baggrund</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Vis vejr</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1015,5 +1024,7 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende meddelelser på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldrig vedvarende meddelelser fra denne app på låseskærmen</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Udvidet radiokontrol</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 42b96ef..c091514 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1041,6 +1041,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netzbetreiber</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Hintergrund weichzeichnen</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Wetter anzeigen</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1063,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">ADB-Modemprotokoll einschalten</string>
   <string name="cm_radio_info_diag_log_on_label">Diagnoseprotokoll ausschalten</string>
   <string name="cm_radio_info_diag_log_off_label">Diagnoseprotokoll einschalten</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index d86a9f3..c109e3d 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1054,5 +1054,20 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Απενεργ. επίμονης ειδοποίησης στην οθόνη κλειδώματος</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Να μην εμφανίζονται ποτέ επίμονες ειδοποιήσεις από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Προηγμένος έλεγχος modem</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Απενεργοποίηση αυτόματης φόρτωσης MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Ενεργοποίηση αυτόματης φόρτωσης MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Απενεργοποίηση εντοπισμού σφαλμάτων VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Ενεργοποίηση εντοπισμού σφαλμάτων VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Απενεργοποίηση εντοπισμού σφαλμάτων VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Ενεργοποίηση εντοπισμού σφαλμάτων VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Απενεργοποίηση εντοπισμού σφαλμάτων WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Ενεργοποίηση εντοπισμού σφαλμάτων WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Απενεργοποίηση καταγραφής ADB modem</string>
+  <string name="cm_radio_info_adb_log_off_label">Ενεργοποίηση καταγραφής ADB modem</string>
+  <string name="cm_radio_info_diag_log_on_label">Απενεργοποίηση καταγραφής Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Ενεργοποίηση καταγραφής Diag</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Ταπετσαρία</string>
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index b81f4f6..4570619 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -776,4 +776,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 01f2007..143c164 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -198,4 +198,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 75cacb5..f6da7bb 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -920,4 +920,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index ac95f07..6aca350 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -855,4 +855,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Neniam montri daŭrajn atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index dd11186..32ae31a 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -300,4 +300,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index a80b1b1..976c32e 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1050,4 +1050,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla bloqueada</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d97e793..d89db53 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1057,4 +1057,5 @@
   <string name="cm_radio_info_adb_log_off_label">Activar el registro en ADB de la radio</string>
   <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activar el registro Diag</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index fbde428..18c86a4 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -895,4 +895,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ära kunagi näita püsivaid teavitusi sellelt rakenduselt lukustuskuval</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 0781914..e504799 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1064,4 +1064,6 @@
   <string name="cm_radio_info_adb_log_off_label">Gaitu ADB irrati egunkaria</string>
   <string name="cm_radio_info_diag_log_on_label">Ezgaitu Diag egunkaria</string>
   <string name="cm_radio_info_diag_log_off_label">Gaitu Diag egunkaria</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Horma-papera</string>
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index c6d55f6..39e4caf 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -904,4 +904,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">اعلان‌های پایدار این برنامه هرگز در قفل صفحه نشان داده نشود</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 4463fa7..199c16b 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1064,4 +1064,6 @@
   <string name="cm_radio_info_adb_log_off_label">Ota ADB radio log käyttöön</string>
   <string name="cm_radio_info_diag_log_on_label">Poista Diag log käytöstä</string>
   <string name="cm_radio_info_diag_log_off_label">Ota Diag log käyttöön</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Taustakuva</string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 7866d69..065c738 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1050,4 +1050,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ne jamais afficher les notifications persistantes de cette application sur l\'écran de verrouillage</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 03a24b3..b6b3660 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -194,4 +194,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 9904da1..ff52a5b 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -440,4 +440,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index c6eed40..d2c7f8c 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી નિરંતર સૂચનાઓ ક્યારેય દર્શાવવા નહીં</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 7a96fbc..80460c2 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -868,4 +868,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">इस ऐप की अधिसूचनाओं को कभी भी लॉक स्क्रीन पर नहीं दिखाएँ</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 4f57bf5..178344f 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1065,4 +1065,5 @@
   <string name="cm_radio_info_adb_log_off_label">Uključi ADB radio zapisnik</string>
   <string name="cm_radio_info_diag_log_on_label">Isključi Diag zapisnik</string>
   <string name="cm_radio_info_diag_log_off_label">Uključi Diag zapisnik</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 332caf6..14a3875 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 1da7aec..d9d7b30 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1049,4 +1049,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Tidak pernah menampilkan pemberitahuan tetap dari aplikasi ini pada layar kunci</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 4fdb62e..c2cb667 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1045,7 +1045,7 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Sfocatura sfondo</string>
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">Visualizza meteo</string>
+  <string name="lockscreen_weather_enabled_title">Mostra meteo</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Mostra nella schermata di blocco</string>
   <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
@@ -1066,4 +1066,6 @@
   <string name="cm_radio_info_adb_log_off_label">Attiva log radio ADB</string>
   <string name="cm_radio_info_diag_log_on_label">Disattiva log Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Attiva log Diag</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Sfondo</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index a88f4e8..1e7b778 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1055,4 +1055,5 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">כיבוי טעינת MBN אוטומטית</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">הפעלת טעינת MBN אוטומטית</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 55efcf0..47f2e5b 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1049,4 +1049,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">このアプリからの常駐する通知をロック画面に表示しない</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 7a3f7f0..e889c22 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಎಂದಿಗೂ ಈ ಆಪ್‍ನಿಂದ ನಿರಂತರ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಬೇಡ</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 80ade0a..c62d6f4 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1043,4 +1043,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">이 앱의 상주 알림을 잠금화면에 표시하지 않음</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 690574d..bbf1990 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -777,4 +777,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">هەرگیز بەبەردەوامی تێبینی پیشان مەدە لەسەر ئەم بەرنامەیە لەسەر قوفڵی سەر شاشە</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 64fb28c..940f87f 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -898,4 +898,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ni dauerhaft Notifikatiounen op de Spärschierm uweisen</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index fb3a491..8eee280 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -903,4 +903,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Niekada nerodyti nuolatinių pranešimų iš šios programos ekrano užrakte</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 5c988b2..72c4870 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -556,4 +556,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 3cbbe24..6c4365b 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1016,4 +1016,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് തുടരെയുള്ള അറിയിപ്പുകള്‍ ദൃശ്യമാക്കരുത്</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 0171dac..396fea4 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सातत्यपूर्ण सूचना लॉक स्क्रीनवर कधीही दाखवू नका</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 0f00860..f275c5c 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1041,6 +1041,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Nettverksoperatører</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Gjør bakgrunn utydelig</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Vis været</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1049,5 +1050,20 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende varsler på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldri vedvarende meldinger fra denne appen på låseskjermen</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Forbedret radio kontroll</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Slå av MBN automatisk innlasting</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Slå på MBN automatisk innlasting</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Slå av VoLTE debug</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Slå på VoLTE debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Slå av VT debug</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Slå på VT debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Slå av WFC debug</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Slå på WFC debug</string>
+  <string name="cm_radio_info_adb_log_on_label">Slå av ADB radio logg</string>
+  <string name="cm_radio_info_adb_log_off_label">Slå på ADB radio logg</string>
+  <string name="cm_radio_info_diag_log_on_label">Slå av Diag logg</string>
+  <string name="cm_radio_info_diag_log_off_label">Slå på Diag logg</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Bakgrunn</string>
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index b073016..cad760f 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1024,4 +1024,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Permanente meldingen van deze app niet weergeven op het vergrendelingsscherm</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index fb13b16..0371738 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି କଦାପି ଦେଖାନ୍ତୁ ନାହିଁ</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 4d5ce72..87e8e98 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1047,4 +1047,18 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Wył. autom. ładowanie MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Wł. autom. ładowanie MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Wył. debugowanie VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Wł. debugowanie VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Wył. debugowanie poł. wideo</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Wł. debugowanie poł. wideo</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Wył. debugowanie WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Wł. debugowanie WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Wył. logowanie radia ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Wł. logowanie radia ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Wył. diagnostyczne logowanie</string>
+  <string name="cm_radio_info_diag_log_off_label">Wł. diagnostyczne logowanie</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Tapeta</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 359e7be..1cbfc5a 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1064,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">Desligar os registros de rádio ADB</string>
   <string name="cm_radio_info_diag_log_on_label">Desligar os registros de Diagnóstico</string>
   <string name="cm_radio_info_diag_log_off_label">Ligar os registros de Diagnóstico</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 5d71c1c..bc7dcb4 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1064,4 +1064,5 @@
   <string name="cm_radio_info_adb_log_off_label">Ativar os registos de rádio ADB</string>
   <string name="cm_radio_info_diag_log_on_label">Desativar os registos de Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Ativar os registos de Diag</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 797f148..6a5b99e 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -939,4 +939,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nu arată notificări persistente de la acestă aplicație pe ecranul de blocare</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 95d499a..9e5fb07 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1051,4 +1051,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не показывать постоянные уведомления из этого приложения на экране блокировки</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 0ad0d2a..072d63a 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -564,4 +564,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 50b5baf..c81f285 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -903,4 +903,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nezobrazovať trvalé oznámenia z tejto aplikácie na obrazovke uzamknutia</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 5a89145..7296c05 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1068,4 +1068,6 @@
   <string name="cm_radio_info_adb_log_off_label">Vklopi dnevnik oddajnika ADB</string>
   <string name="cm_radio_info_diag_log_on_label">Izklopi dnevnik prepoz. težav</string>
   <string name="cm_radio_info_diag_log_off_label">Vklopi dnevnik prepoz. težav</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Slika ozadja</string>
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index d6a3057..8a50e1a 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_adb_log_off_label">Укључи ADB радио евиденцију</string>
   <string name="cm_radio_info_diag_log_on_label">Искључи евиденцију дијагностике</string>
   <string name="cm_radio_info_diag_log_off_label">Укључи евиденцију дијагностике</string>
+  <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Тапет</string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 4dc3d7d..d67aaae 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1035,4 +1035,5 @@ inkluderar en unik identifikation,
   <string name="app_notification_no_ongoing_on_keyguard_summary">Visa aldrig beständiga aviseringar från denna app på låsskärmen</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index c4af11f..82eccfa 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">இந்த பயன்பாடு-இல் இருந்து  விடாப்பிடியான அறிவுறுத்தலை பூட்டுத் திரையில் எப்போதும் காட்டாதே</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 2a747eb..67296ab 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1015,4 +1015,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">ఎప్పుడూ కూడా ఈ ప్రోగ్రాం నుండి వచ్చే నిరంతర నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపవద్దు</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 787a08f..e286efe 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1049,4 +1049,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">ไม่ต้องแสดงการแจ้งเตือนแบบถาวรจากแอปนี้บนหน้าจอล็อค</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index b714efd..743fa07 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1050,4 +1050,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilit ekranında bu uygulamanın kalıcı bildirimlerini asla gösterme</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index c4d2ab5..c2e13b3 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1024,4 +1024,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ دائىملىق ئۇقتۇرۇشىنى مەڭگۈ كۆرسەتمەيدۇ</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 33fb7c1..f53892a 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -951,4 +951,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не відображувати сповіщення від цієї програми на екрані блокування</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index a7d2db9..c84a117 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1049,4 +1049,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">Không bao giờ hiển thị các thông báo liên tục từ ứng dụng này trên màn hình khóa</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 63d46c5..c40a284 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1061,4 +1061,5 @@
   <string name="cm_radio_info_adb_log_off_label">开启 ADB 无线日志</string>
   <string name="cm_radio_info_diag_log_on_label">关闭诊断日志</string>
   <string name="cm_radio_info_diag_log_off_label">开启诊断日志</string>
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 44491f5a..fba90d3 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -843,4 +843,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定螢幕上不再顯示來自此應用程式的持久通知</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 952868b..f861c0d 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -880,4 +880,5 @@
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index d7e3691..53cbd0e 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -185,4 +185,5 @@
   <!-- Per app controls for LP keyguard notifications -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
 </resources>
-- 
cgit v1.1


From b720488c606c9a0a5890aca8ebff11b8c98db457 Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Mon, 20 Jun 2016 11:16:18 -0700
Subject: Settings: handle 'always ask' for SMS subscription on 3rd party apps

We need to ensure that the SMS app has a valid subscription to use as
3rd party apps don't know how to use our custom "always ask" logic.

Don't allow the user to choose "always ask" if a 3rd party SMS app is
currently the deafult.

Ticket: CYNGNOS-3068

Change-Id: I4aabf43adfb4fdc39e7656aa872abf73d9a5edbe
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 res/values/cm_strings.xml                          |  2 +
 .../android/settings/sim/SimDialogActivity.java    | 46 +++++++++++++++++++++-
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 68bd97c..d4ec152 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1245,4 +1245,6 @@
     <!-- Lock screen wallpaper -->
     <string name="lockscreen_wallpaper_title">Wallpaper</string>
 
+    <string name="not_available_with_app">Not available with %1$s</string>
+
 </resources>
diff --git a/src/com/android/settings/sim/SimDialogActivity.java b/src/com/android/settings/sim/SimDialogActivity.java
index 6ebea0b..b4c7f03 100644
--- a/src/com/android/settings/sim/SimDialogActivity.java
+++ b/src/com/android/settings/sim/SimDialogActivity.java
@@ -21,6 +21,8 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.RemoteException;
@@ -45,6 +47,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.telephony.IExtTelephony;
+import com.android.internal.telephony.SmsApplication;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import java.util.ArrayList;
@@ -62,6 +65,8 @@ public class SimDialogActivity extends Activity {
     public static final int SMS_PICK = 2;
     public static final int PREFERRED_PICK = 3;
 
+    private boolean mHideAlwaysAsk = false;
+
     private IExtTelephony mExtTelephony = IExtTelephony.Stub.
             asInterface(ServiceManager.getService("extphone"));
 
@@ -70,6 +75,7 @@ public class SimDialogActivity extends Activity {
         super.onCreate(savedInstanceState);
         final Bundle extras = getIntent().getExtras();
         final int dialogType = extras.getInt(DIALOG_TYPE_KEY, INVALID_PICK);
+        mHideAlwaysAsk = !SmsApplication.canSmsAppHandleAlwaysAsk(this) && dialogType == SMS_PICK;
 
         switch (dialogType) {
             case DATA_PICK:
@@ -295,6 +301,10 @@ public class SimDialogActivity extends Activity {
                     currentIndex = list.size() - 1;
                 }
             }
+            if (mHideAlwaysAsk && currentIndex == 0) {
+                // unselect always ask because user can't select it.
+                currentIndex = -1;
+            }
         } else {
             currentIndex = -1;
             final int defaultDataSubId = SubscriptionManager.getDefaultDataSubId();
@@ -345,6 +355,11 @@ public class SimDialogActivity extends Activity {
                 finish();
             }
         });
+        if (mHideAlwaysAsk) {
+            // make sure the user doesn't click out accidentally and we keep spamming them
+            // with dialogs
+            dialog.setCancelable(false);
+        }
 
         return dialog;
 
@@ -358,6 +373,16 @@ public class SimDialogActivity extends Activity {
         private List<SubscriptionInfo> mSubInfoList;
         private final int mSelectionIndex;
 
+        @Override
+        public boolean areAllItemsEnabled() {
+            return false;
+        }
+
+        @Override
+        public boolean isEnabled(int position) {
+            return !(mHideAlwaysAsk && mSubInfoList.get(position) == null);
+        }
+
         public SelectAccountListAdapter(List<SubscriptionInfo> subInfoList,
                 Context context, int resource, String[] arr, int dialogId, int selectionIndex) {
             super(context, resource, arr);
@@ -389,10 +414,14 @@ public class SimDialogActivity extends Activity {
                 holder = (ViewHolder) rowView.getTag();
             }
 
+            final boolean enabled = isEnabled(position);
             final SubscriptionInfo sir = mSubInfoList.get(position);
             if (sir == null) {
                 holder.title.setText(getItem(position));
-                holder.summary.setVisibility(View.GONE);
+                holder.summary.setText(mHideAlwaysAsk
+                        ? getString(R.string.not_available_with_app, getCurrentSmsAppName())
+                        : null);
+                holder.summary.setVisibility(View.VISIBLE);
                 holder.icon.setImageDrawable(getResources()
                         .getDrawable(R.drawable.ic_live_help));
                 holder.icon.setAlpha(OPACITY);
@@ -403,9 +432,24 @@ public class SimDialogActivity extends Activity {
                 holder.icon.setImageBitmap(sir.createIconBitmap(mContext));
             }
             holder.radio.setChecked(position == mSelectionIndex);
+            holder.radio.setEnabled(enabled);
+            holder.title.setEnabled(enabled);
+            holder.summary.setEnabled(enabled);
             return rowView;
         }
 
+        private String getCurrentSmsAppName() {
+            try {
+                final ApplicationInfo applicationInfo = getPackageManager().getApplicationInfo(
+                        SmsApplication.getDefaultMmsApplication(getApplicationContext(), false)
+                                .getPackageName(), 0);
+                return getPackageManager().getApplicationLabel(applicationInfo).toString();
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
         private class ViewHolder {
             TextView title;
             TextView summary;
-- 
cgit v1.1


From 232e6673b183e6cc3c8e3ea971274d7f838b0d75 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Sat, 18 Jun 2016 21:50:37 +0200
Subject: Settings: Fix possible NPE

extras seems to be null sometimes so the call to
extras.get() causes an NPE

Change-Id: I8a95da51aadda8fd6191131570a2f4b2bed762e7
Reference: BugDumps 13-20160610-16 L#64
---
 src/com/android/settings/SecuritySettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 17775ab..3513126 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -196,7 +196,7 @@ public class SecuritySettings extends SettingsPreferenceFragment
 
         Bundle extras = getActivity().getIntent().getExtras();
         // Even uglier hack to make cts verifier expectations make sense.
-        if (extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null &&
+        if (extras != null && extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS) != null &&
                 extras.get(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT) == null) {
             mFilterType = TYPE_EXTERNAL_RESOLUTION;
         }
-- 
cgit v1.1


From 86c8b5eaf46970b6dbff908ff1c2747029bec01c Mon Sep 17 00:00:00 2001
From: "lijun.xie" <lijun.xie@ck-telecom.com>
Date: Thu, 16 Jun 2016 13:35:21 +0800
Subject: UI: Ensure "use for" options displayed when in landscape orientation

Items under the "use for" section of the "Paired devices" dialog for
bluetooth connected headsets can be cut off on some devices when in
landscape mode.  This patch encloses those items in a ScrollView so
the user can scroll the off screen items into view and enable/disable
them.

[Procedures]
1.Go to Settings -> bluetooth
2.Paired with a bluetooth headset
3.Click on the setting of bluetooth headset
4.check the menu list and rotate the phone
5.and can not sliding the list

Change-Id: I52f4d494ca3c71a9ed88b2679868e77b092b4710
---
 res/layout/device_profiles_settings.xml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/res/layout/device_profiles_settings.xml b/res/layout/device_profiles_settings.xml
index bd78bea..8df513e 100644
--- a/res/layout/device_profiles_settings.xml
+++ b/res/layout/device_profiles_settings.xml
@@ -52,10 +52,14 @@
         android:textAppearance="@android:style/TextAppearance.Material.Body1"
         android:textColor="?android:attr/textColorSecondary" />
 
-    <LinearLayout
-        android:id="@+id/profiles_section"
-        android:orientation="vertical"
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content">
+        <LinearLayout
+             android:id="@+id/profiles_section"
+             android:orientation="vertical"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content" />
+     </ScrollView>
 
 </LinearLayout>
-- 
cgit v1.1


From 923b2a1a3422c2601b94c901a2576da20b3f4b92 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Sat, 25 Jun 2016 13:43:54 +0200
Subject: Make sure LiveDisplay toggle default values are correct.

Change-Id: If04c3eca9d62d977c4ecd79bda52a88a3e07ce3b
---
 res/xml/livedisplay.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/xml/livedisplay.xml b/res/xml/livedisplay.xml
index ad63ebb..fa93a19 100644
--- a/res/xml/livedisplay.xml
+++ b/res/xml/livedisplay.xml
@@ -44,7 +44,7 @@
                 android:key="display_auto_outdoor_mode"
                 android:title="@string/live_display_outdoor_mode_title"
                 android:summary="@string/live_display_outdoor_mode_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultAutoOutdoorMode" />
 
     </PreferenceCategory>
 
@@ -76,14 +76,14 @@
                 android:key="display_low_power"
                 android:title="@string/live_display_low_power_title"
                 android:summary="@string/live_display_low_power_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultCABC" />
 
         <!-- Color enhancement -->
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="display_color_enhance"
                 android:title="@string/live_display_enhance_color_title"
                 android:summary="@string/live_display_enhance_color_summary"
-                android:defaultValue="true" />
+                android:defaultValue="@*cyanogenmod.platform:bool/config_defaultColorEnhancement" />
 
     </PreferenceCategory>
 
-- 
cgit v1.1


From 50af72b7caacb7ca4274efeec0a16e2dda84ff80 Mon Sep 17 00:00:00 2001
From: Danesh M <danesh@cyngn.com>
Date: Mon, 20 Jun 2016 14:23:39 -0700
Subject: Settings : Add country code to blacklist entry dialog

Enforce country code when adding an entry. If the user has regex enabled,
* is added to the list as a choice. This avoids the confusion users are currently
facing where blocking only the number + regex doesn't work, since country code is expected.

Eg :

206* won't work
+1206* works

CYNGNOS-3049
BACON-4953

Change-Id: I9236898f17fcef425e561aaa10e56c5e8c2171a7
---
 Android.mk                                         |  3 +-
 res/layout/dialog_blacklist_edit_entry.xml         | 14 ++++
 res/values/cm_strings.xml                          |  2 +-
 .../blacklist/EntryEditDialogFragment.java         | 75 +++++++++++++++++++++-
 4 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/Android.mk b/Android.mk
index 51c74e9..db32ed1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,7 +6,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
 	android-support-v4 \
 	android-support-v13 \
 	jsr305 \
-	org.cyanogenmod.platform.internal
+	org.cyanogenmod.platform.internal \
+	libphonenumber
 
 LOCAL_MODULE_TAGS := optional
 
diff --git a/res/layout/dialog_blacklist_edit_entry.xml b/res/layout/dialog_blacklist_edit_entry.xml
index 30b7c24..ef66325 100644
--- a/res/layout/dialog_blacklist_edit_entry.xml
+++ b/res/layout/dialog_blacklist_edit_entry.xml
@@ -31,6 +31,20 @@
         android:paddingStart="10dip"
         android:paddingEnd="10dip">
 
+        <LinearLayout android:id="@+id/country_code_layout"
+            android:visibility="gone"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+            <TextView android:text="@string/blacklist_country_code_plus"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content" />
+
+            <Spinner android:id="@+id/number_country_code"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal" />
+        </LinearLayout>
+
         <EditText android:id="@+id/number_edit"
             android:layout_width="0dip"
             android:layout_weight="1"
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index d4ec152..64bd522 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1246,5 +1246,5 @@
     <string name="lockscreen_wallpaper_title">Wallpaper</string>
 
     <string name="not_available_with_app">Not available with %1$s</string>
-
+    <string name="blacklist_country_code_plus" translateable="false">+</string>
 </resources>
diff --git a/src/com/android/settings/blacklist/EntryEditDialogFragment.java b/src/com/android/settings/blacklist/EntryEditDialogFragment.java
index 57797b9..11c9909 100644
--- a/src/com/android/settings/blacklist/EntryEditDialogFragment.java
+++ b/src/com/android/settings/blacklist/EntryEditDialogFragment.java
@@ -38,14 +38,26 @@ import android.text.method.DialerKeyListener;
 import android.util.Pair;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageButton;
 
+import android.widget.Spinner;
 import android.widget.Toast;
 import com.android.internal.telephony.util.BlacklistUtils;
 import com.android.settings.R;
+import com.google.i18n.phonenumbers.PhoneNumberUtil;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Set;
 
 public class EntryEditDialogFragment extends DialogFragment
     implements TextWatcher, DialogInterface.OnClickListener {
@@ -55,6 +67,7 @@ public class EntryEditDialogFragment extends DialogFragment
     private CheckBox mBlockCalls;
     private CheckBox mBlockMessages;
     private Button mOkButton;
+    private Spinner mCountryCode;
 
     private static final String[] BLACKLIST_PROJECTION = {
         Blacklist.NUMBER, Blacklist.PHONE_MODE, Blacklist.MESSAGE_MODE
@@ -73,6 +86,7 @@ public class EntryEditDialogFragment extends DialogFragment
     private static final String STATE_PHONE = "phone";
     private static final String STATE_MESSAGE = "message";
     private static final String STATE_EDIT_ENABLED = "edit_enabled";
+    private static final String STATE_COUNTRY_CODE = "edit_country_code";
 
     private static final String DELETE_CONFIRM_FRAGMENT_TAG = "delete_confirm";
 
@@ -147,6 +161,55 @@ public class EntryEditDialogFragment extends DialogFragment
         return getArguments().getLong("id", -1);
     }
 
+    private static String getLocaleCountry() {
+        final String country = Locale.getDefault().getCountry();
+        if (TextUtils.isEmpty(country)) {
+            return null;
+        }
+        return country.toUpperCase();
+    }
+
+    private void populateCountryCodes(View view, Bundle savedState) {
+        PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance();
+        // Get all supported country codes
+        Set<String> countryCodes = new HashSet<String>();
+        for (String region : phoneUtil.getSupportedRegions()) {
+            countryCodes.add(String.valueOf(phoneUtil.getCountryCodeForRegion(region)));
+        }
+        List<String> entries = new ArrayList<String>(countryCodes);
+        Collections.sort(entries, new Comparator<String>() {
+            @Override
+            public int compare(String lhs, String rhs) {
+                return Integer.parseInt(lhs) - Integer.parseInt(rhs);
+            }
+        });
+
+        // If regex is supported, insert regex character
+        if (BlacklistUtils.isBlacklistRegexEnabled(getContext())) {
+            entries.add(0, "*");
+        }
+
+        // Set current country code as selected position
+        int selectedIndex = 0;
+        if (savedState == null) {
+            String country = getLocaleCountry();
+            int currentCode = phoneUtil.getCountryCodeForRegion(country);
+            selectedIndex = entries.indexOf(String.valueOf(currentCode));
+        } else {
+            selectedIndex = savedState.getInt(STATE_COUNTRY_CODE);
+        }
+
+        ArrayAdapter<String> arrayAdapter = new ArrayAdapter<String>(getContext(),
+                android.R.layout.simple_spinner_item, entries);
+        arrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        mCountryCode.setAdapter(arrayAdapter);
+        mCountryCode.setSelection(selectedIndex);
+
+        // Ensure we make the layout visible
+        View parent = view.findViewById(R.id.country_code_layout);
+        parent.setVisibility(View.VISIBLE);
+    }
+
     private View createDialogView(long id, Bundle savedState) {
         final Activity activity = getActivity();
         final LayoutInflater inflater = (LayoutInflater)
@@ -158,6 +221,8 @@ public class EntryEditDialogFragment extends DialogFragment
         mEditText.setKeyListener(DialerKeyListener.getInstance());
         mEditText.addTextChangedListener(this);
 
+        mCountryCode = (Spinner) view.findViewById(R.id.number_country_code);
+
         mContactPickButton = (ImageButton) view.findViewById(R.id.select_contact);
         mContactPickButton.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -202,13 +267,20 @@ public class EntryEditDialogFragment extends DialogFragment
             mEditText.setEnabled(true);
         }
 
+        // Only populate country codes if new entry
+        if (id < 0 || savedState != null && mEditText.isEnabled()) {
+            populateCountryCodes(view, savedState);
+        }
+
         // Mirror contacts selector to state of editText
         mContactPickButton.setEnabled(mEditText.isEnabled());
         return view;
     }
 
     private void updateBlacklistEntry() {
-        String number = mEditText.getText().toString();
+        String plusSymbol = getString(R.string.blacklist_country_code_plus);
+        String number = plusSymbol + mCountryCode.getSelectedItem()
+                + mEditText.getText().toString();
         int flags = 0;
         int valid = BlacklistUtils.BLOCK_CALLS | BlacklistUtils.BLOCK_MESSAGES;
         if (mBlockCalls.isChecked()) {
@@ -263,6 +335,7 @@ public class EntryEditDialogFragment extends DialogFragment
         dialogState.putBoolean(STATE_PHONE, mBlockCalls.isChecked());
         dialogState.putBoolean(STATE_MESSAGE, mBlockMessages.isChecked());
         dialogState.putBoolean(STATE_EDIT_ENABLED, mEditText.isEnabled());
+        dialogState.putInt(STATE_COUNTRY_CODE, mCountryCode.getSelectedItemPosition());
         state.putBundle(DIALOG_STATE, dialogState);
     }
 
-- 
cgit v1.1


From 57ca3ae789be986f816514e024e5a0decc764f0e Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Wed, 29 Jun 2016 11:14:31 -0700
Subject: Fix untranslatable

Change-Id: I22279afa630cd03fe00b58f2c8c6826ea2f2d115
---
 res/values/cm_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 64bd522..8652454 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1246,5 +1246,5 @@
     <string name="lockscreen_wallpaper_title">Wallpaper</string>
 
     <string name="not_available_with_app">Not available with %1$s</string>
-    <string name="blacklist_country_code_plus" translateable="false">+</string>
+    <string name="blacklist_country_code_plus" translatable="false">+</string>
 </resources>
-- 
cgit v1.1


From 7534d77b433ffa7223d7fe817f34e3daa306dc06 Mon Sep 17 00:00:00 2001
From: Tom Marshall <tdm@cyngn.com>
Date: Mon, 27 Jun 2016 14:31:57 -0700
Subject: Settings: Set root access options appropriately

It is possible to be running a user build with a debuggable boot image.
In this case, "su" will not be available.  So only show none/adb.

Jira: BACON-4461

Change-Id: Iaa7df8311b9ea81eabb1566ba6f9159fdc9fab34
---
 res/values/cm_arrays.xml                          | 10 ++++++++++
 res/xml/development_prefs.xml                     |  4 +---
 src/com/android/settings/DevelopmentSettings.java | 22 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index c439175..06d237b 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -30,6 +30,16 @@
         <item>3</item>
     </string-array>
 
+    <string-array name="root_access_entries_adb" translatable="false">
+        <item>@string/root_access_none</item>
+        <item>@string/root_access_adb</item>
+    </string-array>
+
+    <string-array name="root_access_values_adb" translatable="false">
+        <item>0</item>
+        <item>2</item>
+    </string-array>
+
     <!-- Profile lock mode summaries. Do not translate. -->
     <string-array name="profile_lockmode_entries" translatable="false">
         <item>@string/profile_action_system</item>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 0c9856f..a332ee5 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -82,9 +82,7 @@
     <ListPreference
         android:key="root_access"
         android:title="@string/root_access"
-        android:persistent="false"
-        android:entries="@array/root_access_entries"
-        android:entryValues="@array/root_access_values" />
+        android:persistent="false" />
 
     <SwitchPreference
         android:key="update_recovery"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index cfdf921..5ae3b1b 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -85,6 +85,7 @@ import com.android.settings.search.Indexable;
 import com.android.settings.widget.SwitchBar;
 import cyanogenmod.providers.CMSettings;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
@@ -210,6 +211,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private static final int[] MOCK_LOCATION_APP_OPS = new int[] {AppOpsManager.OP_MOCK_LOCATION};
 
     private static final String MULTI_WINDOW_SYSTEM_PROPERTY = "persist.sys.debug.multi_window";
+
+    private static final String SUPERUSER_BINARY_PATH = "/system/xbin/su";
+
     private IWindowManager mWindowManager;
     private IBackupManager mBackupManager;
     private DevicePolicyManager mDpm;
@@ -474,6 +478,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         mRootAccess = (ListPreference) findPreference(ROOT_ACCESS_KEY);
         mRootAccess.setOnPreferenceChangeListener(this);
         if (!removeRootOptionsIfRequired()) {
+            if (isRootForAppsAvailable()) {
+                mRootAccess.setEntries(R.array.root_access_entries);
+                mRootAccess.setEntryValues(R.array.root_access_values);
+            } else {
+                mRootAccess.setEntries(R.array.root_access_entries_adb);
+                mRootAccess.setEntryValues(R.array.root_access_values_adb);
+            }
             mAllPrefs.add(mRootAccess);
         }
 
@@ -832,6 +843,17 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 .getStringArray(R.array.root_access_entries)[Integer.valueOf(value)]);
     }
 
+    private boolean isRootForAppsAvailable() {
+        boolean exists = false;
+        try {
+            File f = new File(SUPERUSER_BINARY_PATH);
+            exists = f.exists();
+        } catch (SecurityException e) {
+            // Ignore
+        }
+        return exists;
+    }
+
     public static boolean isRootForAppsEnabled() {
         int value = SystemProperties.getInt(ROOT_ACCESS_PROPERTY, 0);
         boolean daemonState =
-- 
cgit v1.1


From 8de7e17f3b98a9069a529e3b1271054927335f4e Mon Sep 17 00:00:00 2001
From: Tom Marshall <tdm@cyngn.com>
Date: Tue, 28 Jun 2016 15:26:59 -0700
Subject: settings: wifi: Default to numeric keyboard for static IP items

CYAN-7646

Change-Id: Ibc02cdcc863d2ae373b24bcfd5b97bf63de99222
---
 res/layout/wifi_dialog.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index f90abba..f525e6e 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -442,7 +442,7 @@
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_ip_address_hint"
-                            android:inputType="textNoSuggestions" />
+                            android:inputType="phone" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -461,7 +461,7 @@
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_gateway_hint"
-                            android:inputType="textNoSuggestions" />
+                            android:inputType="phone" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -498,7 +498,7 @@
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns1_hint"
-                            android:inputType="textNoSuggestions" />
+                            android:inputType="phone" />
                 </LinearLayout>
 
                 <LinearLayout
@@ -517,7 +517,7 @@
                             style="@style/wifi_item_edit_content"
                             android:singleLine="true"
                             android:hint="@string/wifi_dns2_hint"
-                            android:inputType="textNoSuggestions" />
+                            android:inputType="phone" />
                 </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-- 
cgit v1.1


From 58cdd7495b6cdd5c67947e978189749d81f4a11f Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Wed, 29 Jun 2016 10:50:29 -0700
Subject: Automatic translation import

Change-Id: I098f8fcf30976e41cb277231b172a0532550b9f9
---
 res/values-ast-rES/strings.xml   | 143 ++++++++++++++++++++++++++++++++++++++-
 res/values-bg/cm_strings.xml     |   2 +
 res/values-ca/cm_strings.xml     |   2 +
 res/values-da/cm_strings.xml     |  14 ++++
 res/values-de/cm_strings.xml     |   2 +
 res/values-eu-rES/cm_strings.xml |   1 +
 res/values-fi/cm_strings.xml     |   1 +
 res/values-hr/cm_strings.xml     |   2 +
 res/values-it/cm_strings.xml     |   1 +
 res/values-iw/cm_strings.xml     |   1 +
 res/values-ja/cm_strings.xml     |   3 +-
 res/values-nb/cm_strings.xml     |   5 +-
 res/values-pt-rBR/cm_strings.xml |   2 +
 res/values-pt-rPT/cm_strings.xml |   2 +
 res/values-sl/cm_strings.xml     |   3 +-
 res/values-sr/cm_strings.xml     |   1 +
 res/values-zh-rCN/cm_strings.xml |   2 +
 17 files changed, 182 insertions(+), 5 deletions(-)

diff --git a/res/values-ast-rES/strings.xml b/res/values-ast-rES/strings.xml
index 6561960..8bb657e 100644
--- a/res/values-ast-rES/strings.xml
+++ b/res/values-ast-rES/strings.xml
@@ -668,6 +668,7 @@
   <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
   <string name="security_settings_fingerprint_enroll_dialog_delete">Desaniciar</string>
   <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <string name="security_settings_fingerprint_enroll_start_title">¡Vamos entamar!</string>
   <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
   <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
   <string name="security_settings_fingerprint_enroll_repeat_title">¡Perfeuto! Agora repiti</string>
@@ -680,16 +681,21 @@
   <string name="setup_fingerprint_enroll_finish_message">Namái toca\'l sensor de buelgues pa esconsoñar y desbloquiar el to preséu.</string>
   <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
   <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <string name="setup_fingerprint_enroll_enrolling_skip_title">¿Saltar axustes de buelga?</string>
   <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
   <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <string name="security_settings_fingerprint_enroll_setup_screen_lock">Configuración del bloquéu de pantalla</string>
   <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
   <string name="security_settings_fingerprint_enroll_done">Ok</string>
   <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <string name="security_settings_fingerprint_enroll_touch_dialog_title">Ups, eso nun ye\'l sensor</string>
   <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
   <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
   <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message">Finó\'l tiempu d\'espera pa la buelga dixital. Vuelvi intentalo.</string>
   <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
   <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <string name="fingerprint_enroll_button_add">Amestar otra</string>
   <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
   <string name="fingerprint_enroll_button_next">Siguiente</string>
   <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
@@ -729,7 +735,15 @@
   <!-- Title of the final confirmation screen before starting device encryption -->
   <string name="crypt_keeper_confirm_title">¿Cifrar preséu?</string>
   <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <string name="crypt_keeper_final_desc" product="tablet">
+    La operación de cifráu nun pue desfacese, y si la encaboxes vas perder datos.
+    El cifráu tarda alrodiu d\'una hora y la tablet reaníciase delles vegaes mientres esti procesu.
+    </string>
   <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <string name="crypt_keeper_final_desc" product="default">
+    La operación de cifráu nun pue desfacese, y si la encaboxes vas perder datos.
+    El cifráu tarda alrodiu d\'una hora y el teléfonu reaníciase delles vegaes mientres esti procesu.
+    </string>
   <!-- Title of the progress screen while encrypting the device -->
   <string name="crypt_keeper_setup_title">Cifrando</string>
   <!-- Informational text on the progress screen while encrypting the device -->
@@ -749,11 +763,42 @@
   <!-- Title of the encryption screen when encrypting the device failed -->
   <string name="crypt_keeper_failed_title">Fallu nel cifráu</string>
   <!-- Informational text when encryption fails -->
+  <string name="crypt_keeper_failed_summary" product="tablet">
+      Interrumpióse\u2019l cifráu y nun pue completase. Como resultáu, los datos
+      na to tableta yá nun son accesibles.
+      \n\n
+      Pa siguir usando la tableta, precises reafitala.
+      Al configurar la to tableta dempués del reaniciu, tendrás una oportunidá
+      pa restaurar cualesquier datu que se respaldare na to cuenta de Google.
+    </string>
   <!-- Informational text when encryption fails -->
+  <string name="crypt_keeper_failed_summary" product="default">
+      El procesu de cifráu paróse y nun pue completase. Poro, nun vas poder acceder
+      a los datos del teléfonu.
+      \n\nTienes de restablecer los datos de fábrica pa volver a usar el teléfonu.
+      Cuando configures el teléfonu dempués d\'esti procesu, podrás restaurar los
+      datos de los que tengas copia de seguranza na to cuenta de Google.
+    </string>
   <!-- Title of the encryption screen when decrypting the device failed -->
   <string name="crypt_keeper_data_corrupt_title">Fallu nel cifráu</string>
   <!-- Informational text when encryption fails -->
+  <string name="crypt_keeper_data_corrupt_summary" product="tablet">
+      La contraseña qu\'introduxisti ye correuta, pero llamentablemente, los datos
+      tán frañaos.
+      \n\nPa siguir usando la tablet, tienes de restablecer los datos de fábrica. Al configurar la tablet
+      dempués d\'esti procesu, tendrás la oportunidá de restaurar los datos qu\'hebas incluyío
+      na copia de seguranza fecha na to cuenta de Google.
+    
+    </string>
   <!-- Informational text when encryption fails -->
+  <string name="crypt_keeper_data_corrupt_summary" product="default">
+      La contraseña qu\'introduxisti ye correuta, pero llamentablemente, los datos
+      tán frañaos.
+      \n\nPa siguir usando\'l teléfonu, tienes de restablecer los datos de fábrica.
+      Al configurar el teléfonu dempués d\'esti procesu, tendrás la oportunidá de restaurar
+      los datos qu\'hebas incluyío na copia de seguranza fecha na to cuenta de Google.
+    
+    </string>
   <!-- Image button description to switch input method -->
   <string name="crypt_keeper_switch_input_method">Camudar métodu d\'entrada</string>
   <!-- Unlock Picker Settings -->
@@ -761,6 +806,7 @@
   <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
   <string name="lock_settings_picker_title">Escoyer bloquéu de pantalla</string>
   <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <string name="lock_settings_picker_fingerprint_message">Escoyer el métodu secundariu de bloquéu de pantalla</string>
   <!--  Main Security lock settings -->
   <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
   <string name="unlock_set_unlock_launch_picker_title">Bloquéu de pantalla</string>
@@ -790,6 +836,7 @@
   <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
   <string name="unlock_set_unlock_password_summary">Seguridá alta</string>
   <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <string name="current_screen_lock">Bloquéu pantalla actual</string>
   <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
   <string name="unlock_set_unlock_disabled_summary">Desactiváu pol alministrador, política de cifráu o almacenamientu de credenciales</string>
   <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
@@ -808,6 +855,7 @@
   <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
   <string name="unlock_disable_lock_title">Desactivar bloquéu pantalla</string>
   <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <string name="unlock_disable_frp_warning_title">¿Desaniciar proteición del preséu?</string>
   <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
   <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
   <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
@@ -817,6 +865,7 @@
   <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
   <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
   <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <string name="unlock_disable_frp_warning_ok">Sí, desaniciar</string>
   <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
   <string name="unlock_change_lock_pattern_title">Camudar patrón desbloquéu</string>
   <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
@@ -838,6 +887,7 @@
   <!-- Error shown when in PIN mode and user enters a non-digit -->
   <string name="lockpassword_pin_contains_non_digits">El PIN namái tien de tener díxitos comprendíos ente\' 0 y el 9.</string>
   <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <string name="lockpassword_pin_recently_used">L\'alministrador de preseos nun permite usar un PIN reciente.</string>
   <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
   <string name="lockpassword_illegal_character">La contraseña contién un caráuter non permitíu.</string>
   <!-- Error shown when in PASSWORD mode and password is all digits -->
@@ -877,6 +927,7 @@
     <item quantity="other">La contraseña tien de tener polo menos %d caráuteres non alfabéticos.</item>
   </plurals>
   <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <string name="lockpassword_password_recently_used">L\'alministrador de preseos nun permite usar una contraseña reciente.</string>
   <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
   <string name="lockpassword_pin_no_sequential_digits">Nun se permiten una secuencia ascendente, descendente nin repitida de díxitos</string>
   <!-- Label for ChoosePassword/PIN OK button -->
@@ -918,7 +969,9 @@
   <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
   <!-- ======================================================================================= -->
   <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <string name="bluetooth_pairing_request">¿Enllazar con <xliff:g id="device_name">%1$s</xliff:g>?</string>
   <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <string name="bluetooth_pairing_key_msg">Códigu de sincronización Bluetooth</string>
   <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_enter_passkey_msg">Escribi\'l códigu de vinculación y, darréu, primi la tecla Intro</string>
   <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
@@ -926,6 +979,7 @@
   <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
   <string name="bluetooth_pin_values_hint">Normalmente: 0000 o 1234</string>
   <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <string name="bluetooth_pin_values_hint_16_digits">Tien de tener 16 díxitos</string>
   <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
   <string name="bluetooth_enter_pin_other_device">Ye dable que tengas qu\'inxertar esti PIN nel otru preséu.</string>
   <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
@@ -937,8 +991,10 @@
   <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
   <string name="bluetooth_display_passkey_pin_msg">Pa enllazar con:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Escribi<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> nel preséu y, darréu, primi la tecla Intro o de retornu.</string>
   <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <string name="bluetooth_pairing_shares_phonebook">Permitir que <xliff:g id="device_name">%1$s</xliff:g> acceda a los contautos y al historial de llamaes</string>
   <!-- Title for BT error dialogs. -->
   <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <string name="bluetooth_connecting_error_message">Nun pudo afitase conexón con <xliff:g id="device_name">%1$s</xliff:g>.</string>
   <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
   <string name="bluetooth_preference_scan_title">Guetar preseos</string>
   <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
@@ -1003,7 +1059,9 @@
   <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
   <string name="bluetooth_disconnect_pan_user_profile">Va desconeutase l\'accesu a Internet a traviés de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.</string>
   <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <string name="bluetooth_disconnect_pan_nap_profile" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> va desconeutase y nun va compartir la conexón a Internet d\'esta tablet.</string>
   <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> va desconeutase y nun va compartir la conexón a Internet d\'esti teléfonu.</string>
   <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
   <string name="bluetooth_device_advanced_title">Preséu Bluetooth sincronizáu</string>
   <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
@@ -1034,6 +1092,7 @@
   <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
   <string name="wifi_assistant_title">Wi\u2011Fi Assistant</string>
   <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <string name="wifi_display_settings_title">Tresmitir</string>
   <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
   <string name="wifi_display_enable_menu_item">Habilitar pantalla inalámbrica</string>
   <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
@@ -1119,6 +1178,7 @@
   <!-- Summary text when Wi-Fi or bluetooth has error -->
   <string name="wifi_error">Fallu</string>
   <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <string name="wifi_sap_no_channel_error">La banda de 5GHz nun ta disponible nesti país</string>
   <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
   <string name="wifi_in_airplane_mode">Mou avión</string>
   <!-- Checkbox title for option to notify user when open networks are nearby -->
@@ -1252,8 +1312,11 @@
   <!-- Label for the check box to show password -->
   <string name="wifi_show_password">Amosar contraseña</string>
   <!-- Label for the RadioGroup to choose wifi ap band -->
+  <string name="wifi_ap_band_config">Seleicionar banda AP</string>
   <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <string name="wifi_ap_choose_2G">Banda de 2.4 GHz</string>
   <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <string name="wifi_ap_choose_5G">Banda de 5 GHz</string>
   <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
   <string name="wifi_ip_settings">Axustes de IP</string>
   <!-- Hint for unchanged fields -->
@@ -1280,6 +1343,8 @@
   <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
   <string name="wifi_hotspot_connect">CONEUTAR</string>
   <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <string name="no_internet_access_text">Esta rede nun tien accesu a internet. ¿Siguir coneutáu?</string>
+  <string name="no_internet_access_remember">Nun entrugar más pa esta rede</string>
   <!-- Button label to connect to a Wi-Fi network -->
   <string name="wifi_connect">Afitar conexón</string>
   <!-- Failured notification for connect -->
@@ -1297,6 +1362,7 @@
   <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
   <string name="wifi_skip_anyway">Omitir de toes formes</string>
   <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <string name="wifi_dont_skip">Nun omitir</string>
   <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
   <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
   <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
@@ -1369,6 +1435,7 @@
   <!-- Title for remembered p2p groups -->
   <string name="wifi_p2p_remembered_groups">Grupos recordaos</string>
   <!-- Toast text for a failed connection initiation -->
+  <string name="wifi_p2p_failed_connect_message">Nun pudo coneutase.</string>
   <!-- Message text for failure to rename -->
   <string name="wifi_p2p_failed_rename_message">Fallu al camudar nome del preséu</string>
   <!-- Title for disconnect dialog -->
@@ -1389,6 +1456,7 @@
   <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
   <string name="wifi_hotspot_checkbox_text">Puntu d\'accesu Wi\u2011Fi</string>
   <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <string name="wifi_hotspot_checkbox_text_summary">Usar la conexón móvil pa ufrir rede Wii\u2011Fi</string>
   <!-- Summary text when turning hotspot on -->
   <string name="wifi_tether_starting">Activando zona Wi-Fi…</string>
   <!-- Summary text when turning hotspot off -->
@@ -1460,8 +1528,15 @@
   <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
          Label on Wifi Configuration screen-->
   <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <string name="wifi_calling_settings_title">Llamaes Wifi</string>
   <!-- WFC mode [CHAR LIMIT=30] -->
+  <string name="wifi_calling_mode_title">Preferencia de llamaes</string>
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <string name="wifi_calling_mode_dialog_title">Mou de llamaes Wifi</string>
+  <string-array name="wifi_calling_mode_choices">
+    <item>Rede Wi-Fi preferida</item>
+    <item>Rede móvil preferida</item>
+  </string-array>
   <string-array name="wifi_calling_mode_values">
     <item>"2"</item>
     <item>"1"</item>
@@ -1492,6 +1567,7 @@
          the same as the incoming call volume. -->
   <string name="checkbox_notification_same_as_incoming_call">Usar volume de llamada entrante pa notificaciones</string>
   <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <string name="home_work_profile_not_supported">Nun sofita perfiles de trabayu</string>
   <!-- Sound settings screen, setting option title-->
   <string name="notification_sound_dialog_title">Soníu de notificación predetermináu</string>
   <!-- Sound settings screen, setting option name -->
@@ -1557,7 +1633,9 @@
   <!-- Dock settings screen, setting option summary text when check box is selected -->
   <string name="dock_sounds_enable_summary_on" product="default">Reproducir soníu al inxertar o estrayer el teléfonu de la base</string>
   <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <string name="dock_sounds_enable_summary_off" product="tablet">Nun reproducir soníu al inxertar o estrayer la tablet de la base</string>
   <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <string name="dock_sounds_enable_summary_off" product="default">Nun reproducir soníu al inxertar o estrayer el teléfonu de la base</string>
   <!-- Account settings header. [CHAR LIMIT=30] -->
   <string name="account_settings">Cuentes</string>
   <!-- Header for items under the personal user [CHAR LIMIT=30] -->
@@ -1596,10 +1674,13 @@
   <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
   <string name="auto_brightness_summary">Optimiza\'l nivel de rellumu pa la lluz disponible</string>
   <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <string name="night_mode_title">Tema</string>
   <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
   <string name="night_mode_summary">%s</string>
   <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <string name="night_mode_no">Claru</string>
   <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <string name="night_mode_yes">Escuru</string>
   <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
   <string name="night_mode_auto">Automáticamente</string>
   <!-- Sound & display settings screen, setting option name to change screen timeout -->
@@ -1679,10 +1760,13 @@
   <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
   <string name="sim_bad_pin">PIN incorreutu</string>
   <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <string name="sim_pins_dont_match">Los PIN nun concasen</string>
   <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <string name="sim_change_failed">Nun pue modificase\'l PIN.\nYe dable que\'l PIN nun seya correutu.</string>
   <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
   <string name="sim_change_succeeded">El PIN de la tarxeta SIM modificóse correcho.</string>
   <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <string name="sim_lock_failed">Nun pue modificase l\'estáu de bloquéu de la tarxeta SIM.\nYe dable que\'l PIN nun seya correutu.</string>
   <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
   <string name="sim_enter_ok">Aceutar</string>
   <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
@@ -1690,8 +1774,10 @@
   <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
   <string name="sim_multi_sims_title">Atopáronse delles SIM</string>
   <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <string name="sim_multi_sims_summary">Escueyi la SIM que prefieres pa los datos móviles.</string>
   <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
   <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <string name="sim_change_data_message">¿Usar <xliff:g id="new_sim">%1$s</xliff:g> en cuenta de <xliff:g id="old_sim">%2$s</xliff:g> pa datos móviles?</string>
   <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
   <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
   <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
@@ -1739,6 +1825,7 @@
   <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
   <string name="storage_settings">Almacenamientu</string>
   <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <string name="storage_usb_settings">Almacenamientu y USB</string>
   <!-- Storage settings screen title -->
   <string name="storage_settings_title">Axustes d\'almacenamientu</string>
   <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
@@ -1764,9 +1851,11 @@
   <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
   <string name="status_icc_id">ICCID</string>
   <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <string name="status_network_type">Tipu de rede móvil</string>
   <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
   <string name="status_latest_area_info">Información d\'operador</string>
   <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <string name="status_data_state">Estáu de la rede móvil</string>
   <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
   <string name="status_service_state">Estáu del serviciu</string>
   <!-- About phone, status item title. The  current cell tower signal strength -->
@@ -1802,6 +1891,7 @@
   <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
   <string name="memory_calculating_size">Calculando…</string>
   <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <string name="memory_apps_usage">Aplicaciones y los sos datos</string>
   <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
   <string name="memory_media_usage">Multimedia</string>
   <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
@@ -1977,9 +2067,13 @@
   <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
   <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
   <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <string name="storage_wizard_format_confirm_next">Desaniciar y formatiar</string>
   <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <string name="storage_wizard_format_progress_title">Formatiando <xliff:g id="name" example="SD card">^1</xliff:g>\u2026</string>
   <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <string name="storage_wizard_format_progress_body">Nun estraigas <xliff:g id="name" example="SD card">^1</xliff:g> mientres se formatia.</string>
   <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <string name="storage_wizard_migrate_title">Tresferir a almacenam. nuevu</string>
   <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
   <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
   <string name="storage_wizard_migrate_now">Mover agora</string>
@@ -2001,6 +2095,7 @@
   <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
   <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
   <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <string name="storage_wizard_move_progress_cancel">Encaboxar tresferencia</string>
   <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
   <!-- Phone info screen, section titles: -->
   <string name="battery_status_title">Estáu de la batería</string>
@@ -2074,6 +2169,7 @@
   <!-- APN error dialog title -->
   <!-- APN error dialog messages: -->
   <!-- APN error dialog messages: -->
+  <string name="error_apn_empty">El APN nun pue quedar baleru.</string>
   <!-- APN error dialog messages: -->
   <string name="error_mcc_not3">El campu MMC tien de tener 3 díxitos.</string>
   <!-- APN error dialog messages: -->
@@ -2086,10 +2182,13 @@
   <string name="restore_default_apn_completed">Reafitóse la configuración predeterminada de APN.</string>
   <!-- Reset Network -->
   <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <string name="reset_network_title">Reafitar axustes de rede</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
   <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <string name="reset_network_button_text">Restablecer axustes</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
   <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <string name="reset_network_final_button_text">Restablecer axustes</string>
   <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
   <string name="reset_network_confirm_title">¿Restablecer?</string>
   <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
@@ -2986,6 +3085,7 @@
   <string name="select_logd_size_dialog_title">Elexir tamaños Logger/búfer rexistru</string>
   <!-- UI debug setting: select USB configuration -->
   <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <string name="select_usb_configuration_dialog_title">Seleicionar configuración d\'USB</string>
   <!-- Setting Checkbox title whether to allow mock locations -->
   <string name="allow_mock_location">Llocalizaciones simulaes</string>
   <!-- setting Checkbox summary whether to allow mock locations  -->
@@ -2994,10 +3094,13 @@
   <string name="debug_view_attributes">Habilitar inspeición d\'atributos de vista</string>
   <!-- Title of warning dialog about the implications of enabling USB debugging -->
   <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <string name="legacy_dhcp_client_summary">Usar el veceru DHCP de Lollipop en cuenta del veceru nuevu DHCP d\'Android.</string>
+  <string name="mobile_data_always_on_summary">Caltién siempre los datos móviles activos, inclusu cuando tea activada la conexón Wi‑Fi (pa camudar de rede de mou rápidu).</string>
   <string name="adb_warning_title">¿Permitir depuración USB?</string>
   <!-- Warning text to user about the implications of enabling USB debugging -->
   <string name="adb_warning_message">La depuración USB namái ta indicada p\'actividaes de desendolcu. Pues usala pa intercambiar datos ente l\'equipu y el preséu, pa instalar aplicaciones nel preséu ensin recibir notificaciones y pa lleer datos de rexistru.</string>
   <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <string name="adb_keys_warning_message">¿Quies revocar l\'accesu a la depuración per USB dende toles computadores qu\'autorizasti hasta agora?</string>
   <!-- Title of warning dialog about the implications of enabling developer settings -->
   <string name="dev_settings_warning_title">¿Permitir axustes de desendolcu?</string>
   <!-- Warning text to user about the implications of enabling USB debugging -->
@@ -3295,6 +3398,7 @@
   <!-- Activity title summary for App Fuel Gauge summary -->
   <string name="power_usage_summary">Consumu de la batería</string>
   <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <string name="power_usage_not_available">Datos d\u2019usu de batería non disponibles.</string>
   <!-- Display the battery level and status [CHAR_LIMIT=60] -->
   <string name="power_usage_level_and_status"><xliff:g id="level">%1$s</xliff:g>
             - <xliff:g id="status">%2$s</xliff:g></string>
@@ -3325,12 +3429,15 @@
   <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
   <string name="battery_stats_gps_on_label">GPS activáu</string>
   <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <string name="battery_stats_camera_on_label">Cámara activada</string>
   <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <string name="battery_stats_flashlight_on_label">Llinterna activada</string>
   <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
   <string name="battery_stats_wifi_running_label">Wi-Fi</string>
   <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
   <string name="battery_stats_wake_lock_label">Activa</string>
   <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <string name="battery_stats_phone_signal_label">Señal de la rede móvil</string>
   <!-- Battery usage during last unplugged period -->
   <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>
   <!-- CPU awake time title -->
@@ -3386,8 +3493,11 @@
   <!-- Label for Phone usage time -->
   <string name="usage_type_phone" product="default">Teléfonu</string>
   <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <string name="usage_type_data_send">Paquetes móviles unviaos</string>
   <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <string name="usage_type_data_recv">Paquetes móviles recibíos</string>
   <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <string name="usage_type_radio_active">Radio activada</string>
   <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
   <string name="usage_type_data_wifi_send">Paquetes Wi\u2011Fi unviaos</string>
   <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
@@ -3514,7 +3624,9 @@
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
   <string name="process_stats_os_kernel">Kernel</string>
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <string name="process_stats_os_zram">Z-Ram</string>
   <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <string name="process_stats_os_cache">Memories caché</string>
   <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
   <string name="process_stats_ram_use">Usu de RAM</string>
   <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
@@ -3559,6 +3671,7 @@
   <string name="menu_hide_system">Anubrir sistema</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
          as percentages-->
+  <string name="menu_show_percentage">Amosar porcentaxes</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
         on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
   <string name="menu_use_uss">Usar USS</string>
@@ -3649,6 +3762,7 @@
   <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
   <string name="tts_settings_changed_demo">La configuración camudó. Esti ye un exemplu de cómo suena.</string>
   <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <string name="tts_engine_error">Nun pue executase\u2019l motor esbilláu.</string>
   <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
   <string name="tts_engine_error_config">Configurar</string>
   <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
@@ -3975,6 +4089,7 @@
   <!-- The message shown above available networks when a user clicked a network secured by
          EAP. We don't allow the user to connect it.
          Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <string name="wifi_setup_status_eap_not_supported">EAP nun ta sofitáu.</string>
   <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
          saying EAP can't be configured in SetupWizard flow.
          [CHAR LIMIT=NONE] -->
@@ -4366,7 +4481,9 @@
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
   <string name="data_usage_total_during_range"><xliff:g id="RANGE">%2$s</xliff:g>: unos <xliff:g id="TOTAL">%1$s</xliff:g> usaos</string>
   <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <string name="data_usage_total_during_range_mobile" product="tablet"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: usáronse unos <xliff:g id="total" example="128KB">%1$s</xliff:g> según la tablet. La medición del to fornidor pue diferir.</string>
   <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <string name="data_usage_total_during_range_mobile" product="default"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: usáronse unos <xliff:g id="total" example="128KB">%1$s</xliff:g> según el teléfonu. La medición del to fornidor pue diferir.</string>
   <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
   <string name="data_usage_metered_title">Restricciones de rede</string>
   <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
@@ -4419,11 +4536,13 @@
   <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_not_used">(nun s\'usa)</string>
   <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <string name="vpn_no_ca_cert">(nun verificar el sirvidor)</string>
   <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
   <string name="vpn_no_server_cert">(recibíu dende\'l sirvidor)</string>
   <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_cancel">Encaboxar</string>
   <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_done">Inorar</string>
   <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_save">Guardar</string>
   <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
@@ -4435,6 +4554,7 @@
   <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_connect_to">Coneutar a <xliff:g id="PROFILE">%s</xliff:g></string>
   <!-- Dialog message body to disconnect from a VPN profile. -->
+  <string name="vpn_disconnect_confirm">Desconeutar esta VPN.</string>
   <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
   <string name="vpn_disconnect">Desconeutar</string>
   <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
@@ -4615,13 +4735,17 @@
   <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
   <string name="user_exit_guest_dialog_remove">Desaniciar</string>
   <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <string name="user_enable_calling">Activar llamaes de teléfonu</string>
   <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <string name="user_enable_calling_sms">Activar llamaes telefóniques y SMS</string>
   <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
   <string name="user_remove_user">Desaniciar usuariu</string>
   <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <string name="user_enable_calling_confirm_title">¿Activar llamaes telefóniques?</string>
   <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
   <string name="user_enable_calling_confirm_message">L\'historial de llamaes va compartise con esti usuariu</string>
   <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <string name="user_enable_calling_and_sms_confirm_title">¿Activar llamaes telefóniques y SMS?</string>
   <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
   <string name="user_enable_calling_and_sms_confirm_message">L\'historial de llamaes y SMS va compartise con esti usuariu.</string>
   <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
@@ -4645,24 +4769,35 @@
   <!-- NFC payment settings -->
   <string name="nfc_payment_settings_title">Tocar y pagar</string>
   <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <string name="nfc_payment_how_it_works">Cómo funciona</string>
   <!-- String shown when there are no NFC payment applications installed -->
+  <string name="nfc_payment_no_apps">Paga nes tiendes col to teléfonu</string>
   <!-- Header text that can be clicked on to change the default payment app -->
+  <string name="nfc_payment_default">Aplicación de pagu predeterminada</string>
   <!-- Summary text that is shown when no default app is set -->
   <string name="nfc_payment_default_not_set">Non definíu</string>
   <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <string name="nfc_payment_app_and_desc"><xliff:g id="app">%1$s</xliff:g> - <xliff:g id="description">%2$s</xliff:g></string>
   <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <string name="nfc_payment_use_default">Usar l\'app predeterminada</string>
   <!-- Always use the default app (independent of what app is open) -->
   <string name="nfc_payment_favor_default">Siempres</string>
   <!-- If open app supports TapPay, use that app instead of the default -->
+  <string name="nfc_payment_favor_open">Sacantes cuando tea abierta otra app pa facer pagos</string>
   <!-- Header for a dialog asking the user which payment app to use -->
+  <string name="nfc_payment_pay_with">Nuna terminal Tocar y pagar, pagar con:</string>
   <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <string name="nfc_how_it_works_title">Cómo pagar na terminal</string>
   <!-- Content for text explaning how to pay at a payment terminal in a store -->
   <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <string name="nfc_how_it_works_got_it">Coyío</string>
   <!-- NFC More... title.  [CHAR LIMIT=40] -->
   <string name="nfc_more_title">Más...</string>
   <!-- Label for the dialog that is shown when the user is asked to set a
          preferred payment application -->
   <string name="nfc_payment_set_default_label">¿Afitar como preferencia?</string>
+  <string name="nfc_payment_set_default">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre con Tocar y pagar?</string>
+  <string name="nfc_payment_set_default_instead_of">¿Quies usar <xliff:g id="app">%1$s</xliff:g> siempre en cuenta de <xliff:g id="app">%2$s</xliff:g> con Tocar y pagar?</string>
   <!-- Restrictions settings -->
   <!-- Restriction settings title [CHAR LIMIT=35] -->
   <string name="restriction_settings_title">Restricciones</string>
@@ -4760,7 +4895,9 @@
   <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
   <string name="app_sees_restricted_accounts">Esta aplicación pue acceder a les tos cuentes</string>
   <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <string name="app_sees_restricted_accounts_and_controlled_by">Esta app pue acceder a les tos cuentes. Remanada por <xliff:g id="app">%1$s</xliff:g></string>
   <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <string name="restriction_wifi_config_title">Wi‑Fi y rede de celulares</string>
   <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
   <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
   <string name="restriction_bluetooth_config_title">Bluetooth</string>
@@ -4948,6 +5085,7 @@
   <string name="lock_screen_notifications_summary_hide">Anubrir notificaciones de calter sensible</string>
   <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
          [CHAR LIMIT=50] -->
+  <string name="lock_screen_notifications_summary_disable">Nun amosar notificaciones</string>
   <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
   <string name="lock_screen_notifications_interstitial_message">Cuando\'l preséu tea bloquiáu, ¿Qué notificaciones quies que s\'amuesen?</string>
   <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
@@ -5412,6 +5550,7 @@
   <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
   <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
   <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <string name="allow_overlay_description">Esti permisu permite qu\'una aplicación s\'amuese enriba d\'otres que teas usando y quiciabes interfiera nel usu de la interfaz n\'otres aplicaciones o camude lo que pienses que tas viendo n\'otres aplicaciones.</string>
   <!-- Keyword for SYSTEM_ALERT_WINDOW -->
   <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
   <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
@@ -5426,7 +5565,9 @@
   <!-- Keyword for WRITE_SETTINGS -->
   <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
   <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <string name="filter_write_settings_apps">Pue modificar axustes del sistema</string>
   <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <string name="write_settings_title">Pue modificar axustes del sistema</string>
   <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
   <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
   <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
@@ -5450,7 +5591,7 @@
   <string-array name="color_mode_descriptions">
     <item>Colores ameyoraos</item>
     <item>Natural colors as seen by the eye</item>
-    <item>Colors optimized for digital content</item>
+    <item>Colores optimizaes pal conteníu dixital</item>
   </string-array>
   <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
   <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 1e611e6..1210cb6 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Изключване не Diag log</string>
   <string name="cm_radio_info_diag_log_off_label">Включване на Diag log</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Тапет при заключен екран</string>
+  <string name="not_available_with_app">Не се предлага с %1$s</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 33e39a2..4405b1b 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Desactiva el registre Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activa el registre Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Fons de pantalla</string>
+  <string name="not_available_with_app">No disponible amb %1$s</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index cae5f56..b1bbe3f 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1026,5 +1026,19 @@
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Udvidet radiokontrol</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Slå MBN auto load fra</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Slå MBN auto load til</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Slå VoLTE debug fra</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Slå VoLTE debug til</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Slå VT debug fra</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Slå VT debug til</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Slå WFC debug fra</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Slå WFC debug til</string>
+  <string name="cm_radio_info_adb_log_on_label">Slå ADB radio log fra</string>
+  <string name="cm_radio_info_adb_log_off_label">Slå ADB radio log til</string>
+  <string name="cm_radio_info_diag_log_on_label">Slå Diag log fra</string>
+  <string name="cm_radio_info_diag_log_off_label">Slå Diag log til</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Baggrund</string>
+  <string name="not_available_with_app">Ikke tilgængelig med %1$s</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index c091514..86733a3 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Diagnoseprotokoll ausschalten</string>
   <string name="cm_radio_info_diag_log_off_label">Diagnoseprotokoll einschalten</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Hintergrund</string>
+  <string name="not_available_with_app">Nicht verfügbar für %1$s</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index e504799..0424c15 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1066,4 +1066,5 @@
   <string name="cm_radio_info_diag_log_off_label">Gaitu Diag egunkaria</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Horma-papera</string>
+  <string name="not_available_with_app">Ez dago eskuragarri %1$s aplikazioarekin</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 199c16b..e185e7c 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1066,4 +1066,5 @@
   <string name="cm_radio_info_diag_log_off_label">Ota Diag log käyttöön</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Taustakuva</string>
+  <string name="not_available_with_app">Ei käytettävissä sovelluksessa %1$s</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 178344f..f93bf37 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1066,4 +1066,6 @@
   <string name="cm_radio_info_diag_log_on_label">Isključi Diag zapisnik</string>
   <string name="cm_radio_info_diag_log_off_label">Uključi Diag zapisnik</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Slika Pozadine</string>
+  <string name="not_available_with_app">Nije dostupno sa %1$s</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index c2cb667..73e5e93 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1068,4 +1068,5 @@
   <string name="cm_radio_info_diag_log_off_label">Attiva log Diag</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Sfondo</string>
+  <string name="not_available_with_app">Non disponibile con %1$s</string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 1e7b778..0322f2c 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1043,6 +1043,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">ספקי סלולר</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">טשטוש הרקע</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">הראה מזג אוויר</string>
   <!-- Per app controls for LP keyguard notifications -->
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 47f2e5b..fc03860 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -589,7 +589,7 @@
   <string name="screen_color_vivid">ビビッド</string>
   <string name="screen_color_custom">カスタム</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">画面を見やすく目を疲れにくくするために時間と周囲の環境に合わせて画面を最適化する</string>
+  <string name="live_display_summary">画面を見やすく、目の疲れを軽減するために、時間と周囲の環境に合わせて画面を最適化する</string>
   <string name="live_display_mode">ディスプレイのモード</string>
   <string name="live_display_color_temperature_title">色温度</string>
   <string name="live_display_color_temperature_summary">昼: <xliff:g id="day_temperature">%1$d</xliff:g>K  夜: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
@@ -1050,4 +1050,5 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">壁紙</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index f275c5c..5e6dfca 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -801,10 +801,10 @@
   <string name="recents_show_searchbar">Vis søkelinjen i siste-menyen</string>
   <string name="keywords_recents_show_searchbar">siste siste-menyen deaktiver aktivert vis skjul søkebar søkefelt</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Stemme aktivering</string>
+  <string name="voice_wakeup_settings_title">Stemme oppvekking</string>
   <string name="voice_wakeup_retrain_title">Tren stemme igjen</string>
   <string name="voice_wakeup_activity_title">Aktivitet som skal starte</string>
-  <string name="voice_wakeup_default_activity">Google nå</string>
+  <string name="voice_wakeup_default_activity">Google Nå</string>
   <string name="voice_wakeup_needs_dial_permission_warning">Stemmeoppvekking trenger telefon samtale tillatelser for å velge en Direkteoppringings kontakt.</string>
   <string name="picker_activities">Aktiviteter</string>
   <string name="select_custom_app_title">Velg egendefinert app</string>
@@ -1066,4 +1066,5 @@
   <string name="cm_radio_info_diag_log_off_label">Slå på Diag logg</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Bakgrunn</string>
+  <string name="not_available_with_app">Ikke tilgjengelig med %1$s</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 1cbfc5a..c7594d0 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Desligar os registros de Diagnóstico</string>
   <string name="cm_radio_info_diag_log_off_label">Ligar os registros de Diagnóstico</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Papel de parede</string>
+  <string name="not_available_with_app">Indisponível com %1$s</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index bc7dcb4..498ea7a 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Desativar os registos de Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Ativar os registos de Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Imagem de fundo</string>
+  <string name="not_available_with_app">Não disponível com %1$s</string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 7296c05..75ffc59 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -505,7 +505,7 @@
   <string name="color_enhancement_title">Izboljšanje barv</string>
   <string name="color_enhancement_summary">Dinamično izboljšaj barve zaslona</string>
   <!-- Key backlight -->
-  <string name="button_backlight_title">Svetlost ozadja</string>
+  <string name="button_backlight_title">Osvetljeno ozadje</string>
   <string name="button_backlight_enabled">Osvetli gumbe</string>
   <string name="keyboard_backlight_enabled">Osvetli tipkovnico</string>
   <string name="button_backlight_seekbar_title">Svetlost gumbov</string>
@@ -1070,4 +1070,5 @@
   <string name="cm_radio_info_diag_log_off_label">Vklopi dnevnik prepoz. težav</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Slika ozadja</string>
+  <string name="not_available_with_app">Ni na voljo s/z %1$s</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 8a50e1a..bb26363 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1067,4 +1067,5 @@
   <string name="cm_radio_info_diag_log_off_label">Укључи евиденцију дијагностике</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Тапет</string>
+  <string name="not_available_with_app">Није доступно са %1$s</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index c40a284..dad4be7 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1062,4 +1062,6 @@
   <string name="cm_radio_info_diag_log_on_label">关闭诊断日志</string>
   <string name="cm_radio_info_diag_log_off_label">开启诊断日志</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">壁纸</string>
+  <string name="not_available_with_app">同 %1$s 不可用</string>
 </resources>
-- 
cgit v1.1


From e40a0c583c91fc2175a1813d5ed42ee2a3ce93ef Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Thu, 23 Jun 2016 11:21:45 -0700
Subject: fingerpint: Allow devices to configure sensor location

The text for enrolling a fingerprint always assumes the sensor is
located on the back.  This patch adds a config integer that defines
where the sensor is located on the device.
  0 = back
  1 = front
  2 = left side
  3 = right side

This patch also adds a new drawable that shows the front of the device
when applicable.

Change-Id: Ia8f5f8ff4ba4d13d35aed3052f60ff665dd4f294
TICKET: CYNGNOS-3089
---
 .../fingerprint_sensor_location_front_overlay.png  | Bin 0 -> 2704 bytes
 res/layout-land/fingerprint_enroll_find_sensor.xml |   1 +
 res/layout/fingerprint_enroll_find_sensor_base.xml |   1 +
 .../fingerprint_enroll_find_sensor_graphic.xml     |   9 +++++++++
 res/values/cm_arrays.xml                           |   9 +++++++++
 res/values/cm_strings.xml                          |   9 +++++++++
 res/values/config.xml                              |   8 ++++++++
 .../fingerprint/FingerprintEnrollFindSensor.java   |  21 +++++++++++++++++++++
 8 files changed, 58 insertions(+)
 create mode 100644 res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png

diff --git a/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png
new file mode 100644
index 0000000..f1e5bde
Binary files /dev/null and b/res/drawable-nodpi/fingerprint_sensor_location_front_overlay.png differ
diff --git a/res/layout-land/fingerprint_enroll_find_sensor.xml b/res/layout-land/fingerprint_enroll_find_sensor.xml
index 81d1dac..b8588c0 100644
--- a/res/layout-land/fingerprint_enroll_find_sensor.xml
+++ b/res/layout-land/fingerprint_enroll_find_sensor.xml
@@ -40,6 +40,7 @@
 
             <TextView
                 style="@style/TextAppearance.FingerprintMessage"
+                android:id="@+id/find_sensor_message"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/security_settings_fingerprint_enroll_find_sensor_message"/>
diff --git a/res/layout/fingerprint_enroll_find_sensor_base.xml b/res/layout/fingerprint_enroll_find_sensor_base.xml
index f65e932..6b2f385 100644
--- a/res/layout/fingerprint_enroll_find_sensor_base.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_base.xml
@@ -32,6 +32,7 @@
 
         <TextView
             style="@style/TextAppearance.FingerprintMessage"
+            android:id="@+id/find_sensor_message"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/suw_description_margin_top"
diff --git a/res/layout/fingerprint_enroll_find_sensor_graphic.xml b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
index 1c6ab80..14343e1 100644
--- a/res/layout/fingerprint_enroll_find_sensor_graphic.xml
+++ b/res/layout/fingerprint_enroll_find_sensor_graphic.xml
@@ -28,6 +28,15 @@
         android:src="@drawable/fingerprint_sensor_location"
         android:scaleType="centerInside"/>
 
+    <ImageView
+        android:id="@+id/fingerprint_sensor_location_front_overlay"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:contentDescription="@string/security_settings_fingerprint_enroll_find_sensor_content_description"
+        android:src="@drawable/fingerprint_sensor_location_front_overlay"
+        android:scaleType="centerInside"
+        android:visibility="gone"/>
+
     <com.android.settings.fingerprint.FingerprintLocationAnimationView
         android:id="@+id/fingerprint_sensor_location_animation"
         android:layout_width="match_parent"
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 06d237b..6901fae 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -587,4 +587,13 @@
         <item>2</item>
     </string-array>
 
+    <!-- Fingerprint sensor locations.  Devices should configure their sensor location using
+         config_fingerprintSensorLocation -->
+    <string-array name="security_settings_fingerprint_sensor_locations" translatable="false">
+        <item>@string/security_settings_fingerprint_sensor_location_back</item>
+        <item>@string/security_settings_fingerprint_sensor_location_front</item>
+        <item>@string/security_settings_fingerprint_sensor_location_left</item>
+        <item>@string/security_settings_fingerprint_sensor_location_right</item>
+    </string-array>
+
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 8652454..e032cd1 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1247,4 +1247,13 @@
 
     <string name="not_available_with_app">Not available with %1$s</string>
     <string name="blacklist_country_code_plus" translatable="false">+</string>
+
+    <!-- Format string for fingerprint location message -->
+    <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Locate the fingerprint sensor on the <xliff:g id="sensor_location">%1$s</xliff:g> of your phone.</string>
+
+    <!-- Fingerprint sensor locations -->
+    <string name="security_settings_fingerprint_sensor_location_back">back</string>
+    <string name="security_settings_fingerprint_sensor_location_front">front</string>
+    <string name="security_settings_fingerprint_sensor_location_left">left side</string>
+    <string name="security_settings_fingerprint_sensor_location_right">right side</string>
 </resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index 259927a..f463615 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -125,4 +125,12 @@
 
     <!-- When true, "show built-in" option in Privacy Guard will be available -->
     <bool name="config_showBuiltInAppsForPG">true</bool>
+
+    <!-- Defines the location of the fingerprint sensor on the device
+         0 = back
+         1 = front
+         2 = left side
+         3 = right side
+    -->
+    <integer name="config_fingerprintSensorLocation">0</integer>
 </resources>
diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
index 63d9335..df3646e 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollFindSensor.java
@@ -19,6 +19,8 @@ package com.android.settings.fingerprint;
 import android.content.Intent;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
 
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.ChooseLockSettingsHelper;
@@ -31,6 +33,10 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
 
     private static final int CONFIRM_REQUEST = 1;
     private static final int ENROLLING = 2;
+    private static final int SENSOR_LOCATION_BACK = 0;
+    private static final int SENSOR_LOCATION_FRONT = 1;
+    private static final int SENSOR_LOCATION_LEFT = 2;
+    private static final int SENSOR_LOCATION_RIGHT = 3;
     public static final String EXTRA_KEY_LAUNCHED_CONFIRM = "launched_confirm_lock";
 
     private FingerprintLocationAnimationView mAnimation;
@@ -48,6 +54,21 @@ public class FingerprintEnrollFindSensor extends FingerprintEnrollBase {
         }
         mAnimation = (FingerprintLocationAnimationView) findViewById(
                 R.id.fingerprint_sensor_location_animation);
+
+        int sensorLocation = getResources().getInteger(R.integer.config_fingerprintSensorLocation);
+        if (sensorLocation < SENSOR_LOCATION_BACK || sensorLocation > SENSOR_LOCATION_RIGHT) {
+            sensorLocation = SENSOR_LOCATION_BACK;
+        }
+        final String location = getResources().getStringArray(
+                R.array.security_settings_fingerprint_sensor_locations)[sensorLocation];
+        TextView message = (TextView) findViewById(R.id.find_sensor_message);
+        message.setText(getString(
+                R.string.security_settings_fingerprint_enroll_find_sensor_message_cm,
+                location));
+        if (sensorLocation != SENSOR_LOCATION_BACK) {
+            findViewById(R.id.fingerprint_sensor_location_front_overlay)
+                    .setVisibility(View.VISIBLE);
+        }
     }
 
     @Override
-- 
cgit v1.1


From d7d6c6db1f432d7c465d631a5155c80eb45594a2 Mon Sep 17 00:00:00 2001
From: Sravan Kumar V <sravankumar@codeaurora.org>
Date: Mon, 31 Aug 2015 10:12:04 +0530
Subject: Bluetooth : Handle SQL memory situation during OPP.

Use case :
1) Use Any tool to Fill memory
2) When available memory is very low, enter
 settings-Bluetooth

Failure :
"Unfortunately, Bluetooth share has stopped" error comes.
Root Cause :
Because of Memory Issue application was unable to perform any SQL
operations.

Fix :
Catch SQLite FullException and SQlite Exception in bluetooth
settings to avoid crash in this use case.

Change-Id: I621816ef6214eead49ba9f5a98a4152572fb1379
---
 src/com/android/settings/search/Index.java | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index c58923f..055c2d8 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -31,6 +31,7 @@ import android.database.DatabaseUtils;
 import android.database.MergeCursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;
+import android.database.sqlite.SQLiteFullException;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.provider.SearchIndexableData;
@@ -1189,14 +1190,15 @@ public class Index {
 
             final boolean forceUpdate = params[0].forceUpdate;
 
-            final SQLiteDatabase database = getWritableDatabase();
-            if (database == null) {
-                Log.e(LOG_TAG, "Cannot update Index as I cannot get a writable database");
-                return null;
-            }
-            final String localeStr = Locale.getDefault().toString();
+            SQLiteDatabase database = null;
 
             try {
+                database = getWritableDatabase();
+                if (database == null) {
+                    Log.e(LOG_TAG, "Cannot update Index as I cannot get a writable database");
+                    return null;
+                }
+                final String localeStr = Locale.getDefault().toString();
                 database.beginTransaction();
                 if (dataToDelete.size() > 0) {
                     processDataToDelete(database, localeStr, dataToDelete);
@@ -1206,8 +1208,19 @@ public class Index {
                             forceUpdate);
                 }
                 database.setTransactionSuccessful();
+            } catch (SQLiteFullException e) {
+                    Log.e(LOG_TAG, "SQLite database is full." + e.toString());
+            } catch (SQLiteException e) {
+                    Log.e(LOG_TAG, e.toString());
             } finally {
-                database.endTransaction();
+                try {
+                    if (database != null)
+                        database.endTransaction();
+                } catch (SQLiteFullException e) {
+                    Log.e(LOG_TAG, "SQLite database is full." + e.toString());
+                } catch (SQLiteException e) {
+                    Log.e(LOG_TAG, e.toString());
+                }
             }
 
             return null;
-- 
cgit v1.1


From 6b63386dad80cc03c4d8a674d66840b8c4468d6b Mon Sep 17 00:00:00 2001
From: Ruthwar Kumar Ambeer <ruthwar@codeaurora.org>
Date: Thu, 15 Oct 2015 19:39:05 +0530
Subject: Grey out PIN1 enable/disable option when SUB is not ready

Since it is not possible to interact with UICC card for
PIN1 enable/Disable when SIM is deactivated, PIN1 option
is Disabled in UI.

Change-Id: I64d2ad3a85c15c4ea8936987e384ffd013c1f533
CRs-Fixed: 662114
---
 src/com/android/settings/IccLockSettings.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/IccLockSettings.java b/src/com/android/settings/IccLockSettings.java
index ff7c2bd..f4daceb 100644
--- a/src/com/android/settings/IccLockSettings.java
+++ b/src/com/android/settings/IccLockSettings.java
@@ -40,6 +40,7 @@ import android.widget.ListView;
 import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.internal.telephony.IccCardConstants.State;
 import com.android.internal.telephony.Phone;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.internal.telephony.TelephonyIntents;
@@ -222,11 +223,20 @@ public class IccLockSettings extends InstrumentedPreferenceActivity
 
 
     private void updatePreferences() {
-        mPinDialog.setEnabled(mPhone != null);
-        mPinToggle.setEnabled(mPhone != null);
-
         if (mPhone != null) {
+            if (mPhone.getIccCard().getState() != State.READY) {
+                // if SIM State is NOT READY, it is not possible to interact with UICC app
+                // for enabling/disabling PIN so disable PIN options.
+                mPinToggle.setEnabled(false);
+                mPinDialog.setEnabled(false);
+            } else {
+                mPinToggle.setEnabled(true);
+                mPinDialog.setEnabled(true);
+            }
             mPinToggle.setChecked(mPhone.getIccCard().getIccLockEnabled());
+        } else {
+            mPinDialog.setEnabled(false);
+            mPinToggle.setEnabled(false);
         }
     }
 
-- 
cgit v1.1


From 7975c8e51e3647c053fd7451e67e1a7b177984fd Mon Sep 17 00:00:00 2001
From: Sridhar Dubbaka <sdubbaka@codeaurora.org>
Date: Mon, 19 Oct 2015 01:56:10 +0530
Subject: Update OperatorInfo in Simstatus settings for correct subid

Update OperatorInfo in Simstatus settings for
correct subid, on which Channel 50 CB message is received.

Change-Id: I0876c94d53f2b4eef8571037c9a0e7d880bc043f
CRs-Fixed: 906537
---
 src/com/android/settings/deviceinfo/SimStatus.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 036d00f..7410cd3 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -44,6 +44,7 @@ import android.widget.ListView;
 import com.android.internal.logging.MetricsLogger;
 import com.android.internal.telephony.DefaultPhoneNotifier;
 import com.android.internal.telephony.Phone;
+import com.android.internal.telephony.PhoneConstants;
 import com.android.internal.telephony.PhoneFactory;
 import com.android.settings.InstrumentedPreferenceActivity;
 import com.android.settings.R;
@@ -170,6 +171,8 @@ public class SimStatus extends InstrumentedPreferenceActivity {
                         CB_AREA_INFO_SENDER_PERMISSION, null);
                 // Ask CellBroadcastReceiver to broadcast the latest area info received
                 Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                getLatestIntent.putExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                        mSir.getSubscriptionId());
                 sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
                         CB_AREA_INFO_SENDER_PERMISSION);
             }
@@ -373,6 +376,12 @@ public class SimStatus extends InstrumentedPreferenceActivity {
                 }
 
                 mPhone = phone;
+                updateAreaInfo("");
+                Intent getLatestIntent = new Intent(GET_LATEST_CB_AREA_INFO_ACTION);
+                getLatestIntent.putExtra(PhoneConstants.SUBSCRIPTION_KEY,
+                        mSir.getSubscriptionId());
+                sendBroadcastAsUser(getLatestIntent, UserHandle.ALL,
+                        CB_AREA_INFO_SENDER_PERMISSION);
                 mPhoneStateListener = new PhoneStateListener(mSir.getSubscriptionId()) {
                     @Override
                     public void onDataConnectionStateChanged(int state) {
-- 
cgit v1.1


From d0f59be8d45b830d23ba3dfaa56417ed94767352 Mon Sep 17 00:00:00 2001
From: Susheel nyamala <snyamala@codeaurora.org>
Date: Wed, 28 Oct 2015 19:05:21 +0530
Subject: Fix mcc-mnc population issue in apn editor

When creating a new apn in LTE mode, mcc-mnc values populated on
apn editor are wrong if uicc card is used.
Replace getSimOperator with getIccOperatorNumericForData method,
which returns mcc-mnc values based on PS RAT registered.

Change-Id: I263848bfbeabd4636dccd203c366ab00858ceaaf
CRs-Fixed: 931556
---
 src/com/android/settings/ApnEditor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index 2ed7438..3d744d6 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -281,7 +281,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
     private void fillUi() {
         if (mFirstTime) {
             mFirstTime = false;
-            String numeric = mTelephonyManager.getSimOperator(mSubId);
+            String numeric = mTelephonyManager.getIccOperatorNumericForData(mSubId);
             // Fill in all the values from the db in both text editor and summary
             mName.setText(mCursor.getString(NAME_INDEX));
             mApn.setText(mCursor.getString(APN_INDEX));
@@ -489,7 +489,7 @@ public class ApnEditor extends InstrumentedPreferenceActivity
                 if (values[mvnoIndex].equals("SPN")) {
                     mMvnoMatchData.setText(mTelephonyManager.getSimOperatorName());
                 } else if (values[mvnoIndex].equals("IMSI")) {
-                    String numeric = mTelephonyManager.getSimOperator(mSubId);
+                    String numeric = mTelephonyManager.getIccOperatorNumericForData(mSubId);
                     mMvnoMatchData.setText(numeric + "x");
                 } else if (values[mvnoIndex].equals("GID")) {
                     mMvnoMatchData.setText(mTelephonyManager.getGroupIdLevel1());
-- 
cgit v1.1


From 403f50c7cda2d5f214600978fdd920cf2d98131b Mon Sep 17 00:00:00 2001
From: venkata Jagadeesh <vjagad@codeaurora.org>
Date: Wed, 4 Nov 2015 11:29:47 +0530
Subject: Don't start auto scan if screen recovers from frozen state

Use case:Inquiry initiated from UI after connecting with blackberryZ30

Failure: Inquiry initiated from UI automatically after connecting with
         blackberryZ30,which is not expected

Test steps:
1. Go to BT settings page.
2. Initiate pair and connect remote device from the available devices list

Root cause:mInitialScanStarted set always to false and for every
onActivityCreated,scan will be triggered from UI

Fix: mInitialScanStarted set to false only for new instance,if any screen
recover case,it should not be set as its not a new instance.

Change-Id: Ia38323d5136857e6fe8fa69ed6336d889e29287b
---
 src/com/android/settings/bluetooth/BluetoothSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index 0f0952e..37eebe7 100644
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -140,7 +140,8 @@ public final class BluetoothSettings extends DeviceListPreferenceFragment implem
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
-        mInitialScanStarted = false;
+        /* Don't auto start scan if screen reconstructs due to frozen screen*/
+        mInitialScanStarted = (savedInstanceState != null);
         mInitiateDiscoverable = true;
 
         mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
-- 
cgit v1.1


From 0dbd029bacc6ed4fe9c1b332ab2fe06c5c74866a Mon Sep 17 00:00:00 2001
From: Nalla Kartheek <karthe@codeaurora.org>
Date: Fri, 20 Nov 2015 13:32:41 +0530
Subject: Wi-Fi: Do not display the not scanned saved networks forever

A flag is introduced to signify it these saved profiles were scanned or
not and this commit shall ensure that such entries are displayed only
when the flag indicates to have scanned.

Change-Id: I0c525a493caa39c3bed5149898160dd4662dd0c8
CRs-Fixed: 940917
---
 src/com/android/settings/wifi/WifiSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index e83889c..5fc70e5 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -666,6 +666,10 @@ public class WifiSettings extends RestrictedSettingsFragment
                 for (AccessPoint accessPoint : accessPoints) {
                     // Ignore access points that are out of range.
                     if (accessPoint.getLevel() != -1) {
+                        if (accessPoint.isSaved() && (!accessPoint.foundInScanResult)
+                               && (accessPoint.getDetailedState() == null)) {
+                            continue;
+                        }
                         hasAvailableAccessPoints = true;
                         if (accessPoint.getTag() != null) {
                             final Preference pref = (Preference) accessPoint.getTag();
-- 
cgit v1.1


From b3906b40e5d00a3a308d4c6a847898ef498331cc Mon Sep 17 00:00:00 2001
From: Benergy Meenan Ravuri <bravuri@codeaurora.org>
Date: Mon, 15 Feb 2016 17:56:10 +0530
Subject: IMS: Set Wifi calling preference to Wifi preferred by default

Set Wifi calling preference to Wifi preferred by default instead
of Wifi only

Change-Id: I480db3d211566d0cb414ea50275b554c755b0a03
CRs-Fixed: 977149
---
 src/com/android/settings/WifiCallingSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/WifiCallingSettings.java b/src/com/android/settings/WifiCallingSettings.java
index f4d143d..fe83dda 100644
--- a/src/com/android/settings/WifiCallingSettings.java
+++ b/src/com/android/settings/WifiCallingSettings.java
@@ -193,7 +193,7 @@ public class WifiCallingSettings extends SettingsPreferenceFragment
         if (!isWfcModeSupported()) {
             android.provider.Settings.Global.putInt(context.getContentResolver(),
                     android.provider.Settings.Global.WFC_IMS_MODE,
-                    ImsConfig.WfcModeFeatureValueConstants.WIFI_ONLY);
+                    ImsConfig.WfcModeFeatureValueConstants.WIFI_PREFERRED);
         }
 
         // NOTE: Buttons will be enabled/disabled in mPhoneStateListener
-- 
cgit v1.1


From f79f08e7d5fd82c28eb8e2828315d100c0a79397 Mon Sep 17 00:00:00 2001
From: Ravindra <c_rthat@codeaurora.org>
Date: Tue, 22 Mar 2016 14:11:51 +0530
Subject: Fix to enable data for non-dds sub.

When data is enabled\disabled on non-dds sub do not update the data base
directly instead call TelephonyManager api to do the same.

CRs-Fixed: 992072

Change-Id: I53b5ed2f4d6afcb05b09d65fd3d9843829cff995
---
 src/com/android/settings/DataUsageSummary.java | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 22a9994..8bfff58 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -1199,14 +1199,7 @@ public class DataUsageSummary extends HighlightingFragment implements Indexable
     private void setMobileDataEnabled(int subId, boolean enabled) {
         if (LOGD) Log.d(TAG, "setMobileDataEnabled: subId = " + subId + " enabled = " + enabled);
         int dataSubId = mSubscriptionManager.getDefaultDataSubId();
-        if (subId == dataSubId || TelephonyManager.getDefault().getSimCount() == 1) {
-            mTelephonyManager.setDataEnabled(subId, enabled);
-        } else {
-            // Update mobile data status of a non DDS sub in provider
-            final Context context = getActivity();
-            android.provider.Settings.Global.putInt(context.getContentResolver(),
-                    android.provider.Settings.Global.MOBILE_DATA + subId, enabled ? 1 : 0);
-        }
+        mTelephonyManager.setDataEnabled(subId, enabled);
         mMobileDataEnabled.put(String.valueOf(subId), enabled);
         updatePolicy(false);
     }
-- 
cgit v1.1


From 69e674601bfb80fc1102c7e5d0234ae80f58beac Mon Sep 17 00:00:00 2001
From: Venkatraman Nerellapalli <venkataraman.nerellapalli@codeaurora.org>
Date: Sat, 9 Jan 2016 17:20:00 +0530
Subject: Telephony(MSIM): Fix ANR on SIM deactivation

Dismiss dialog box on confirmation.
SIM activation & deactivation in background thread.

Change-Id: I0268a710f35e30b2abec3dd671942b52fc0e0b46
CRs-Fixed: 957308
---
 src/com/android/settings/sim/SimSettings.java | 50 +++++++++++++++++++--------
 1 file changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 20a401e..d85a509 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -28,6 +28,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Resources;
 import android.graphics.drawable.BitmapDrawable;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
@@ -689,26 +690,44 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
             if (!mSwitch.isEnabled()) {
                 return;
             }
-            int result = -1;
+            new SimEnablerDisabler().execute();
+        }
+
+        private class SimEnablerDisabler extends AsyncTask<Void, Void, Integer> {
+
             int newProvisionedState = NOT_PROVISIONED;
-            mCmdInProgress = true;
 
-            showProgressDialog();
-            setEnabled(false);
-            try {
-                if (mIsChecked) {
-                    result = mExtTelephony.activateUiccCard(mSir.getSimSlotIndex());
-                    newProvisionedState = PROVISIONED;
-                } else {
-                    result = mExtTelephony.deactivateUiccCard(mSir.getSimSlotIndex());
+            @Override
+            protected void onPreExecute() {
+                super.onPreExecute();
+                mCmdInProgress = true;
+                showProgressDialog();
+                setEnabled(false);
+            }
+
+            @Override
+            protected Integer doInBackground(Void... params) {
+                int result = -1;
+                newProvisionedState = NOT_PROVISIONED;
+                try {
+                    if (mIsChecked) {
+                        result = mExtTelephony.activateUiccCard(mSir.getSimSlotIndex());
+                        newProvisionedState = PROVISIONED;
+                    } else {
+                        result = mExtTelephony.deactivateUiccCard(mSir.getSimSlotIndex());
+                    }
+                } catch (RemoteException ex) {
+                    loge("Activate  sub failed " + result + " phoneId " + mSir.getSimSlotIndex());
+                } catch (NullPointerException ex) {
+                    loge("Failed to activate sub Exception: " + ex);
                 }
-            } catch (RemoteException ex) {
-                loge("Activate  sub failed " + result + " phoneId " + mSir.getSimSlotIndex());
-            } catch (NullPointerException ex) {
-                loge("Failed to activate sub Exception: " + ex);
+                return result;
             }
 
-            processSetUiccDone(result, newProvisionedState);
+            @Override
+            protected void onPostExecute(Integer result) {
+                processSetUiccDone(result.intValue(), newProvisionedState);
+            }
         }
 
         private void processSetUiccDone(int result, int newProvisionedState) {
@@ -819,6 +838,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
                 .OnClickListener() {
                     public void onClick(DialogInterface dialog, int which) {
                         if (which == DialogInterface.BUTTON_POSITIVE) {
+                            dismissDialog(sAlertDialog);
                             sendUiccProvisioningRequest();
                         } else if (which == DialogInterface.BUTTON_NEGATIVE) {
                             update();
-- 
cgit v1.1


From b2a048ae32924ffa9d7d0205c8dad2390cb162c6 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Mon, 4 Jul 2016 11:40:57 -0700
Subject: Automatic translation import

Change-Id: I0563baf29e6b805719a9e4c83437e8e84e3d5dce
---
 res/values-af/cm_strings.xml      |  2 +
 res/values-am/cm_strings.xml      |  2 +
 res/values-ar/cm_strings.xml      |  2 +
 res/values-as-rIN/cm_strings.xml  |  2 +
 res/values-ast-rES/cm_strings.xml |  2 +
 res/values-az-rAZ/cm_strings.xml  |  2 +
 res/values-be/cm_strings.xml      |  2 +
 res/values-bg/cm_strings.xml      |  2 +
 res/values-bn-rBD/cm_strings.xml  |  2 +
 res/values-br-rFR/cm_strings.xml  |  2 +
 res/values-ca/cm_strings.xml      |  2 +
 res/values-cs/cm_strings.xml      |  2 +
 res/values-csb-rPL/cm_strings.xml |  2 +
 res/values-cy/cm_strings.xml      |  2 +
 res/values-da/cm_strings.xml      |  6 +++
 res/values-de/cm_strings.xml      |  2 +
 res/values-el/cm_strings.xml      |  3 ++
 res/values-en-rAU/cm_strings.xml  |  2 +
 res/values-en-rGB/cm_strings.xml  |  2 +
 res/values-en-rIN/cm_strings.xml  |  2 +
 res/values-en-rPT/cm_strings.xml  |  2 +
 res/values-eo/cm_strings.xml      |  2 +
 res/values-es-rMX/cm_strings.xml  |  2 +
 res/values-es-rUS/cm_strings.xml  |  2 +
 res/values-es/cm_strings.xml      |  2 +
 res/values-et-rEE/cm_strings.xml  |  2 +
 res/values-eu-rES/cm_strings.xml  |  4 +-
 res/values-fa/cm_strings.xml      |  2 +
 res/values-fi/cm_strings.xml      |  2 +
 res/values-fil-rPH/cm_strings.xml |  2 +
 res/values-fr-rCA/cm_strings.xml  |  2 +
 res/values-fr/cm_strings.xml      |  2 +
 res/values-frp-rIT/cm_strings.xml |  2 +
 res/values-fy-rNL/cm_strings.xml  |  2 +
 res/values-gd-rGB/cm_strings.xml  |  2 +
 res/values-gl-rES/cm_strings.xml  |  2 +
 res/values-gu-rIN/cm_strings.xml  |  2 +
 res/values-hi/cm_strings.xml      |  2 +
 res/values-hr/cm_strings.xml      |  2 +
 res/values-hu/cm_strings.xml      |  2 +
 res/values-hy-rAM/cm_strings.xml  |  2 +
 res/values-in/cm_strings.xml      |  2 +
 res/values-is-rIS/cm_strings.xml  |  2 +
 res/values-it/cm_strings.xml      |  2 +
 res/values-iw/cm_strings.xml      |  3 ++
 res/values-ja/cm_strings.xml      |  2 +
 res/values-ka-rGE/cm_strings.xml  |  2 +
 res/values-kk-rKZ/cm_strings.xml  |  2 +
 res/values-km-rKH/cm_strings.xml  |  2 +
 res/values-kn-rIN/cm_strings.xml  |  2 +
 res/values-ko/cm_strings.xml      |  2 +
 res/values-ku/cm_strings.xml      |  2 +
 res/values-ky-rKG/cm_strings.xml  |  2 +
 res/values-lb/cm_strings.xml      |  2 +
 res/values-lo-rLA/cm_strings.xml  |  2 +
 res/values-lt/cm_strings.xml      |  2 +
 res/values-lv/cm_strings.xml      |  2 +
 res/values-mk-rMK/cm_strings.xml  |  2 +
 res/values-ml-rIN/cm_strings.xml  |  2 +
 res/values-mn-rMN/cm_strings.xml  |  2 +
 res/values-mr-rIN/cm_strings.xml  |  2 +
 res/values-ms-rMY/cm_strings.xml  |  2 +
 res/values-my-rMM/cm_strings.xml  |  2 +
 res/values-nb/cm_strings.xml      |  2 +
 res/values-ne-rNP/cm_strings.xml  |  2 +
 res/values-nl/cm_strings.xml      |  2 +
 res/values-oc-rFR/cm_strings.xml  |  2 +
 res/values-or-rIN/cm_strings.xml  |  2 +
 res/values-pa-rIN/cm_strings.xml  |  2 +
 res/values-pl/cm_strings.xml      |  2 +
 res/values-pt-rBR/cm_strings.xml  |  2 +
 res/values-pt-rPT/cm_strings.xml  |  2 +
 res/values-rm/cm_strings.xml      |  2 +
 res/values-ro/cm_strings.xml      |  2 +
 res/values-ru/cm_strings.xml      |  2 +
 res/values-si-rLK/cm_strings.xml  |  2 +
 res/values-sk/cm_strings.xml      |  2 +
 res/values-sl/cm_strings.xml      |  2 +
 res/values-sq-rAL/cm_strings.xml  |  2 +
 res/values-sr/cm_strings.xml      |  2 +
 res/values-sv/cm_strings.xml      |  2 +
 res/values-sw/cm_strings.xml      |  2 +
 res/values-ta-rIN/cm_strings.xml  |  2 +
 res/values-te-rIN/cm_strings.xml  |  2 +
 res/values-th/cm_strings.xml      |  2 +
 res/values-tr/cm_strings.xml      |  2 +
 res/values-ug/cm_strings.xml      |  2 +
 res/values-uk/cm_strings.xml      |  2 +
 res/values-ur-rPK/cm_strings.xml  |  2 +
 res/values-uz-rUZ/cm_strings.xml  |  2 +
 res/values-vi/cm_strings.xml      |  2 +
 res/values-zh-rCN/cm_strings.xml  |  2 +
 res/values-zh-rHK/cm_strings.xml  |  2 +
 res/values-zh-rTW/cm_strings.xml  | 99 +++++++++++++++++++++++++++++++++++++++
 res/values-zu/cm_strings.xml      |  2 +
 95 files changed, 294 insertions(+), 1 deletion(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 85fe607..59d781a 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1023,4 +1023,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index fc3d58a..119021c 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1057,4 +1057,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index c8c4b8f..026d5f0 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1016,4 +1016,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index ce45c03..4ce239b 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -1008,4 +1008,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="cm_radio_info_diag_log_on_label">Desactivar el rexistru Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activar el rexistru Diag</string>
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index f738da1..1672e85 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -718,4 +718,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 64dfb5c..5517466 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -1022,4 +1022,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 1210cb6..bea8b66 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Тапет при заключен екран</string>
   <string name="not_available_with_app">Не се предлага с %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 1545980..405bcc4 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -565,4 +565,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 4405b1b..8ce08da 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Fons de pantalla</string>
   <string name="not_available_with_app">No disponible amb %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 763be4d..32670ad 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1065,4 +1065,6 @@
   <string name="cm_radio_info_diag_log_on_label">Vypnout protokol Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Zapnout protokol Diag</string>
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index b1bbe3f..6b53179 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1009,9 +1009,13 @@
   <string name="allow_background_wlan">Kun via Wi\u2011Fi</string>
   <string name="allow_background_none">Ingen adgang</string>
   <string name="mobile_data_alert">Mobildata alarm</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktiver advarsler for dataforbrug</string>
+  <string name="data_usage_menu_disable_data_alerts">Desktiver advarsler for dataforbrug</string>
   <string name="data_usage_menu_reset_stats">Nulstil datastatistik</string>
   <string name="reset_stats_confirm">Bekræft</string>
+  <string name="restrict_cellular_access_title">Begræns adgang for mobildata</string>
   <string name="restrict_cellular_access_summary">Deaktiver adgang til data på mobilnetværk</string>
+  <string name="restrict_cellular_access_dialog_title">Begræns adgang for mobildata?</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netværksoperatører</string>
   <!-- title for lock screen blur preference -->
@@ -1041,4 +1045,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Baggrund</string>
   <string name="not_available_with_app">Ikke tilgængelig med %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 86733a3..57dd701 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Hintergrund</string>
   <string name="not_available_with_app">Nicht verfügbar für %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index c109e3d..cda6bfd 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1070,4 +1070,7 @@
   <string name="cm_radio_info_diag_log_off_label">Ενεργοποίηση καταγραφής Diag</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Ταπετσαρία</string>
+  <string name="not_available_with_app">Δεν είναι διαθέσιμo με %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 4570619..d51ee76 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -777,4 +777,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 143c164..3acfd1a 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -199,4 +199,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index f6da7bb..93eacf9 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -921,4 +921,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 6aca350..2c87b2a 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -856,4 +856,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 32ae31a..69cbe96 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -301,4 +301,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 976c32e..1b8e904 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1051,4 +1051,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d89db53..5c36180 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1058,4 +1058,6 @@
   <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activar el registro Diag</string>
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 18c86a4..f86477a 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -896,4 +896,6 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 0424c15..5d708d4 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -266,7 +266,7 @@
   <string name="notification_light_missed_call_title">Dei galdua</string>
   <string name="notification_light_voicemail_title">Ahots postontzia</string>
   <string name="notification_light_screen_on">Argitu pantaila piztean</string>
-  <string name="notification_light_zen_mode">Ez eten moduko argiak</string>
+  <string name="notification_light_zen_mode">Argiak ez eten moduan</string>
   <string name="notification_light_use_multiple_leds">Hainbat LED</string>
   <string name="keywords_lights_brightness_level">ilundu LEDaren argitasuna</string>
   <string name="notification_light_automagic">Hautatu koloreak automatikoki</string>
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Horma-papera</string>
   <string name="not_available_with_app">Ez dago eskuragarri %1$s aplikazioarekin</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 39e4caf..29477a4 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -905,4 +905,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index e185e7c..ef92775 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Taustakuva</string>
   <string name="not_available_with_app">Ei käytettävissä sovelluksessa %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 065c738..d20e9a5 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1051,4 +1051,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index b6b3660..d46a2cc 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -195,4 +195,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index ff52a5b..331a725 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -441,4 +441,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index d2c7f8c..9b29812 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1018,4 +1018,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 80460c2..8e5e1f5 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -869,4 +869,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index f93bf37..af66143 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1068,4 +1068,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Slika Pozadine</string>
   <string name="not_available_with_app">Nije dostupno sa %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 14a3875..8a5b648 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1018,4 +1018,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index d9d7b30..a9bb181 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1050,4 +1050,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 73e5e93..526f073 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1069,4 +1069,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Sfondo</string>
   <string name="not_available_with_app">Non disponibile con %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 0322f2c..8643461 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1057,4 +1057,7 @@
   <string name="cm_radio_info_mbn_auto_load_on_label">כיבוי טעינת MBN אוטומטית</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">הפעלת טעינת MBN אוטומטית</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">טפט</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index fc03860..2f71c7a 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1051,4 +1051,6 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">壁紙</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index e889c22..c7bc03c 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1018,4 +1018,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index c62d6f4..3dd9b9f 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -1044,4 +1044,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index bbf1990..33dedc6 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -778,4 +778,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 940f87f..78faf4a 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -899,4 +899,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 8eee280..e84d986 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -904,4 +904,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 72c4870..db2986b 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -557,4 +557,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 6c4365b..58270bb 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1017,4 +1017,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 396fea4..0508028 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1016,4 +1016,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 5e6dfca..bde01bf 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Bakgrunn</string>
   <string name="not_available_with_app">Ikke tilgjengelig med %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index cad760f..cd3ab4b 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1025,4 +1025,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 0371738..300256d 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1016,4 +1016,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 87e8e98..04bf9b7 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1061,4 +1061,6 @@
   <string name="cm_radio_info_diag_log_off_label">Wł. diagnostyczne logowanie</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Tapeta</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index c7594d0..7a35615 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Papel de parede</string>
   <string name="not_available_with_app">Indisponível com %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 498ea7a..e23938a 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1067,4 +1067,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Imagem de fundo</string>
   <string name="not_available_with_app">Não disponível com %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 6a5b99e..b703b17 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -940,4 +940,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 9e5fb07..949e976 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1052,4 +1052,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 072d63a..4287864 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -565,4 +565,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index c81f285..0ef6db5 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -904,4 +904,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 75ffc59..ee0ec0a 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1071,4 +1071,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Slika ozadja</string>
   <string name="not_available_with_app">Ni na voljo s/z %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index bb26363..823cf97 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1068,4 +1068,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Тапет</string>
   <string name="not_available_with_app">Није доступно са %1$s</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index d67aaae..d304b7b 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1036,4 +1036,6 @@ inkluderar en unik identifikation,
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 82eccfa..df54efc 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1016,4 +1016,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 67296ab..ea1c99c 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1016,4 +1016,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index e286efe..fb1789a 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1050,4 +1050,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 743fa07..5fa6f57 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1051,4 +1051,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index c2e13b3..0fc7d55 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1025,4 +1025,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index f53892a..85aa207 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -952,4 +952,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index c84a117..e941946 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1050,4 +1050,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index dad4be7..ae2e9b5 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1064,4 +1064,6 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">壁纸</string>
   <string name="not_available_with_app">同 %1$s 不可用</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index fba90d3..a71c995 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -844,4 +844,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index f861c0d..47947ff 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -163,6 +163,7 @@
   <string name="toggleData">數據連接</string>
   <string name="toggleSync">自動同步資料</string>
   <string name="toggle2g3g4g">首選網路類型</string>
+  <string name="toggle2g3g4g_msim">網路類型偏好 (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
@@ -259,9 +260,12 @@
   <string name="notification_light_default_value">預設</string>
   <string name="notification_light_missed_call_title">未接來電</string>
   <string name="notification_light_voicemail_title">語音信箱</string>
+  <string name="notification_light_zen_mode">在勿擾模式下啟用指示燈</string>
+  <string name="notification_light_automagic">自動選擇顏色</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
+  <string name="notification_light_no_apps_summary">若要控制個別應用程式，在功能列中啟動 \'%1$s\' 和 \'\u002b\'</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android 調試</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -332,15 +336,26 @@
   <string name="app_ops_summaries_project_media">媒體投放</string>
   <string name="app_ops_summaries_activate_vpn">啟用 VPN</string>
   <string name="app_ops_summaries_read_phone_state">讀取手機狀態</string>
+  <string name="app_ops_summaries_add_voicemail">新增語音郵件</string>
   <string name="app_ops_summaries_use_sip">使用 SIP</string>
   <string name="app_ops_summaries_make_call">撥打電話</string>
+  <string name="app_ops_summaries_use_fingerprint">使用指紋</string>
+  <string name="app_ops_summaries_use_body_sensors">使用人體感應器</string>
   <string name="app_ops_summaries_read_cell_broadcasts">讀取區域廣播</string>
   <string name="app_ops_summaries_mock_location">模擬位置</string>
   <string name="app_ops_summaries_read_external_storage">讀取外部存儲空間</string>
   <string name="app_ops_summaries_write_external_storage">寫到外部存儲空間</string>
   <string name="app_ops_summaries_turn_screen_on">開啟螢幕</string>
+  <string name="app_ops_summaries_get_accounts">取得帳戶</string>
+  <string name="app_ops_summaries_toggle_wifi">切換 Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">切換藍芽</string>
+  <string name="app_ops_summaries_start_at_boot">在開機時啟動</string>
+  <string name="app_ops_summaries_toggle_nfc">切換 NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">切換行動網路</string>
   <string name="app_ops_summaries_superuser">Root 權限</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_labels_coarse_location">粗略位置</string>
+  <string name="app_ops_labels_fine_location">精確位置</string>
   <string name="app_ops_labels_gps">GPS</string>
   <string name="app_ops_labels_vibrate">震動</string>
   <string name="app_ops_labels_read_contacts">讀取聯絡人資料</string>
@@ -351,10 +366,17 @@
   <string name="app_ops_labels_modify_calendar">修改日曆</string>
   <string name="app_ops_labels_wifi_scan">Wi-Fi 掃瞄</string>
   <string name="app_ops_labels_notification">通知/Toast</string>
+  <string name="app_ops_labels_cell_scan">基站掃瞄</string>
   <string name="app_ops_labels_call_phone">撥打電話</string>
+  <string name="app_ops_labels_read_sms">讀取簡訊</string>
+  <string name="app_ops_labels_write_sms">撰寫簡訊</string>
   <string name="app_ops_labels_receive_sms">接收簡訊</string>
+  <string name="app_ops_labels_receive_emergency_sms">接收緊急簡訊</string>
   <string name="app_ops_labels_receive_mms">接收多媒體簡訊</string>
+  <string name="app_ops_labels_receive_wap_push">接收 WAP 推送</string>
   <string name="app_ops_labels_send_sms">傳送簡訊</string>
+  <string name="app_ops_labels_read_icc_sms">讀取 ICC 簡訊</string>
+  <string name="app_ops_labels_write_icc_sms">撰寫 ICC 短訊</string>
   <string name="app_ops_labels_modify_settings">修改設定</string>
   <string name="app_ops_labels_draw_on_top">在最上層繪圖</string>
   <string name="app_ops_labels_access_notifications">存取通知</string>
@@ -373,10 +395,30 @@
   <string name="app_ops_labels_notification_volume">通知音量</string>
   <string name="app_ops_labels_bluetooth_volume">藍牙音量</string>
   <string name="app_ops_labels_keep_awake">停用休眠</string>
+  <string name="app_ops_labels_monitor_location">監控位置</string>
+  <string name="app_ops_labels_monitor_high_power_location">監控高耗電定位功能</string>
+  <string name="app_ops_labels_get_usage_stats">取得使用統計</string>
   <string name="app_ops_labels_mute_unmute_microphone">將麥克風靜音/解除靜音</string>
   <string name="app_ops_labels_toast_window">顯示 toasts 通知</string>
   <string name="app_ops_labels_project_media">媒體投放</string>
   <string name="app_ops_labels_activate_vpn">啟用 VPN</string>
+  <string name="app_ops_labels_read_phone_state">讀取電話狀態</string>
+  <string name="app_ops_labels_add_voicemail">新增語音郵件</string>
+  <string name="app_ops_labels_use_sip">使用 SIP</string>
+  <string name="app_ops_labels_make_call">撥號</string>
+  <string name="app_ops_labels_use_fingerprint">使用指紋</string>
+  <string name="app_ops_labels_use_body_sensors">使用人體感應器</string>
+  <string name="app_ops_labels_read_cell_broadcasts">讀取區域廣播</string>
+  <string name="app_ops_labels_mock_location">模擬位置</string>
+  <string name="app_ops_labels_read_external_storage">讀取外部存儲空間</string>
+  <string name="app_ops_labels_write_external_storage">寫到外部存儲空間</string>
+  <string name="app_ops_labels_turn_screen_on">開啟螢幕</string>
+  <string name="app_ops_labels_get_accounts">取得帳戶</string>
+  <string name="app_ops_labels_toggle_wifi">切換 Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">切換藍芽</string>
+  <string name="app_ops_labels_start_at_boot">在開機時啟動</string>
+  <string name="app_ops_labels_toggle_nfc">切換 NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">切換行動網路</string>
   <string name="app_ops_labels_superuser">Root 權限</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">允許</string>
@@ -546,6 +588,11 @@
   <string name="live_display_color_profile_natural_title">自然</string>
   <string name="live_display_color_profile_dynamic_title">動態</string>
   <string name="live_display_color_profile_cinema_title">劇院</string>
+  <string name="live_display_color_profile_cinema_summary">完美重現影片色彩</string>
+  <string name="live_display_color_profile_photography_title">攝影</string>
+  <string name="live_display_color_profile_photography_summary">完美重現照片色彩</string>
+  <string name="live_display_color_profile_basic_title">基本</string>
+  <string name="live_display_color_profile_basic_summary">使用未校正的顯示</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">輸入法選擇器圖示</string>
   <string name="ime_switcher_notify_summary">顯示輸入法選擇器圖示</string>
@@ -648,6 +695,8 @@
   <string name="status_bar_battery_percentage_text_inside">圖示內</string>
   <string name="status_bar_battery_percentage_text_next">圖示旁</string>
   <!-- Status bar - icon blacklist -->
+  <string name="status_bar_icons_title">狀態列圖示</string>
+  <string name="status_bar_icons_summary">控制顯示哪些狀態列圖示</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">攔截手勢觸控事件</string>
   <string name="edge_gesture_service_summary">不向應用程式傳送導覽列與狀態列手勢的觸控事件</string>
@@ -680,6 +729,9 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">顯示音樂視覺效果</string>
   <!-- lock screen disabled by QS tile warning -->
+  <string name="lockscreen_disabled_by_qs_tile_title">經由快速設定瓷磚停用</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">點擊以啟用螢幕鎖定</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">螢幕鎖定已啟用</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">省電助手的閾值</string>
   <string name="battery_saver_summary">降低效能，並限制背景資料</string>
@@ -688,6 +740,7 @@
   <string name="autoperf_title">啟用應用程式專屬 (per-app) 設定檔</string>
   <string name="perf_profile_title">電池模式</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">開機時啟動的應用程式</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">通知鈴聲</string>
   <!-- Advanced reboot options -->
@@ -716,6 +769,7 @@
   <string name="voice_wakeup_retrain_title">重新訓練您的語音</string>
   <string name="voice_wakeup_activity_title">行動啟動</string>
   <string name="voice_wakeup_default_activity">Google 即時資訊</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">語音喚醒需要擁有直接撥打聯絡人電話的權限。</string>
   <string name="picker_activities">Activities</string>
   <string name="select_custom_app_title">選擇自訂應用程式</string>
   <string name="select_custom_activity_title">選擇自訂 activity</string>
@@ -792,6 +846,7 @@
   <string name="pa_login_submit_button">登入</string>
   <string name="pa_login_checking_password">正在檢查帳戶\u2026</string>
   <string name="pa_login_incorrect_login">登入不正確</string>
+  <string name="pa_pattern_or_fingerprint_header">必須使用圖形或指紋解鎖</string>
   <!-- Contributors cloud activity -->
   <string name="contributors_cloud_fragment_title">貢獻者</string>
   <string name="contributors_cloud_loading_message">貢獻者名單載入中\u2026</string>
@@ -807,24 +862,41 @@
   <string name="title_general">一般</string>
   <string name="advanced">進階</string>
   <string name="link_volume_option_title">同步鈴聲和通知音量</string>
+  <string name="lcd_density_prompt_message">有些應用程式可能無法在非標準 DPI 下運行。\n\n這將重啟您的設備。</string>
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">重覆的 APN</string>
+  <string name="duplicate_apn_error_message">此 APN 已存在，請放棄或修改參數。</string>
   <string name="sim_disabled">已停用</string>
   <string name="sim_missing">遺失或毀損</string>
+  <string name="sim_enabler_need_disable_sim">SIM 卡將被停用，確定要繼續嗎？</string>
+  <string name="sim_enabler_will_disable_sim_title">注意</string>
+  <string name="sim_enabler_need_switch_data_service">此 SIM 卡將被停用，並且將使用 SIM 卡 <xliff:g id="slotid">%1$s</xliff:g> 於數據服務中，您確定要繼續？</string>
   <string name="sim_enabler_airplane_on">飛行模式開啟时無法進行此操作。</string>
   <string name="sim_enabler_in_call">通話時無法進行此操作。</string>
   <string name="sim_enabler_both_inactive">無法停用所有 SIM 卡</string>
+  <string name="sim_enabler_enabling">啟用中\u2026</string>
+  <string name="sim_enabler_disabling">禁用中\u2026</string>
+  <string name="sub_activate_success">SIM 卡已經啟用。</string>
+  <string name="sub_activate_failed">啟用失敗。</string>
+  <string name="sub_deactivate_success">SIM 卡已經停用。</string>
+  <string name="sub_deactivate_failed">停用失敗。</string>
   <string name="primary_sub_select_title">預設使用3G/LTE</string>
+  <string name="select_sim_card">選擇 SIM 卡</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Sim 卡 %d 狀態</string>
   <string name="sim_card_lock_settings_title">Sim 卡 %d 鎖定設置</string>
   <string name="sim_card_summary_empty">沒有插入Sim卡</string>
+  <string name="sim_mobile_network_settings_category_title">行動網路設定</string>
   <string name="sim_mobile_network_settings_title">Sim 卡 %d 設定</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <string name="zen_mode_summary_reminders">提醒</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_events">事件</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <string name="zen_mode_summary_selected_messages">已選的訊息</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">頭部：%1$s W/kg</string>
@@ -834,8 +906,11 @@
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">SIM %d 鈴聲</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">應用程式：</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">最後一次使用：</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">使用時間：</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
   <!-- Factory reset strings -->
@@ -850,8 +925,12 @@
   <string name="factory_reset_warning_text_reset_now">現在重置</string>
   <string name="factory_reset_warning_text_message">您所有帳戶、應用程式、應用程式資料及系統設置將從此設備上移除，並不可逆轉。</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">其他</string>
   <!-- Wi-Fi tethering inactivity timeout -->
   <string name="hotstpot_inactivity_timeout_never">永不</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 分鐘</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 分鐘</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 分鐘</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <!-- Live lock screen summary -->
@@ -867,10 +946,25 @@
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="privacy_guard_internet_category">網路</string>
   <!-- Weather -->
+  <string name="weather_settings_title">天氣</string>
+  <string name="weather_settings_no_services_prompt">沒有安裝任何天氣服務</string>
+  <string name="weather_settings_button">服務選項</string>
+  <string name="weather_settings_add_weather_provider">新增天氣服務</string>
   <string name="weather_settings_general_settings_title">一般</string>
+  <string name="weather_settings_providers_title">天氣服務</string>
+  <string name="weather_settings_temp_units_title">溫度單位</string>
+  <string name="weather_settings_temp_celsius">攝氏</string>
+  <string name="weather_settings_temp_fahrenheit">華氏</string>
+  <string name="weather_settings_keyword">天氣</string>
+  <string name="data_usage_menu_enable_data_alerts">啟用資料使用警告</string>
+  <string name="data_usage_menu_disable_data_alerts">關閉資料使用警告</string>
+  <string name="reset_stats_confirm">確認</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">電信業者</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">模糊背景</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">顯示天氣資訊</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -879,6 +973,11 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">在鎖屏上停用持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">加強無線管理</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_volte_avail_ovr_on_label">關閉 VoLTE 偵錯</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">桌布</string>
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 53cbd0e..f6b2203 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -186,4 +186,6 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
 </resources>
-- 
cgit v1.1


From c55609462bc8c1986a3f7199cd19963db6522106 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sun, 3 Jul 2016 22:11:26 +0200
Subject: Settings: Don't set the icon for sim activation / deactivation dialog

* This icon doesn't look any good.
  It's better to just get rid of it.

Change-Id: I47f70a80136695e9aa61ff98999a2cf770390079
---
 src/com/android/settings/sim/SimSettings.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index d85a509..2b9c3fe 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -743,7 +743,6 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
             dismissDialog(sAlertDialog);
             dismissDialog(sProgressDialog);
             AlertDialog.Builder builder = new AlertDialog.Builder(mContext)
-                    .setIcon(android.R.drawable.ic_dialog_alert)
                     .setTitle(title);
 
             switch(dialogId) {
-- 
cgit v1.1


From e64a234e25e61a906c94b3ba0a87f322c3caaaac Mon Sep 17 00:00:00 2001
From: Luca Stefani <luca.stefani.ge1@gmail.com>
Date: Sun, 3 Jul 2016 21:56:08 +0200
Subject: Settings: Disable sim switch if subscription isn't valid

Change-Id: I22ba9a3270da13f77fdd43586b7dc487f0929453
---
 src/com/android/settings/sim/SimSettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 2b9c3fe..88ed36f 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -516,7 +516,7 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
                 mSwitch.setVisibility(View.GONE);
             } else {
                 mSwitch.setVisibility(View.VISIBLE);
-                mSwitch.setEnabled(!isAirplaneModeOn());
+                mSwitch.setEnabled(!isAirplaneModeOn() && isCurrentSubValid());
             }
         }
 
-- 
cgit v1.1


From d4287ef98ddcaa759b0f3501f51ef52065d2605b Mon Sep 17 00:00:00 2001
From: Scott Mertz <scott@cyngn.com>
Date: Tue, 28 Jun 2016 18:00:08 -0700
Subject: Prevent orientation changes from destroying/recreating security
 settings

Logic in SecuritySettings deliberately recreates the entire preference
tree in onResume rather than onCreate.  This causes the state to be
lost when the orientation changes.

Instead of destroying/recreating when the orientation changes, handle
it ourselves.

Change-Id: I6276d8f97cb64a4823286f263642926561d7f2d0
---
 AndroidManifest.xml                       | 6 ++++++
 src/com/android/settings/SubSettings.java | 1 +
 src/com/android/settings/Utils.java       | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 523d4cc..ed8d6ed 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -394,6 +394,12 @@
                 android:parentActivityName="Settings">
         </activity>
 
+        <activity android:name=".SubSettings$SecuritySubSettings"
+                android:taskAffinity="com.android.settings"
+                android:configChanges="orientation|keyboardHidden|screenSize"
+                android:parentActivityName="Settings">
+        </activity>
+
         <activity android:name="Settings$BluetoothSettingsActivity"
                 android:label="@string/bluetooth_settings_title"
                 android:taskAffinity="">
diff --git a/src/com/android/settings/SubSettings.java b/src/com/android/settings/SubSettings.java
index 13ead6e..2bf451e 100644
--- a/src/com/android/settings/SubSettings.java
+++ b/src/com/android/settings/SubSettings.java
@@ -36,4 +36,5 @@ public class SubSettings extends SettingsActivity {
         return true;
     }
     public static class BluetoothSubSettings extends SubSettings { /* empty */ }
+    public static class SecuritySubSettings extends SubSettings { /* empty */ }
 }
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 5c58193..49b93e6 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -867,6 +867,9 @@ public final class Utils {
         if (BluetoothSettings.class.getName().equals(fragmentName)) {
             intent.setClass(context, SubSettings.BluetoothSubSettings.class);
             intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
+         } else if (SecuritySettings.class.getName().equals(fragmentName)) {
+            intent.setClass(context, SubSettings.SecuritySubSettings.class);
+            intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SUBSETTING, true);
          } else {
              intent.setClass(context, SubSettings.class);
          }
-- 
cgit v1.1


From 91c66f18051c7c382f8d5fe91ebb066ba6404797 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Wed, 6 Jul 2016 12:00:06 -0700
Subject: Automatic translation import

Change-Id: Ifd76aa8307f0bf250dfbf92898c4caee104bcf26
Ticket: -
---
 res/values-ca/cm_strings.xml     |  5 +++++
 res/values-cs/cm_strings.xml     |  1 -
 res/values-el/cm_strings.xml     |  5 +++++
 res/values-eu-rES/cm_strings.xml |  5 +++++
 res/values-fi/cm_strings.xml     |  5 +++++
 res/values-hr/cm_strings.xml     |  5 +++++
 res/values-it/cm_strings.xml     |  5 +++++
 res/values-ja/cm_strings.xml     | 20 ++++++++++++++++++++
 res/values-nb/cm_strings.xml     | 11 ++++++++---
 res/values-pt-rBR/cm_strings.xml |  5 +++++
 res/values-pt-rPT/cm_strings.xml |  5 +++++
 res/values-sr/cm_strings.xml     |  5 +++++
 12 files changed, 73 insertions(+), 4 deletions(-)

diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 8ce08da..a049bae 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Fons de pantalla</string>
   <string name="not_available_with_app">No disponible amb %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localitza el sensor d\'empremtes digitals al <xliff:g id="sensor_location">%1$s</xliff:g> del teu telèfon.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">darrera</string>
+  <string name="security_settings_fingerprint_sensor_location_front">davant</string>
+  <string name="security_settings_fingerprint_sensor_location_left">costat esquerre</string>
+  <string name="security_settings_fingerprint_sensor_location_right">costat dret</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 32670ad..d544dfc 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1043,7 +1043,6 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Rozostření pozadí</string>
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">Zobrazit počasí</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Zobrazit na zamykací obrazovce</string>
   <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index cda6bfd..eaf89b3 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1072,5 +1072,10 @@
   <string name="lockscreen_wallpaper_title">Ταπετσαρία</string>
   <string name="not_available_with_app">Δεν είναι διαθέσιμo με %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Εντοπίστε τον αισθητήρα μοναδικού χαρακτηριστικού <xliff:g id="sensor_location">%1$s</xliff:g> του τηλεφώνου σας.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">στο πίσω μέρος</string>
+  <string name="security_settings_fingerprint_sensor_location_front">στο μπροστινό μέρος</string>
+  <string name="security_settings_fingerprint_sensor_location_left">στην αριστερή πλευρά</string>
+  <string name="security_settings_fingerprint_sensor_location_right">στη δεξιά πλευρά</string>
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 5d708d4..558e084 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Horma-papera</string>
   <string name="not_available_with_app">Ez dago eskuragarri %1$s aplikazioarekin</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Kokatu hatz-marken sentsorea zure telefonoaren <xliff:g id="sensor_location">%1$s</xliff:g>.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">atzealdean</string>
+  <string name="security_settings_fingerprint_sensor_location_front">aurrealdean</string>
+  <string name="security_settings_fingerprint_sensor_location_left">ezkerraldean</string>
+  <string name="security_settings_fingerprint_sensor_location_right">eskuinaldean</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index ef92775..d6eed90 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Taustakuva</string>
   <string name="not_available_with_app">Ei käytettävissä sovelluksessa %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Etsi sormenjälkitunnistin puhelimen <xliff:g id="sensor_location">%1$s</xliff:g>.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">takaa</string>
+  <string name="security_settings_fingerprint_sensor_location_front">edestä</string>
+  <string name="security_settings_fingerprint_sensor_location_left">vasemmasta reunasta</string>
+  <string name="security_settings_fingerprint_sensor_location_right">oikeasta reunasta</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index af66143..e7b2ab4 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1069,5 +1069,10 @@
   <string name="lockscreen_wallpaper_title">Slika Pozadine</string>
   <string name="not_available_with_app">Nije dostupno sa %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Pronađite senzor otiska prsta na <xliff:g id="sensor_location">%1$s</xliff:g> vašeg telefona.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">stražnjoj strani</string>
+  <string name="security_settings_fingerprint_sensor_location_front">prednjoj strani</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lijevoj strani</string>
+  <string name="security_settings_fingerprint_sensor_location_right">desnoj strani</string>
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 526f073..b34bb21 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1070,5 +1070,10 @@
   <string name="lockscreen_wallpaper_title">Sfondo</string>
   <string name="not_available_with_app">Non disponibile con %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Individua il sensore d\'impronte nella parte <xliff:g id="sensor_location">%1$s</xliff:g> del tuo telefono.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">posteriore</string>
+  <string name="security_settings_fingerprint_sensor_location_front">anteriore</string>
+  <string name="security_settings_fingerprint_sensor_location_left">sinistra</string>
+  <string name="security_settings_fingerprint_sensor_location_right">destra</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 2f71c7a..80d0ceb 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1040,6 +1040,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">通信事業者</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">背景のぼかし</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">天気を表示</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1048,9 +1049,28 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">常駐する通知をロック画面で無効化</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">このアプリからの常駐する通知をロック画面に表示しない</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">拡張無線通信コントロール</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">MBN自動読み込みをOFF</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">MBN自動読み込みをON</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">VoLTEデバッグをOFF</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">VoLTEデバッグをON</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">VTデバッグをOFF</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">VTデバッグをON</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">WFCデバッグをOFF</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">WFCデバッグをON</string>
+  <string name="cm_radio_info_adb_log_on_label">ADB無線通信ログをOFF</string>
+  <string name="cm_radio_info_adb_log_off_label">ADB無線通信ログをON</string>
+  <string name="cm_radio_info_diag_log_on_label">DiagログをOFF</string>
+  <string name="cm_radio_info_diag_log_off_label">DiagログをON</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">壁紙</string>
+  <string name="not_available_with_app">%1$sでは利用できません</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">携帯電話の<xliff:g id="sensor_location">%1$s</xliff:g>にある指紋センサーを探してください。</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">背面</string>
+  <string name="security_settings_fingerprint_sensor_location_front">前面</string>
+  <string name="security_settings_fingerprint_sensor_location_left">左側面</string>
+  <string name="security_settings_fingerprint_sensor_location_right">右側面</string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index bde01bf..fbe2980 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -558,7 +558,7 @@
   <string name="color_blue_title">Blå</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Start musikk app</string>
-  <string name="headset_connect_player_summary">Start standard musikk app når hodesett er tilkoblet</string>
+  <string name="headset_connect_player_summary">Start standard musikk app når headset er tilkoblet</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Automatisk prioritet</string>
   <string name="auto_brightness_reset_button">Tilbakestill</string>
@@ -801,11 +801,11 @@
   <string name="recents_show_searchbar">Vis søkelinjen i siste-menyen</string>
   <string name="keywords_recents_show_searchbar">siste siste-menyen deaktiver aktivert vis skjul søkebar søkefelt</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Stemme oppvekking</string>
+  <string name="voice_wakeup_settings_title">Stemme Oppvekking</string>
   <string name="voice_wakeup_retrain_title">Tren stemme igjen</string>
   <string name="voice_wakeup_activity_title">Aktivitet som skal starte</string>
   <string name="voice_wakeup_default_activity">Google Nå</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">Stemmeoppvekking trenger telefon samtale tillatelser for å velge en Direkteoppringings kontakt.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Stemme Oppvekking trenger telefon samtale tillatelser for å velge en Direkteoppringings kontakt.</string>
   <string name="picker_activities">Aktiviteter</string>
   <string name="select_custom_app_title">Velg egendefinert app</string>
   <string name="select_custom_activity_title">Velg egendefinert aktivitet</string>
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Bakgrunn</string>
   <string name="not_available_with_app">Ikke tilgjengelig med %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Finn fingerskanneren på <xliff:g id="sensor_location">%1$s</xliff:g> av telefonen din.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">baksiden</string>
+  <string name="security_settings_fingerprint_sensor_location_front">forsiden</string>
+  <string name="security_settings_fingerprint_sensor_location_left">venstre siden</string>
+  <string name="security_settings_fingerprint_sensor_location_right">høyre siden</string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 7a35615..12b6d0d 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Papel de parede</string>
   <string name="not_available_with_app">Indisponível com %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localize o sensor de impressão digital sobre o(a) <xliff:g id="sensor_location">%1$s </xliff:g> do seu telefone.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">traseira</string>
+  <string name="security_settings_fingerprint_sensor_location_front">frente</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lado esquerdo</string>
+  <string name="security_settings_fingerprint_sensor_location_right">lado direito</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index e23938a..f892c85 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Imagem de fundo</string>
   <string name="not_available_with_app">Não disponível com %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localize o sensor de impressões digitais na <xliff:g id="sensor_location">%1$s</xliff:g> do seu telefone.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">traseira</string>
+  <string name="security_settings_fingerprint_sensor_location_front">parte frontal</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lateral esquerda</string>
+  <string name="security_settings_fingerprint_sensor_location_right">lateral direita</string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 823cf97..b4e2063 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1069,5 +1069,10 @@
   <string name="lockscreen_wallpaper_title">Тапет</string>
   <string name="not_available_with_app">Није доступно са %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Нађи сензор отиска прста <xliff:g id="sensor_location">%1$s</xliff:g> твог телефона.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">иза</string>
+  <string name="security_settings_fingerprint_sensor_location_front">испред</string>
+  <string name="security_settings_fingerprint_sensor_location_left">на левој страни</string>
+  <string name="security_settings_fingerprint_sensor_location_right">на десној страни</string>
 </resources>
-- 
cgit v1.1


From 7536d60773c593302bdcc11f531f5b42a89b6633 Mon Sep 17 00:00:00 2001
From: Altaf-Mahdi <altaf.mahdi@gmail.com>
Date: Thu, 7 Jul 2016 09:57:32 +0100
Subject: InstalledAppDetails: fix refreshing storage summary after force stop

* if app is force stopped, current implementation causes a nasty loop which in turn causes
  very high cpu usage: refreshUi() > checkForceStop() > mCheckKillProcessesReceiver > refreshUi()

* fix storage not being updated by running refreshUi() in onRunningStateChanged from AppInfoBase

Ticket: CYNGNOS-2527

Change-Id: Iec24bb620d1a6287d7ccf583db978ef338ef762e
---
 src/com/android/settings/applications/AppInfoBase.java         | 2 +-
 src/com/android/settings/applications/InstalledAppDetails.java | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index 9528ec1..cd8d1b5 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -156,7 +156,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
 
     @Override
     public void onRunningStateChanged(boolean running) {
-        // No op.
+        refreshUi();
     }
 
     @Override
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index cc1b241..f9dda55 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -1021,7 +1021,6 @@ public class InstalledAppDetails extends AppInfoBase
         public void onReceive(Context context, Intent intent) {
             if (getActivity() != null && !getActivity().isDestroyed()) {
                 updateForceStopButton(getResultCode() != Activity.RESULT_CANCELED);
-                refreshUi();
             }
         }
     };
-- 
cgit v1.1


From d3a1dfef7280a80229af8e6fa5145b5c50165bea Mon Sep 17 00:00:00 2001
From: Dave Kover <kover@cyngn.com>
Date: Thu, 7 Jul 2016 12:14:46 -0700
Subject: Break out Bluetooth device icon from dashboard reference.

If a theme wants to use a different visual iconography style in
the subsettings, the bluetooth icon is shared between the dashboard
and that view. By adding this new reference, a themer can choose to
independently theme the subsettings version if their design calls
for that.

Change-Id: Iac3a58175f90357e0c42efe57b1e698d5c8e2ad3
Ticket: CYNGNOS-3176
---
 res/values/cm_drawables.xml                        | 22 ++++++++++++++++++++++
 .../bluetooth/BluetoothDevicePreference.java       |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 res/values/cm_drawables.xml

diff --git a/res/values/cm_drawables.xml b/res/values/cm_drawables.xml
new file mode 100644
index 0000000..f9c5f45
--- /dev/null
+++ b/res/values/cm_drawables.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 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>
+
+    <!-- Default Bluetooth icon for subsettings -->
+    <drawable name="ic_bt_bluetooth">@drawable/ic_settings_bluetooth</drawable>
+
+</resources>
\ No newline at end of file
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 836ff12..93f6f5d 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -284,7 +284,7 @@ public final class BluetoothDevicePreference extends Preference implements
                 return R.drawable.ic_bt_headset_hfp;
             }
         }
-        return R.drawable.ic_settings_bluetooth;
+        return R.drawable.ic_bt_bluetooth;
     }
 
     private final BroadcastReceiver mBluetoothReceiver = new BroadcastReceiver() {
-- 
cgit v1.1


From 4e9b18bf72cb9d288b99fe57c5ebf8eee5ab5e90 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Fri, 1 Jul 2016 21:05:34 +0800
Subject: Settings: Add adaptive display mode desc. strings

Samsung devices support an 'Adaptive' display mode, or more
commonly known as 'Auto'. Add the descriptions for this mode.

Change-Id: I8532c00b01c0adf5d8d4ff0baed13246937d1ced
---
 res/values/cm_strings.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index e032cd1..cd091fd 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -705,6 +705,8 @@
     <string name="live_display_color_profile_photography_summary">Perfect color reproduction for photos</string>
     <string name="live_display_color_profile_basic_title">Basic</string>
     <string name="live_display_color_profile_basic_summary">Use the display uncalibrated</string>
+    <string name="live_display_color_profile_adaptive_title">Adaptive</string>
+    <string name="live_display_color_profile_adaptive_summary">Colors adapt to ambient conditions</string>
 
     <!-- Whether to display IME switcher notifcation -->
     <string name="ime_switcher_notify">Selector icon</string>
-- 
cgit v1.1


From de44f4355cac698c2ffab867cc62a3b26a117008 Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Mon, 11 Jul 2016 17:09:42 -0700
Subject: Automatic translation import

Change-Id: I8cac94e7ac0bc215be6ea57da04497f0e61ce2e4
Ticket: -
---
 res/values-bg/cm_strings.xml     |  5 +++++
 res/values-de/cm_strings.xml     |  5 +++++
 res/values-ja/cm_strings.xml     | 12 ++++++------
 res/values-nb/cm_strings.xml     | 18 +++++++++---------
 res/values-ru/cm_strings.xml     | 25 +++++++++++++++++++++++--
 res/values-zh-rCN/cm_strings.xml |  5 +++++
 6 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index bea8b66..a660697 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Тапет при заключен екран</string>
   <string name="not_available_with_app">Не се предлага с %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Намерете сензора за пръстови отпечатъци <xliff:g id="sensor_location">%1$s </xliff:g> на вашия телефон.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">Отзад</string>
+  <string name="security_settings_fingerprint_sensor_location_front">Отпред</string>
+  <string name="security_settings_fingerprint_sensor_location_left">Лява страна</string>
+  <string name="security_settings_fingerprint_sensor_location_right">Дясна страна</string>
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 57dd701..12bd0b4 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1068,5 +1068,10 @@
   <string name="lockscreen_wallpaper_title">Hintergrund</string>
   <string name="not_available_with_app">Nicht verfügbar für %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Suchen Sie den Fingerabdrucksensor auf der <xliff:g id="sensor_location">%1$s</xliff:g> des Gerätes.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">Front</string>
+  <string name="security_settings_fingerprint_sensor_location_front">Rückseite</string>
+  <string name="security_settings_fingerprint_sensor_location_left">linken Seite</string>
+  <string name="security_settings_fingerprint_sensor_location_right">rechten Seite</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 80d0ceb..02b6f44 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -810,13 +810,13 @@
   <string name="select_custom_activity_title">カスタムのアクティビティを選択</string>
   <!-- Blacklist preferences -->
   <string name="blacklist_title">着信拒否リスト</string>
-  <string name="blacklist_edit_dialog_title">着信拒否した電話番号を編集</string>
+  <string name="blacklist_edit_dialog_title">着信拒否する電話番号を編集</string>
   <string name="blacklist_prefs">設定</string>
   <string name="blacklist_button_delete">削除</string>
   <string name="blacklist_empty_text">着信拒否した番号がありません。追加（+）ボタンをタップしてエントリーを追加します。</string>
   <string name="blacklist_disabled_empty_text">特定の電話番号からの通話やメッセージを拒否するには、着信拒否リストを有効にしてください。</string>
   <string name="blacklist_summary_disabled">無効</string>
-  <string name="blacklist_summary">着信拒否リストにある電話番号からの着信やメッセージを受け取らないようにします</string>
+  <string name="blacklist_summary">着信拒否リストにある電話番号からの着信やメッセージを受け取らないようにする</string>
   <string name="blacklist_notify">通知を表示</string>
   <string name="blacklist_private_numbers_title">非通知番号</string>
   <string name="blacklist_private_numbers_summary_disabled">非通知番号からの着信を拒否しない</string>
@@ -829,12 +829,12 @@
   <string name="blacklist_summary_type_calls_and_messages">着信とメッセージ</string>
   <string name="blacklist_regex_title">ワイルドカードを使用</string>
   <string name="blacklist_regex_summary">[.]をワイルドカードとして使用し、[*]を繰り返しとして使用します。例えば[123.*]なら123から始まる番号をブロックし、[.*123.*]なら123を含む番号をブロックします。</string>
-  <string name="blacklist_policy_block_calls">着信拒否する</string>
-  <string name="blacklist_policy_block_messages">メッセージを受信拒否する</string>
+  <string name="blacklist_policy_block_calls">着信拒否</string>
+  <string name="blacklist_policy_block_messages">メッセージを受信拒否</string>
   <string name="blacklist_bad_number_add">無効な電話番号は着信拒否リストに追加できません</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">番号を削除</string>
-  <string name="remove_blacklist_entry">この着信拒否している電話番号を削除しますか？</string>
+  <string name="remove_blacklist_entry">着信拒否しているこの電話番号を削除しますか？</string>
   <string name="select_contact">連絡先を選択</string>
   <!-- Sms security limit -->
   <string name="app_security_title">アプリのセキュリティ</string>
@@ -851,7 +851,7 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">CyanogenModの統計</string>
-  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意してCyanogenModの改善を支援する</string>
+  <string name="anonymous_statistics_summary">匿名の統計のレポートに同意してCyanogenModの改善に協力する</string>
   <string name="anonymous_statistics_warning_title">情報</string>
   <string name="anonymous_statistics_warning">CyanogenModの統計に同意すると、端末間のユニークインストール回数を調べるためにCyanogenModの開発者への非個人情報の送信を許可します。送信される情報にはユニークIDが含まれますが、プライバシーや個人データが危険にさらされることはありません。データはブート時に送信されます。\n\n送信されるデータの見本は[データをプレビュー]をタップして確認することができます。</string>
   <string name="enable_reporting_title">レポートを有効化</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index fbe2980..8f17cfd 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -51,7 +51,7 @@
   <string name="mod_api_level">CyanogenMod API nivå</string>
   <string name="mod_api_level_default">Ukjent</string>
   <!-- About phone screen, build date -->
-  <string name="build_date">Byggdato</string>
+  <string name="build_date">Build-dato</string>
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">CyanogenMod oppdateringer</string>
   <!-- Settings switch for updating Cyanogen recovery -->
@@ -189,7 +189,7 @@
   <string name="profile_menu_delete_title">Slett</string>
   <string name="profile_action_none">La stå uendret</string>
   <string name="profile_action_system">Systemstandard</string>
-  <string name="profile_action_disable">slå av</string>
+  <string name="profile_action_disable">Slå av</string>
   <string name="profile_action_enable">Slå på</string>
   <string name="profile_trigger_a2dp_connect">Ved A2DP tilkobling</string>
   <string name="profile_trigger_a2dp_disconnect">Ved A2DP frakobling</string>
@@ -214,7 +214,7 @@
   <string name="no_bluetooth_triggers">Ingen Bluetooth-enheter sammenkoblet. \nTrykk for å parre Bluetooth-enhet før du konfigurerer utløsere.</string>
   <string name="no_wifi_triggers">Ingen Wi\u2011Fi tilgangspunkter konfigurert. \nTrykk for å koble til Wi\u2011Fi før du konfigurerer utløsere.</string>
   <string name="no_triggers_configured">Ingen utløsere konfigurert. Trykk for å legge til flere.</string>
-  <string name="no_triggers_configured_nfc">Trykk for å setup en ny NFC utløser.</string>
+  <string name="no_triggers_configured_nfc">Trykk for å konfigurere en ny NFC utløser.</string>
   <string name="profile_setup_setup_triggers_description">Velg utløsere som aktiverer denne profilen</string>
   <string name="profile_setup_actions_description">Nå konfigurer hva som skjer når profilen er aktivert</string>
   <!-- Navigation Bar -->
@@ -693,7 +693,7 @@
   <string name="status_bar_title">Statuslinjen</string>
   <string name="status_bar_toggle_brightness">Lysstyrkekontroll</string>
   <string name="status_bar_toggle_brightness_summary">Justere lysstyrken ved å skyve over på statuslinjen</string>
-  <string name="status_bar_notif_count_title">Vis antall varslinger</string>
+  <string name="status_bar_notif_count_title">Vis antall varsler</string>
   <string name="status_bar_notif_count_summary">Vise antall ventende notifikasjoner</string>
   <string name="status_bar_quick_qs_pulldown_title">Rask rullegardinmeny</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s kanten av statusbaren drar ned hurtiginnstillinger</string>
@@ -846,8 +846,8 @@
   <!-- Notification spamfilter -->
   <string name="spam_added_title">Lagt til %1$s</string>
   <string name="spam_last_blocked_title">Sist blokkert %1$s</string>
-  <string name="block_notifications_title">Filtrere varslinger</string>
-  <string name="block_notifications_summary">Administrere ignorerte varslinger og filtre</string>
+  <string name="block_notifications_title">Filtrere varsler</string>
+  <string name="block_notifications_summary">Administrer ignorerte varsler og filtre</string>
   <string name="no_filters_title">Ingen filtre valgt</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
@@ -897,7 +897,7 @@
                  <b>Total begår:</b><xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>Siste oppdatering:</b><xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Lyder</string>
-  <string name="notification_manager">Varslinger</string>
+  <string name="notification_manager">Varsler</string>
   <string name="lockscreen_settings">Låseskjerm</string>
   <string name="category_lights">Lys</string>
   <string name="category_volume">Volum</string>
@@ -1013,7 +1013,7 @@
   <string name="privacy_guard_internet_category">Internett</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vær</string>
-  <string name="weather_settings_no_services_prompt">Ingen værleverandør tjeneste installert</string>
+  <string name="weather_settings_no_services_prompt">Ingen vær leverandør tjeneste installert</string>
   <string name="weather_settings_button">Leverandørinnstillinger</string>
   <string name="weather_settings_activity_not_found">Kan ikke starte innstillingsmenyen for denne leverandøren</string>
   <string name="weather_settings_add_weather_provider">Legg til vær leverandør</string>
@@ -1046,7 +1046,7 @@
   <string name="lockscreen_weather_enabled_title">Vis været</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Vis på låseskjerm</string>
-  <string name="app_notification_show_on_keyguard_summary">Vis varslinger fra denne appen på låseskjermen</string>
+  <string name="app_notification_show_on_keyguard_summary">Vis varsler fra denne appen på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende varsler på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldri vedvarende meldinger fra denne appen på låseskjermen</string>
   <!-- CmRadioInfo -->
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 949e976..b4cd9fe 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -774,7 +774,7 @@
   <string name="battery_saver_summary_unavailable">Недоступно во время зарядки</string>
   <!-- Battery : Automatic performance profiles -->
   <string name="autoperf_title">Профили приложений</string>
-  <string name="autoperf_summary">Автоматически выбирать соответствующий режим батареи для приложений</string>
+  <string name="autoperf_summary">Автоматически выбирать подходящий профиль энергопотребления для приложений</string>
   <string name="perf_profile_title">Энергопотребление</string>
   <!-- Memory -->
   <string name="memory_startup_apps_title">Запущено при включении устройства</string>
@@ -919,7 +919,7 @@
   <string name="sim_enabler_need_disable_sim">SIM-карта будет отключена. Продолжить?</string>
   <string name="sim_enabler_will_disable_sim_title">Внимание</string>
   <string name="sim_enabler_need_switch_data_service">Текущая SIM-карта будет отключена, а для передачи данных будет использоваться SIM-карта <xliff:g id="slotid">%1$s </xliff:g>. Продолжить?</string>
-  <string name="sim_enabler_airplane_on">Выполнение операции невозможно при включённом режиме полета.</string>
+  <string name="sim_enabler_airplane_on">Выполнение операции невозможно при включённом режиме полёта.</string>
   <string name="sim_enabler_in_call">Выполнение операции невозможно во время вызова.</string>
   <string name="sim_enabler_both_inactive">Невозможно отключить все SIM-карты</string>
   <string name="sim_enabler_enabling">Включение\u2026</string>
@@ -1042,6 +1042,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Операторы сети</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Размытие фона</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Сведения о погоде</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1050,8 +1051,28 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Заблокировать постоянные на экране блокир.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не показывать постоянные уведомления из этого приложения на экране блокировки</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Расширенное управление радиоблоком</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Отключить автоматическую загрузку MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Включить автоматическую загрузку MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Отключить отладку VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Включить отладку VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Отключить отладку VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Включить отладку VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Отключить отладку WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Включить отладку WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Отключить журнал радио ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Включить журнал радио ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Отключить журнал диагностики</string>
+  <string name="cm_radio_info_diag_log_off_label">Включить журнал диагностики</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Обои</string>
+  <string name="not_available_with_app">Недоступно с %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Сканер отпечатков пальцев расположен на <xliff:g id="sensor_location">%1$s </xliff:g> вашего телефона.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">задней панели</string>
+  <string name="security_settings_fingerprint_sensor_location_front">передней панели</string>
+  <string name="security_settings_fingerprint_sensor_location_left">левой грани</string>
+  <string name="security_settings_fingerprint_sensor_location_right">правой грани</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index ae2e9b5..5d12fae 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1065,5 +1065,10 @@
   <string name="lockscreen_wallpaper_title">壁纸</string>
   <string name="not_available_with_app">同 %1$s 不可用</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">在您手机的 <xliff:g id="sensor_location">%1$s</xliff:g> 找到指纹传感器。</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">后置</string>
+  <string name="security_settings_fingerprint_sensor_location_front">前置</string>
+  <string name="security_settings_fingerprint_sensor_location_left">左侧</string>
+  <string name="security_settings_fingerprint_sensor_location_right">右侧</string>
 </resources>
-- 
cgit v1.1


From 5eb6beb98c2487dcbb9de59f6a1c0e8fb3dae8df Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Tue, 12 Jul 2016 09:45:45 -0700
Subject: Settings: Always set ramp-up time value during bindView

onProgressChange is not always called if we set the
ramp up time to 5 sec (0 in seekbar value, since it is
the default value, no change).
Causing the text showing the ramp up time text value not
updated and display as empty when user enable/disable
increasing ring volume with ramp up time set to 5 sec.

FEIJ-1572

Change-Id: Id32d6b51aab05e80be59bc1912c4ae7c5d114ac5
---
 .../android/settings/notification/IncreasingRingVolumePreference.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/com/android/settings/notification/IncreasingRingVolumePreference.java b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
index 6b78bbe..8a55eaa 100644
--- a/src/com/android/settings/notification/IncreasingRingVolumePreference.java
+++ b/src/com/android/settings/notification/IncreasingRingVolumePreference.java
@@ -143,6 +143,8 @@ public class IncreasingRingVolumePreference extends Preference implements
         mStartVolumeSeekBar.setOnSeekBarChangeListener(this);
         mRampUpTimeSeekBar.setOnSeekBarChangeListener(this);
         mRampUpTimeSeekBar.setProgress((rampUpTime / 5) - 1);
+        mRampUpTimeValue.setText(
+                Formatter.formatShortElapsedTime(getContext(), rampUpTime * 1000));
     }
 
     @Override
-- 
cgit v1.1


From 779b0aea4f0f5aa1f274490b5e7f1527502229fa Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Tue, 12 Jul 2016 13:17:06 -0700
Subject: Automatic translation import

Change-Id: I92388d5ef8ad6bbf8628374a986f72864f829796
Ticket: -
---
 res/values-eu-rES/cm_strings.xml | 2 ++
 res/values-pt-rBR/cm_strings.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 558e084..6fa0988 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Kolore erreprodukzio perfektua argazkietarako</string>
   <string name="live_display_color_profile_basic_title">Oinarrizkoa</string>
   <string name="live_display_color_profile_basic_summary">Erabili pantaila kalibratu gabe</string>
+  <string name="live_display_color_profile_adaptive_title">Moldakorra</string>
+  <string name="live_display_color_profile_adaptive_summary">Koloreak inguruko baldintzetara moldatzen dira</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Hautaketa ikonoa</string>
   <string name="ime_switcher_notify_summary">Bistaratu sarrera metodoa hautatzeko ikonoa</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 12b6d0d..fdd177e 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Reprodução de cor perfeita para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Use o visor não calibrado</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptável</string>
+  <string name="live_display_color_profile_adaptive_summary">As cores adaptam-se às condições do ambiente</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ícone de seleção</string>
   <string name="ime_switcher_notify_summary">Mostrar ícone de seleção de método de entrada</string>
-- 
cgit v1.1


From ecee3cf935578b34380fe6f32a5521e0c24df9d7 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Wed, 13 Jul 2016 10:01:36 -0700
Subject: Automatic translation import

Change-Id: Ib44237410311e2373b9ced02125aa2e4dbc9b1e5
Ticket: -
---
 res/values-cs/cm_strings.xml     | 10 ++++++++++
 res/values-fi/cm_strings.xml     |  2 ++
 res/values-it/cm_strings.xml     |  2 ++
 res/values-ru/cm_strings.xml     |  6 ++++--
 res/values-sl/cm_strings.xml     |  7 +++++++
 res/values-zh-rCN/cm_strings.xml |  2 ++
 6 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index d544dfc..a26c3db 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -619,6 +619,8 @@
   <string name="live_display_color_profile_photography_summary">Perfektní zobrazení barev pro fotografie</string>
   <string name="live_display_color_profile_basic_title">Základní</string>
   <string name="live_display_color_profile_basic_summary">Použít nezkalibrovaný displej</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptivní</string>
+  <string name="live_display_color_profile_adaptive_summary">Přizpůsobit barvy okolním podmínkám</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona pro volbu</string>
   <string name="ime_switcher_notify_summary">Zobrazit ikonu volby vstupní metody</string>
@@ -1043,6 +1045,7 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Rozostření pozadí</string>
   <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Zobrazit počasí</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Zobrazit na zamykací obrazovce</string>
   <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
@@ -1064,6 +1067,13 @@
   <string name="cm_radio_info_diag_log_on_label">Vypnout protokol Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Zapnout protokol Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Tapeta</string>
+  <string name="not_available_with_app">Není k dispozici s %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vyhledejte snímač otisku prstů <xliff:g id="sensor_location">%1$s</xliff:g> na telefonu.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">zpět</string>
+  <string name="security_settings_fingerprint_sensor_location_front">přední</string>
+  <string name="security_settings_fingerprint_sensor_location_left">levá strana</string>
+  <string name="security_settings_fingerprint_sensor_location_right">pravá strana</string>
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index d6eed90..97afeeb 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Täydellinen värintoisto kuviin</string>
   <string name="live_display_color_profile_basic_title">Perus</string>
   <string name="live_display_color_profile_basic_summary">Käytä näyttöä kalibroimatta</string>
+  <string name="live_display_color_profile_adaptive_title">Mukautuva</string>
+  <string name="live_display_color_profile_adaptive_summary">Värit sopeutuu ympäristön mukaan</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Syöttötavan valinnan kuvake</string>
   <string name="ime_switcher_notify_summary">Näytä syöttötavan valinnan kuvake</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index b34bb21..727322b 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Colori perfetti per riproduzione foto</string>
   <string name="live_display_color_profile_basic_title">Base</string>
   <string name="live_display_color_profile_basic_summary">Usa il display non calibrato</string>
+  <string name="live_display_color_profile_adaptive_title">Adattivo</string>
+  <string name="live_display_color_profile_adaptive_summary">I colori si adattano alle condizioni ambientali</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icona selettore</string>
   <string name="ime_switcher_notify_summary">Mostra l\'icona del selettore metodo di immissione</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index b4cd9fe..90d8759 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -619,6 +619,8 @@
   <string name="live_display_color_profile_photography_summary">Идеальная цветопередача для фото</string>
   <string name="live_display_color_profile_basic_title">Базовый</string>
   <string name="live_display_color_profile_basic_summary">Использовать неоткалиброванный дисплей</string>
+  <string name="live_display_color_profile_adaptive_title">Адаптивный</string>
+  <string name="live_display_color_profile_adaptive_summary">Цвета адаптируются к условиям окружающей среды</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Значок выбора метода ввода</string>
   <string name="ime_switcher_notify_summary">Отображать переключатель метода ввода при открытии текстовых полей</string>
@@ -698,8 +700,8 @@
   <string name="status_bar_notif_count_summary">Показывать количество новых уведомлений в строке состояния</string>
   <string name="status_bar_quick_qs_pulldown_title">Быстрый доступ</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s край строки состояния вытягивает быстрые настройки</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Слева</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Справа</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Левый</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Правый</string>
   <string name="status_bar_quick_qs_pulldown_off">Выкл.</string>
   <string name="status_bar_quick_qs_pulldown_left">Слева</string>
   <string name="status_bar_quick_qs_pulldown_right">Справа</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index ee0ec0a..9fdf7db 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -620,6 +620,8 @@
   <string name="live_display_color_profile_photography_summary">Popolna izvedba barv za fotografije</string>
   <string name="live_display_color_profile_basic_title">Osnoven</string>
   <string name="live_display_color_profile_basic_summary">Uporabi neumerjen zaslon</string>
+  <string name="live_display_color_profile_adaptive_title">Prilagodljiv</string>
+  <string name="live_display_color_profile_adaptive_summary">Barve se prilagajajo pogojem okolice</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona izbirnika</string>
   <string name="ime_switcher_notify_summary">Prikaži ikono izbirnika metode za vnos</string>
@@ -1072,5 +1074,10 @@
   <string name="lockscreen_wallpaper_title">Slika ozadja</string>
   <string name="not_available_with_app">Ni na voljo s/z %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Poiščite tipalo za prstne odtise na <xliff:g id="sensor_location">%1$s</xliff:g> vašega telefona.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">zadnji strani</string>
+  <string name="security_settings_fingerprint_sensor_location_front">sprednji strani</string>
+  <string name="security_settings_fingerprint_sensor_location_left">levi strani</string>
+  <string name="security_settings_fingerprint_sensor_location_right">desni strani</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 5d12fae..b8dbc10 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -614,6 +614,8 @@
   <string name="live_display_color_profile_photography_summary">针对照片的完美色彩重现</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">使用未校准的屏幕</string>
+  <string name="live_display_color_profile_adaptive_title">自适应</string>
+  <string name="live_display_color_profile_adaptive_summary">环境条件颜色自适应</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">选择器图标</string>
   <string name="ime_switcher_notify_summary">显示输入法选择器图标</string>
-- 
cgit v1.1

-- 
cgit v1.1


From bd61d64c408d524e63a6f146a63c7f0948fd41bf Mon Sep 17 00:00:00 2001
From: Gabriele M <moto.falcon.git@gmail.com>
Date: Thu, 5 May 2016 22:54:40 +0200
Subject: Settings: Don't enable proximity on wake by default

This is set depending on config_proximityCheckOnWakeEnabledByDefault

Change-Id: I3b93f4173c725c7603152be9f8b1a4f1425f617a
---
 res/xml/display.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/res/xml/display.xml b/res/xml/display.xml
index 366263e..0d1f965 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -89,8 +89,7 @@
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="proximity_on_wake"
                 android:title="@string/proximity_wake_title"
-                android:summary="@string/proximity_wake_summary"
-                android:defaultValue="true" />
+                android:summary="@string/proximity_wake_summary" />
 
         <!-- Seconds before sleep -->
         <ListPreference
-- 
cgit v1.1


From c867a7e911c1b5d25da339f30fbef0a056348a85 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Fri, 15 Jul 2016 10:00:55 -0700
Subject: Automatic translation import

Change-Id: I16a91343278b13d1dea55f9133bcf5f5d3112d64
Ticket: -
---
 res/values-de/cm_strings.xml     |  2 ++
 res/values-lb/cm_strings.xml     | 48 ++++++++++++++++++++++++++++++++++++++++
 res/values-sl/cm_strings.xml     |  4 ++--
 res/values-zh-rCN/cm_strings.xml |  3 +--
 4 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 12bd0b4..be01083 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Perfekte Farbwiedergabe für Fotos</string>
   <string name="live_display_color_profile_basic_title">Einfach</string>
   <string name="live_display_color_profile_basic_summary">Display unkalibriert verwenden</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptiv</string>
+  <string name="live_display_color_profile_adaptive_summary">Farben an Umgebungsbedingungen anpassen</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Auswahlsymbol</string>
   <string name="ime_switcher_notify_summary">Symbol für Eingabemethodenauswahl anzeigen</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 78faf4a..a700588 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -263,6 +263,7 @@
   <string name="notification_light_missed_call_title">Verpassten Uruff</string>
   <string name="notification_light_voicemail_title">Mailboxopnam</string>
   <string name="notification_light_screen_on">Liicht wann de Schierm un ass</string>
+  <string name="notification_light_use_multiple_leds">Méi LEDen</string>
   <string name="keywords_lights_brightness_level">LED-Hellegkeet reduzéieren</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Hellegkeetsastellungen</string>
@@ -298,6 +299,7 @@
   <string name="app_ops_summaries_modify_call_log">Urufflëscht änneren</string>
   <string name="app_ops_summaries_read_calendar">Kalenner liesen</string>
   <string name="app_ops_summaries_modify_calendar">Kalenner änneren</string>
+  <string name="app_ops_summaries_wifi_scan">WLAN-Scan</string>
   <string name="app_ops_summaries_cell_scan">Handysnetzwierk-Scan</string>
   <string name="app_ops_summaries_call_phone">Telefonéieren</string>
   <string name="app_ops_summaries_read_sms">SMS liesen</string>
@@ -325,13 +327,28 @@
   <string name="app_ops_summaries_media_volume">Medielautstäerkt</string>
   <string name="app_ops_summaries_alarm_volume">Weckerlautstäerkt</string>
   <string name="app_ops_summaries_notification_volume">Notifikatiounslautstäerkt</string>
+  <string name="app_ops_summaries_bluetooth_volume">Bluetooth-Lautstäerkt</string>
   <string name="app_ops_summaries_keep_awake">Aktiv loossen</string>
   <string name="app_ops_summaries_monitor_location">Standuert iwwerwaachen</string>
   <string name="app_ops_summaries_monitor_high_power_location">Standuerter mat héijem Stroumverbrauch iwwerwaachen</string>
+  <string name="app_ops_summaries_get_usage_stats">Benotzungsstatistiken ausliesen</string>
   <string name="app_ops_summaries_mute_unmute_microphone">Mikro un-/ausschalten</string>
   <string name="app_ops_summaries_toast_window">Kuerzzäit-Notifikatiounen uweisen</string>
   <string name="app_ops_summaries_project_media">Projektioun vu Medieninhalter</string>
   <string name="app_ops_summaries_activate_vpn">VPN aktivéieren</string>
+  <string name="app_ops_summaries_write_wallpaper">Hannergrond schreiwen</string>
+  <string name="app_ops_summaries_assist_structure">Strukturassistent</string>
+  <string name="app_ops_summaries_assist_screenshot">Screenshotassistent</string>
+  <string name="app_ops_summaries_read_phone_state">Telefonstatus liesen</string>
+  <string name="app_ops_summaries_use_sip">SIP benotzen</string>
+  <string name="app_ops_summaries_use_fingerprint">Fangerofdrock benotzen</string>
+  <string name="app_ops_summaries_use_body_sensors">Kierpersensoren benotzen</string>
+  <string name="app_ops_summaries_read_cell_broadcasts">Zelliwwerdrounge liesen</string>
+  <string name="app_ops_summaries_mock_location">Standuert simuléieren</string>
+  <string name="app_ops_summaries_read_external_storage">externe Späicher ausliesen</string>
+  <string name="app_ops_summaries_toggle_wifi">WLAN un-/ausschalten</string>
+  <string name="app_ops_summaries_toggle_bluetooth">Bluetooth un-/ausschalten</string>
+  <string name="app_ops_summaries_toggle_nfc">NFC un-/ausschalten</string>
   <string name="app_ops_summaries_superuser">Root-Zougrëff</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_gps">GPS</string>
@@ -342,11 +359,19 @@
   <string name="app_ops_labels_modify_call_log">Urufflëscht änneren</string>
   <string name="app_ops_labels_read_calendar">Kalenner liesen</string>
   <string name="app_ops_labels_modify_calendar">Kalenner änneren</string>
+  <string name="app_ops_labels_wifi_scan">WLAN-Scan</string>
   <string name="app_ops_labels_notification">Notifikatioun uweisen</string>
+  <string name="app_ops_labels_cell_scan">Mobilfunknetz-Scan</string>
   <string name="app_ops_labels_call_phone">Telefonéieren</string>
+  <string name="app_ops_labels_read_sms">SMS liesen</string>
+  <string name="app_ops_labels_write_sms">SMS schreiwen</string>
   <string name="app_ops_labels_receive_sms">SMS empfänken</string>
+  <string name="app_ops_labels_receive_emergency_sms">Noutfall-SMS empfänken</string>
   <string name="app_ops_labels_receive_mms">MMS empfänken</string>
+  <string name="app_ops_labels_receive_wap_push">WAP-Push empfänken</string>
   <string name="app_ops_labels_send_sms">SMS schécken</string>
+  <string name="app_ops_labels_read_icc_sms">ICC-SMS liesen</string>
+  <string name="app_ops_labels_write_icc_sms">ICC-SMS schreiwen</string>
   <string name="app_ops_labels_modify_settings">Astellungen änneren</string>
   <string name="app_ops_labels_draw_on_top">Virun aneren Appen ablenden</string>
   <string name="app_ops_labels_access_notifications">Op Notifikatiounen zougräifen</string>
@@ -365,10 +390,27 @@
   <string name="app_ops_labels_notification_volume">Notifikatiounslautstäerkt</string>
   <string name="app_ops_labels_bluetooth_volume">Bluetooth-Lautstäerkt</string>
   <string name="app_ops_labels_keep_awake">Aktiv loossen</string>
+  <string name="app_ops_labels_monitor_location">Standuert iwwerwaachen</string>
+  <string name="app_ops_labels_monitor_high_power_location">Standuerter mat héijem Stroumverbrauch iwwerwaachen</string>
+  <string name="app_ops_labels_get_usage_stats">Benotzungsstatistiken ausliesen</string>
   <string name="app_ops_labels_mute_unmute_microphone">Mikro un-/ausschalten</string>
   <string name="app_ops_labels_toast_window">Kuerzzäit-Notifikatiounen uweisen</string>
   <string name="app_ops_labels_project_media">Projektioun vu Medieninhalter</string>
   <string name="app_ops_labels_activate_vpn">VPN aktivéieren</string>
+  <string name="app_ops_labels_write_wallpaper">Hannergrond schreiwen</string>
+  <string name="app_ops_labels_assist_structure">Strukturassistent</string>
+  <string name="app_ops_labels_assist_screenshot">Screenshotassistent</string>
+  <string name="app_ops_labels_read_phone_state">Telefonstatus liesen</string>
+  <string name="app_ops_labels_add_voicemail">Mailboxopnamen dobäisetzen</string>
+  <string name="app_ops_labels_use_sip">SIP benotzen</string>
+  <string name="app_ops_labels_use_fingerprint">Fangerofdrock benotzen</string>
+  <string name="app_ops_labels_use_body_sensors">Kierpersensoren benotzen</string>
+  <string name="app_ops_labels_read_cell_broadcasts">Zelliwwerdrounge liesen</string>
+  <string name="app_ops_labels_mock_location">Standuert simuléieren</string>
+  <string name="app_ops_labels_read_external_storage">Externe Späicher liesen</string>
+  <string name="app_ops_labels_toggle_wifi">WLAN un-/ausschalten</string>
+  <string name="app_ops_labels_toggle_bluetooth">Bluetooth un-/ausschalten</string>
+  <string name="app_ops_labels_toggle_nfc">NFC un-/ausschalten</string>
   <string name="app_ops_labels_superuser">Root-Zougrëff</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Erlaabt</string>
@@ -603,6 +645,9 @@
   <string name="lto_download_data_wifi_only">Download vu GPS assistéiert Daten</string>
   <string name="lto_download_data_wifi_only_on">Iwwer all Netzwierker</string>
   <string name="lto_download_data_wifi_only_off">Nëmmen iwwer WLAN-Netzwierker</string>
+  <string name="volume_keys_control_ring_stream_title">d\'Schelllautstäerkt änneren</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Lautstäerkttaste steieren d\'Schelltounlautstäerkt</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Lautstäerkttaste steieren d\'Medielautstäerkt</string>
   <string name="category_calibration">Kalibréierung</string>
   <string name="display_and_lights">Schierm a Beliichtung</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -682,8 +727,11 @@
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">Musterpunkten uweisen</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Passwuert-Agab direkt uweisen</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Muster-Agab direkt uweisen</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">PIN-Agab direkt uweisen</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Musek-Visualiséierung uweisen</string>
   <!-- lock screen disabled by QS tile warning -->
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 9fdf7db..da43d1d 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -462,7 +462,7 @@
   <string name="hardware_keys_home_key_title">Gumb Domov</string>
   <string name="hardware_keys_back_key_title">Gumb Nazaj</string>
   <string name="hardware_keys_menu_key_title">Gumb Meni</string>
-  <string name="hardware_keys_assist_key_title">Gumb Iskanje</string>
+  <string name="hardware_keys_assist_key_title">Gumb Išči</string>
   <string name="hardware_keys_appswitch_key_title">Gumb Nedavno</string>
   <string name="hardware_keys_camera_key_title">Gumb fotoaparata</string>
   <string name="hardware_keys_volume_keys_title">Gumba za glasnost</string>
@@ -661,7 +661,7 @@
   <string name="gestures_action_home">Domov</string>
   <string name="gestures_action_back">Nazaj</string>
   <string name="gestures_action_menu">Meni</string>
-  <string name="gestures_action_search">Začni z iskanjem</string>
+  <string name="gestures_action_search">Začni iskati</string>
   <string name="gestures_action_recent">Nedavne aplikacije</string>
   <!-- Stylus gestures -->
   <string name="stylus_app_not_installed">%s ni nameščen</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index b8dbc10..8d1cc8a 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -218,7 +218,7 @@
   <string name="navigation_bar_left_title">左利手模式</string>
   <string name="navigation_bar_left_summary">横屏时在屏幕左侧显示虚拟键</string>
   <string name="navigation_bar_title">按键与布局</string>
-  <string name="navigation_bar_help_text">如需修改，轻触修改图标来解锁导航栏。\n\n您可以轻触一个图标来修改快捷方式，或者长按图标来改变布局。\n\n轻触“保存”确认修改，“还原默认值”重置到默认布局。</string>
+  <string name="navigation_bar_help_text">如需修改，轻触编辑图标来解锁导航栏。\n\n您可以轻触一个图标来修改快捷方式，或者长按图标来改变布局。\n\n轻触“保存”确认修改，“还原默认值”重置到默认布局。</string>
   <string name="navigation_restore_button_text">还原\n默认值</string>
   <string name="navigation_edit_button_text">编辑</string>
   <string name="navigation_save_button_text">保存</string>
@@ -1042,7 +1042,6 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">模糊背景</string>
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">显示天气</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在锁屏上显示</string>
   <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
-- 
cgit v1.1


From 3f8fc2751fdcd29c673545a91e352071157dca24 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 16 Jul 2016 09:42:57 -0700
Subject: Automatic translation import

Change-Id: I9c038a2823e8c6360864dc6c8bbd94b4fb54650b
Ticket: -
---
 res/values-nb/cm_strings.xml     | 2 ++
 res/values-pt-rPT/cm_strings.xml | 2 ++
 res/values-zh-rCN/cm_strings.xml | 1 +
 3 files changed, 5 insertions(+)

diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 8f17cfd..2ad4e12 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Perfekt fargegjengivelse for bilder</string>
   <string name="live_display_color_profile_basic_title">Grunnleggende</string>
   <string name="live_display_color_profile_basic_summary">Bruk skjermen ukalibrert</string>
+  <string name="live_display_color_profile_adaptive_title">Tilpassende</string>
+  <string name="live_display_color_profile_adaptive_summary">Farger tilpasser seg til omgivelsene</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Valgikon</string>
   <string name="ime_switcher_notify_summary">Viser inndatametode snarvei</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index f892c85..1297d32 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Melhor reprodução de cor para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Utilizar o ecrã não calibrado</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptável</string>
+  <string name="live_display_color_profile_adaptive_summary">As cores adaptam-se às condições ambientais</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ícone de seleção</string>
   <string name="ime_switcher_notify_summary">Mostrar ícone de seleção de método de entrada</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 8d1cc8a..7cceac7 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1042,6 +1042,7 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">模糊背景</string>
   <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">显示天气</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">在锁屏上显示</string>
   <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
-- 
cgit v1.1


From 99948dfb5f569e758805843b8c50a48804550e1b Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 17 Jul 2016 11:16:40 -0700
Subject: Automatic translation import

Change-Id: I8c6d8383eae17654df86d618b6dc63d32c340741
Ticket: -
---
 res/values-bg/cm_strings.xml | 2 ++
 res/values-ca/cm_strings.xml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index a660697..546d01e 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Перфектния цвят за възпроизвеждане на снимки</string>
   <string name="live_display_color_profile_basic_title">Основни</string>
   <string name="live_display_color_profile_basic_summary">Използвате дисплея не калибриран</string>
+  <string name="live_display_color_profile_adaptive_title">Адаптивно</string>
+  <string name="live_display_color_profile_adaptive_summary">Цветовете се адаптират към условията на околната среда</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Селектор на икона</string>
   <string name="ime_switcher_notify_summary">Покажи метода на въвеждане на селектирана икона</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index a049bae..8e90658 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Reproducció del color perfecte per a fotos</string>
   <string name="live_display_color_profile_basic_title">Bàsic</string>
   <string name="live_display_color_profile_basic_summary">Utilitza la pantalla sense calibrar</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptativa</string>
+  <string name="live_display_color_profile_adaptive_summary">Els colors s\'adapten a les condicions ambientals</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selector d\'icona</string>
   <string name="ime_switcher_notify_summary">Mostra la icona del selector de mètode d\'entrada</string>
-- 
cgit v1.1


From a186b70f592628b0bc35c2a1ada23346f11c9083 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Mon, 18 Jul 2016 02:41:19 -0700
Subject: settings: Add support for color balance in LiveDisplay

 * Use the newly exposed APIs to map color temperatures to
   the linear color balance range using a power curve
   calculation.

Change-Id: Ia1b7f26b5e4fff6d0f0e78d6cb62a7a9a2aec30e
---
 .../settings/livedisplay/DisplayTemperature.java   | 88 +++++++++++++++++-----
 .../android/settings/livedisplay/LiveDisplay.java  |  4 +-
 2 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java
index f63204b..920d197 100644
--- a/src/com/android/settings/livedisplay/DisplayTemperature.java
+++ b/src/com/android/settings/livedisplay/DisplayTemperature.java
@@ -24,6 +24,7 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.SeekBar;
@@ -31,6 +32,8 @@ import android.widget.TextView;
 
 import com.android.settings.R;
 
+import org.cyanogenmod.internal.util.MathUtils;
+
 import cyanogenmod.hardware.LiveDisplayConfig;
 import cyanogenmod.hardware.LiveDisplayManager;
 
@@ -51,6 +54,8 @@ public class DisplayTemperature extends DialogPreference {
     private final LiveDisplayManager mLiveDisplay;
     private final LiveDisplayConfig mConfig;
 
+    private static final int STEP = 100;
+
     public DisplayTemperature(Context context, AttributeSet attrs) {
         super(context, attrs);
         mContext = context;
@@ -85,8 +90,8 @@ public class DisplayTemperature extends DialogPreference {
         TextView nightText = (TextView) view.findViewById(R.id.night_temperature_value);
         mNightTemperature = new ColorTemperatureSeekBar(night, nightText);
 
-        mDayTemperature.setProgress(mOriginalDayTemperature);
-        mNightTemperature.setProgress(mOriginalNightTemperature);
+        mDayTemperature.setTemperature(mOriginalDayTemperature);
+        mNightTemperature.setTemperature(mOriginalNightTemperature);
     }
 
     @Override
@@ -100,8 +105,8 @@ public class DisplayTemperature extends DialogPreference {
         defaultsButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                mDayTemperature.setProgress(mConfig.getDefaultDayTemperature());
-                mNightTemperature.setProgress(mConfig.getDefaultNightTemperature());
+                mDayTemperature.setTemperature(mConfig.getDefaultDayTemperature());
+                mNightTemperature.setTemperature(mConfig.getDefaultNightTemperature());
                 updateTemperature(true);
             }
         });
@@ -124,8 +129,8 @@ public class DisplayTemperature extends DialogPreference {
         final SavedState myState = new SavedState(superState);
         myState.originalDayTemperature = mOriginalDayTemperature;
         myState.originalNightTemperature = mOriginalNightTemperature;
-        myState.currentDayTemperature = mDayTemperature.getProgress();
-        myState.currentNightTemperature = mNightTemperature.getProgress();
+        myState.currentDayTemperature = mDayTemperature.getTemperature();
+        myState.currentNightTemperature = mNightTemperature.getTemperature();
 
         // Restore the old state when the activity or dialog is being paused
         updateTemperature(false);
@@ -146,8 +151,8 @@ public class DisplayTemperature extends DialogPreference {
 
         mOriginalDayTemperature = myState.originalDayTemperature;
         mOriginalNightTemperature = myState.originalNightTemperature;
-        mDayTemperature.setProgress(myState.currentDayTemperature);
-        mNightTemperature.setProgress(myState.currentNightTemperature);;
+        mDayTemperature.setTemperature(myState.currentDayTemperature);
+        mNightTemperature.setTemperature(myState.currentNightTemperature);;
 
         updateTemperature(true);
     }
@@ -193,27 +198,51 @@ public class DisplayTemperature extends DialogPreference {
     }
 
     private void updateTemperature(boolean accept) {
-        int day = accept ? mDayTemperature.getProgress() : mOriginalDayTemperature;
-        int night = accept ? mNightTemperature.getProgress() : mOriginalNightTemperature;
+        int day = accept ? mDayTemperature.getTemperature() : mOriginalDayTemperature;
+        int night = accept ? mNightTemperature.getTemperature() : mOriginalNightTemperature;
         callChangeListener(new Integer[] { day, night });
 
         mLiveDisplay.setDayColorTemperature(day);
         mLiveDisplay.setNightColorTemperature(night);
     }
 
+    int roundUp(int value) {
+        return ((value + STEP / 2) / STEP) * STEP;
+    }
+
     private class ColorTemperatureSeekBar implements SeekBar.OnSeekBarChangeListener {
         private final SeekBar mSeekBar;
         private final TextView mValue;
 
-        private static final int MIN = 1000;
-        private static final int MAX = 10000;
-        private static final int STEP = 100;
+        private final int mMin;
+        private final int mMax;
+
+        private final int mBalanceMin;
+        private final int mBalanceMax;
+
+        private final int mBarMax;
+
+        private final boolean mUseBalance;
+        private final double[] mBalanceCurve;
 
         public ColorTemperatureSeekBar(SeekBar seekBar, TextView value) {
             mSeekBar = seekBar;
             mValue = value;
-
-            mSeekBar.setMax((MAX - MIN) / STEP);
+            mMin = mConfig.getColorTemperatureRange().getLower();
+            mMax = mConfig.getColorTemperatureRange().getUpper();
+            mBalanceMin = mConfig.getColorBalanceRange().getLower();
+            mBalanceMax = mConfig.getColorBalanceRange().getUpper();
+            mUseBalance = mConfig.hasFeature(LiveDisplayManager.FEATURE_COLOR_BALANCE) &&
+                    ((mBalanceMin != 0) || (mBalanceMax != 0));
+
+            if (mUseBalance) {
+                mBalanceCurve = MathUtils.powerCurve(mMin, mConfig.getDefaultDayTemperature(), mMax);
+                mBarMax = mBalanceMax - mBalanceMin;
+            } else {
+                mBalanceCurve = null;
+                mBarMax = (mMax - mMin) / STEP;
+            }
+            mSeekBar.setMax(mBarMax);
             mSeekBar.setOnSeekBarChangeListener(this);
         }
 
@@ -222,17 +251,36 @@ public class DisplayTemperature extends DialogPreference {
             if (fromUser) {
                 updateTemperature(true);
             }
+
+            int displayValue;
+            if (mUseBalance) {
+                displayValue = roundUp(Math.round((float)MathUtils.linearToPowerCurve(
+                        mBalanceCurve, (double)progress / (double)mBarMax)));
+            } else {
+                displayValue = progress * STEP + mMin;
+            }
+            Log.d(TAG, "onProgressChanged: progress=" + progress + " displayValue=" + displayValue);
+
             mValue.setText(mContext.getResources().getString(
-                    R.string.live_display_color_temperature_label, progress * STEP + MIN));
+                    R.string.live_display_color_temperature_label, displayValue));
         }
 
-        public void setProgress(int progress) {
-            int p = Math.max(progress, MIN) - MIN;
+        public void setTemperature(int temperature) {
+            if (mUseBalance) {
+                double z = MathUtils.powerCurveToLinear(mBalanceCurve, (double)temperature);
+                mSeekBar.setProgress(Math.round((float)(z * (double)mBarMax)));
+                return;
+            }
+            int p = Math.max(temperature, mMin) - mMin;
             mSeekBar.setProgress(Math.round((float) p / STEP));
         }
 
-        public int getProgress() {
-            return mSeekBar.getProgress() * STEP + MIN;
+        public int getTemperature() {
+            if (mUseBalance) {
+                return Math.round((float)MathUtils.linearToPowerCurve(
+                        mBalanceCurve, (double)mSeekBar.getProgress() / (double)mBarMax));
+            }
+            return mSeekBar.getProgress() * STEP + mMin;
         }
 
         @Override
diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index f4214b9..51a295d 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -313,7 +313,9 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
         int night = mLiveDisplayManager.getNightColorTemperature();
 
         mDisplayTemperature.setSummary(getResources().getString(
-                R.string.live_display_color_temperature_summary, day, night));
+                R.string.live_display_color_temperature_summary,
+                mDisplayTemperature.roundUp(day),
+                mDisplayTemperature.roundUp(night)));
     }
 
     @Override
-- 
cgit v1.1


From 09cb31881c38f0ca38c9d94805c722ecf1920c61 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Thu, 21 Jul 2016 11:19:21 -0700
Subject: Automatic translation import

Change-Id: I7b8461ce071d185f5219347678bd030c9d1c51c1
Ticket: -
---
 res/values-bg/cm_strings.xml |  2 +-
 res/values-el/cm_strings.xml |  2 ++
 res/values-hr/cm_strings.xml | 36 ++++++++++++++++++------------------
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 546d01e..5e75104 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -548,7 +548,7 @@
   <!-- Volume settings - Volume adjustment sound -->
   <string name="volume_adjust_sounds_title">Звук при регулиране на силата на звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
-  <string name="vibrator_intensity_title">Честота на вибрацията</string>
+  <string name="vibrator_intensity_title">Мощност на вибрация</string>
   <string name="vibrator_warning">Стойности по-високи от %1$d не се препоръчват</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калибриране на цвета</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index eaf89b3..f63a1d5 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Τέλεια αναπαραγωγή χρώματος για φωτογραφίες</string>
   <string name="live_display_color_profile_basic_title">Βασικό</string>
   <string name="live_display_color_profile_basic_summary">Χρήση της οθόνης χωρίς ρύθμιση</string>
+  <string name="live_display_color_profile_adaptive_title">Προσαρμοστική</string>
+  <string name="live_display_color_profile_adaptive_summary">Τα χρώματα προσαρμόζονται στις συνθήκες περιβάλλοντος</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Εικονίδιο επιλογέα</string>
   <string name="ime_switcher_notify_summary">Εμφάνιση εικονιδίου για τον επιλογέα μεθόδου εισαγωγής</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index e7b2ab4..31ae28a 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -68,7 +68,7 @@
   <string name="ring_mode_normal">Normalno</string>
   <string name="ring_mode_vibrate">Vibriraj</string>
   <string name="ring_mode_mute">Isključi zvuk</string>
-  <string name="settings_reset_button">Resetiraj</string>
+  <string name="settings_reset_button">Ponovno postavi</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Profili sustava</string>
   <string name="profiles_add">Dodaj</string>
@@ -105,7 +105,7 @@
   <string name="duplicate_appgroup_name">Dvostruki naziv grupe aplikacija!</string>
   <string name="rename_dialog_hint">Unesite naziv profila</string>
   <!-- Reset Profiles -->
-  <string name="profile_reset_title">Resetiraj</string>
+  <string name="profile_reset_title">Ponovno postavi</string>
   <string name="profile_reset_message">Izbrisati sve korisničke profile i vratiti na zadano?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Ukloniti ovu aplikaciju?</string>
@@ -123,7 +123,7 @@
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">Profili</string>
   <string name="profile_profile_manage">Upravljanje profilima</string>
-  <string name="profile_appgroups_manage">Aplikacijske grupe</string>
+  <string name="profile_appgroups_manage">Grupe aplikacija</string>
   <string name="profile_appgroup_manage">Upravljaj grupom aplikacija</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
   <string name="profile_settings">Postavke profila</string>
@@ -140,7 +140,7 @@
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
   <string name="soundtone_title">Ton obavijesti</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Aplikacijske grupe</string>
+  <string name="profile_appgroups_title">Grupe aplikacija</string>
   <string name="profile_applist_title">Aplikacije</string>
   <string name="profile_new_appgroup">Nova grupa aplikacija</string>
   <string name="profile_delete_appgroup">Obrisati ovu grupu aplikacija?</string>
@@ -202,10 +202,10 @@
   <string name="profile_setup_setup_triggers_title_config">Izmijeni okidače: <xliff:g id="profile_name">%1$s</xliff:g></string>
   <string name="profile_setup_actions_title">Korak 2: Postavi akcije</string>
   <string name="profile_setup_actions_title_config">Konfiguriraj akcije</string>
-  <string name="profile_appgroups_manage">Aplikacijske grupe</string>
+  <string name="profile_appgroups_manage">Grupe aplikacija</string>
   <string name="profile_appgroup_manage">Upravljaj grupom aplikacija</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Aplikacijske grupe</string>
+  <string name="profile_appgroups_title">Grupe aplikacija</string>
   <string name="profile_new_appgroup">Nova grupa aplikacija</string>
   <string name="profile_delete_appgroup">Obrisati ovu grupu aplikacija?</string>
   <string name="profile_appgroup_name_prompt">Upišite ime nove grupe aplikacija</string>
@@ -562,7 +562,7 @@
   <string name="headset_connect_player_summary">Pokreni zadanu aplikaciju za glazbu kada su priključene slušalice</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Automatski prioritet</string>
-  <string name="auto_brightness_reset_button">Resetiraj</string>
+  <string name="auto_brightness_reset_button">Ponovno postavi</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">Rotacija</string>
   <string name="display_rotation_disabled">Onemogućeno</string>
@@ -582,7 +582,7 @@
   <string name="restore_preview">Vidi zadanu sliku</string>
   <string name="selectnewfile_menu">Pogledaj novu sliku iz galerije</string>
   <string name="selectfile_menu">Prikaz slike iz galerije</string>
-  <string name="restore_default_str">Resetiraj</string>
+  <string name="restore_default_str">Ponovno postavi</string>
   <string name="hue_str">Nijansa: <xliff:g id="hue_value">%1$s</xliff:g></string>
   <string name="saturation_str">Zasićenost: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s </xliff:g></string>
@@ -745,8 +745,8 @@
   <string name="privacy_guard_manager_summary">Upravljanje koje aplikacije imaju pristup vašim osobnim podacima</string>
   <string name="privacy_guard_no_user_apps">Nema instaliranih aplikacija</string>
   <string name="privacy_guard_help_title">Pomoć</string>
-  <string name="privacy_guard_reset_title">Resetiraj</string>
-  <string name="privacy_guard_reset_text">Resetiraj dozvole?</string>
+  <string name="privacy_guard_reset_title">Ponovno postavi</string>
+  <string name="privacy_guard_reset_text">Poništiti dopuštenja?</string>
   <string name="privacy_guard_help_text">U ovom zaslonu možete odabrati koja aplikacija zaštite privatnosti treba biti aktivna s jednostavnim dodirom. Izabrane aplikacije neće moći pristupiti tvojim osobnim podacima, kao što su kontakti, poruke ili zapis poziva. Dugim pritiskom pri ulasku otvaraju se detalji za tu aplikaciju.\n\nUgrađene aplikacije nisu prikazane po zadanom, ali može biti podešeno izborom odgovarajućih opcija u izborniku.</string>
   <string name="privacy_guard_manager_show_system_apps">Prikaži ugrađene aplikacije</string>
   <string name="privacy_guard_advanced_settings_title">Napredno</string>
@@ -773,11 +773,11 @@
   <string name="battery_saver_summary">Smanji performanse i ograniči pozadinske podatke</string>
   <string name="battery_saver_summary_unavailable">Nije dostupno tijekom punjenja</string>
   <!-- Battery : Automatic performance profiles -->
-  <string name="autoperf_title">Omogući profile za pos. apl.</string>
-  <string name="autoperf_summary">Automatski odaberi način rada baterije za razne aplikacije</string>
+  <string name="autoperf_title">Omogući profile za posebne apl.</string>
+  <string name="autoperf_summary">Automatsko biranje prigodnog načina rada baterije za razne aplikacije.</string>
   <string name="perf_profile_title">Način rada baterije</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">Aplikacije pokrenute pri startu</string>
+  <string name="memory_startup_apps_title">Aplikacije pokrenute pri uključivanju</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Ton obavijesti</string>
   <!-- Advanced reboot options -->
@@ -840,15 +840,15 @@
   <string name="select_contact">Odaberite kontakt</string>
   <!-- Sms security limit -->
   <string name="app_security_title">Sigurnost aplikacija</string>
-  <string name="sms_security_check_limit_title">Ograničenje SMS poruke</string>
-  <string name="sms_security_check_limit_summary">Aplikacije mogu poslati %d poruke u 1 minuti prije zahtijevanja potvrde</string>
+  <string name="sms_security_check_limit_title">Ograničenje SMS poruka</string>
+  <string name="sms_security_check_limit_summary">Aplikacije mogu poslati sljedeći broj poruka u jednoj minuti prije zahtijevanja potvrde: %d</string>
   <string name="sms_security_check_limit_summary_none">Aplikacije ne smiju slati poruke bez potvrde</string>
   <string name="sms_security_check_limit_none">Nijedan</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">Dodano %1$s</string>
   <string name="spam_last_blocked_title">Posljednji blokirani %1$s</string>
-  <string name="block_notifications_title">Filtriraj obavijesti</string>
-  <string name="block_notifications_summary">Upravljaj zanemarenim obavijestima i filterima</string>
+  <string name="block_notifications_title">Filtriranje obavijesti</string>
+  <string name="block_notifications_summary">Upravljajte zanemarenim obavijestima i filterima.</string>
   <string name="no_filters_title">Nema postavljenih filtera</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
@@ -872,7 +872,7 @@
   <string name="lockpattern_reset_button">Ponovno postavi uzorak</string>
   <string name="lockpattern_settings_reset_summary">Unesite primarni e-mail račun i pridruženu lozinku da biste vratili uzorak</string>
   <!-- Protected Apps -->
-  <string name="menu_hidden_apps_delete">Resetiraj</string>
+  <string name="menu_hidden_apps_delete">Ponovno postavi</string>
   <string name="menu_hidden_apps_reset_lock">Ponovno postavi uzorak</string>
   <string name="protected_apps">Zaštićene aplikacije</string>
   <string name="protected_apps_summary">Upravljanje aplikacijama koje su skrivene iza sigurnog zaključavanja</string>
-- 
cgit v1.1


From 2169505c9a9300ca564a39d218b80dcfefc76c2a Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 30 Jun 2016 11:26:08 -0400
Subject: Pre-setup restrictions DO NOT MERGE

 - Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
---
 src/com/android/settings/HelpUtils.java          | 7 +++++++
 src/com/android/settings/SettingsActivity.java   | 5 +++++
 src/com/android/settings/users/UserSettings.java | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 3c36edb..1b6cbf7 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
+import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
@@ -90,6 +91,9 @@ public class HelpUtils {
      */
     public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,
             String helpUriString, String backupContext) {
+        if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            return false;
+        }
         if (TextUtils.isEmpty(helpUriString)) {
             // The help url string is empty or null, so set the help menu item to be invisible.
             helpMenuItem.setVisible(false);
@@ -123,6 +127,9 @@ public class HelpUtils {
 
     public static Intent getHelpIntent(Context context, String helpUriString,
             String backupContext) {
+        if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            return null;
+        }
         // Try to handle as Intent Uri, otherwise just treat as Uri.
         try {
             Intent intent = Intent.parseUri(helpUriString,
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8edec09..39c0e90 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -46,6 +46,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.transition.TransitionManager;
 import android.util.ArrayMap;
@@ -1316,6 +1317,10 @@ public class SettingsActivity extends Activity
     }
 
     private void addExternalTiles(List<DashboardCategory> target) {
+        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            // Don't add external tiles until device is set up.
+            return;
+        }
         Map<Pair<String, String>, DashboardTile> addedCache =
                 new ArrayMap<Pair<String, String>, DashboardTile>();
         UserManager userManager = UserManager.get(this);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 1849a9a..1278d54 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -45,6 +45,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
 import android.util.Log;
 import android.util.SparseArray;
@@ -229,6 +230,11 @@ public class UserSettings extends SettingsPreferenceFragment
         filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
         context.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,
                 mHandler);
+
+        if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            getActivity().finish();
+            return;
+        }
     }
 
     @Override
-- 
cgit v1.1


From b4dcc0d743e1828fc5333fd9a082ce724f03e5df Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Fri, 22 Jul 2016 12:04:58 -0700
Subject: Automatic translation import

Change-Id: Id177efe6c51cd3424564bf663746fb1fcd00f7c7
Ticket: -
---
 res/values-hr/cm_strings.xml | 10 ++++++----
 res/values-in/cm_strings.xml |  2 +-
 res/values-nb/cm_strings.xml |  4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 31ae28a..da88f67 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -262,7 +262,7 @@
   <string name="notification_light_general_title">Općenito</string>
   <string name="notification_light_applist_title">Aplikacije</string>
   <string name="notification_light_phonelist_title">Telefon</string>
-  <string name="notification_light_use_custom">Koristi prilagođene vrijednosti</string>
+  <string name="notification_light_use_custom">Upotrebljavaj prilagođene vrijednosti</string>
   <string name="notification_light_default_value">Zadano</string>
   <string name="notification_light_missed_call_title">Propušteni poziv</string>
   <string name="notification_light_voicemail_title">Glasovna pošta</string>
@@ -489,7 +489,7 @@
   <string name="volbtn_cursor_control_on_reverse">Gumb za glasnoću gore/dolje pomiče kursor desno/lijevo</string>
   <string name="power_end_call_title">Završi poziv</string>
   <string name="power_end_call_summary">Pritisak gumba za napajanje će prekinuti trenutni poziv</string>
-  <string name="swap_volume_buttons_title">Preorijentirati</string>
+  <string name="swap_volume_buttons_title">Preorijentacija</string>
   <string name="swap_volume_buttons_summary">Zamijeni gumbe za glasnoću kada je zaslon rotiran</string>
   <string name="button_wake_title">Probudi uređaj</string>
   <string name="home_answer_call_title">Odgovori na poziv</string>
@@ -591,7 +591,7 @@
   <string name="screen_color_vivid">Živopisno</string>
   <string name="screen_color_custom">Prilagođeno</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">Prilagodi zaslon prema dobu dana i okolini za poboljšanje čitljivosti i smanjenju naprezanja očiju</string>
+  <string name="live_display_summary">Prilagođuje zaslon prema vremenu dana i okolini za poboljšanje čitljivosti i smanjenje naprezanja očiju.</string>
   <string name="live_display_mode">Način prikaza</string>
   <string name="live_display_color_temperature_title">Temperatura boje</string>
   <string name="live_display_color_temperature_summary">Dan: <xliff:g id="day_temperature">%1$d</xliff:g>K Noć: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
@@ -619,6 +619,8 @@
   <string name="live_display_color_profile_photography_summary">Savršena boja reprodukcije za fotografije</string>
   <string name="live_display_color_profile_basic_title">Osnovno</string>
   <string name="live_display_color_profile_basic_summary">Koristite ne kalibriran zaslon</string>
+  <string name="live_display_color_profile_adaptive_title">Prilagodljiv</string>
+  <string name="live_display_color_profile_adaptive_summary">Boje se prilagođavaju ambijentnim uslovima</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selektor obavijesti</string>
   <string name="ime_switcher_notify_summary">Prikaz načina unosa za odabir ikona</string>
@@ -786,7 +788,7 @@
   <string name="category_interface">Sučelje</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Proširena radna površina</string>
-  <string name="expanded_hide_nothing">Nemoj ništa skrivati</string>
+  <string name="expanded_hide_nothing">Ne skrivaj ništa</string>
   <string name="expanded_hide_status">Sakrij traku stanja</string>
   <string name="expanded_hide_navigation">Sakrij navigacijsku traku</string>
   <string name="expanded_hide_both">Sakrij oboje</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index a9bb181..58b7815 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -43,7 +43,7 @@
   <string name="mod_version">Versi CyanogenMod</string>
   <string name="mod_version_default">Tidak diketahui</string>
   <!-- About phone screen, Device model -->
-  <string name="device_model">Modusl perangkat</string>
+  <string name="device_model">Model perangkat</string>
   <!-- About phone screen, Device name -->
   <string name="device_name">Nama perangkat</string>
   <!-- About phone screen, CyanogenMod Api Level -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 2ad4e12..a4430df 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -745,10 +745,10 @@
   <string name="privacy_guard_manager_title">Personvernvakt</string>
   <string name="privacy_guard_manager_summary">Administrere hvilke apps som har tilgang til dine personopplysninger</string>
   <string name="privacy_guard_no_user_apps">Ingen programmer er installert</string>
-  <string name="privacy_guard_help_title">hjelp</string>
+  <string name="privacy_guard_help_title">Hjelp</string>
   <string name="privacy_guard_reset_title">Tilbakestill</string>
   <string name="privacy_guard_reset_text">Tilbakestill tillatelser?</string>
-  <string name="privacy_guard_help_text">I dette skjermbildet kan du velge hvilke apps Privacy Guard skal være aktiv for ved å trykke på dem. Valgte apps vil ikke ha tilgang til personlige data som kontakter, meldinger eller ringelogg. Langt trykk på en apps oppføring åpner app detaljer skjermen.\n\nSystem apps vises ikke som standard, men kan vises ved å velge alternativet i menyen.</string>
+  <string name="privacy_guard_help_text">I disse innstillingene kan du velge hvilke apper Privacy Guard skal være aktiv for ved å trykke på dem. Valgte apper vil ikke ha tilgang til personlige data som kontakter, meldinger eller ringelogg. Et langt trykk på en apps oppføring åpner app detaljer skjermen.\n\nSystem apper vises ikke som standard, men kan vises ved å velge alternativet i menyen.</string>
   <string name="privacy_guard_manager_show_system_apps">Vis innebygde programmer</string>
   <string name="privacy_guard_advanced_settings_title">Avansert</string>
   <string name="privacy_guard_notification_title">Vis varsel</string>
-- 
cgit v1.1


From 6e7b8ba6f3c2518259c15abf2fb1e3120796f52f Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 24 Jul 2016 13:43:45 -0700
Subject: Automatic translation import

Change-Id: I127cdf44db7bbc0de5c84f532dee2ab151550c73
Ticket: -
---
 res/values-ca/cm_strings.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 8e90658..14aa5cc 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -648,10 +648,10 @@
   <string name="enable_spen_title_head">Habilita els gestos</string>
   <string name="enable_spen_summary_head">Utilitza gestos de deslliçament aguantant el botó del llapis</string>
   <string name="gestures_subcat_title">Gestos</string>
-  <string name="gestures_left_spen_title_head">Deslliça a l\'esquerra</string>
-  <string name="gestures_right_spen_title_head">Deslliça a la dreta</string>
-  <string name="gestures_up_spen_title_head">Deslliça amunt</string>
-  <string name="gestures_down_spen_title_head">Deslliça avall</string>
+  <string name="gestures_left_spen_title_head">Lliscament cap a l\'esquerra</string>
+  <string name="gestures_right_spen_title_head">Lliscament cap a la dreta</string>
+  <string name="gestures_up_spen_title_head">Lliscament cap amunt</string>
+  <string name="gestures_down_spen_title_head">Lliscament cap avall</string>
   <string name="gestures_long_spen_title_head">Pulsació llarga</string>
   <string name="gestures_double_spen_title_head">Doble pulsació</string>
   <!-- Gestures Options -->
-- 
cgit v1.1


From 64d31819ea6e4abb683490913981d8f54443f6ab Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Mon, 25 Jul 2016 11:49:03 -0700
Subject: Automatic translation import

Change-Id: I2d60336a2f80fe68568b4a33488547d5614b4187
Ticket: -
---
 res/values-bg/cm_strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 5e75104..d7bc1ad 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -57,8 +57,8 @@
   <!-- Settings switch for updating Cyanogen recovery -->
   <string name="update_recovery_title">Актуализирай режима за възстановяване</string>
   <string name="update_recovery_summary">Актуализирай режима за възстановяване със системните актуализации</string>
-  <string name="update_recovery_on_warning">Забележка: Когато тази функция е активна, вашият режим за възстановяване ще бъде заменен с включения в текущата версия на операционната система.\n\nВашия режима за възстановяване ще се актуализира заедно с ъпгрейдите на вашата система, за да се гарантира съвместимост с бъдещите версии.\n\nИскате ли да активирате тази функция?</string>
-  <string name="update_recovery_off_warning">Предупреждение: Когато тази функция е забранена, вашия режима за възстановяване няма да бъде актуализиран с актуализациите на операционната система.\n\nБъдещи актуализации на операционната система не могат да се инсталират с остарели или потребителски режими за възстановяване.\n\nНаистина ли искате да забраните тази функция?</string>
+  <string name="update_recovery_on_warning">ЗАБЕЛЕЖКА: Когато тази функция е активна, вашият режим за възстановяване ще бъде заменен с включения в текущата версия на операционната система.\n\nВашият режим за възстановяване ще се актуализира заедно с надгражданията на вашата система, за да се гарантира съвместимост с бъдещи версии.\n\nИскате ли да активирате тази функция?</string>
+  <string name="update_recovery_off_warning">ПРЕДУПРЕЖДЕНИЕ: Когато тази функция е забранена, вашият режим за възстановяване няма да бъде актуализиран с актуализациите на операционната система.\n\nБъдещи актуализации на операционната система не могат да се инсталират с остарели или потребителски режими за възстановяване.\n\nНаистина ли искате да забраните тази функция?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Теми</string>
-- 
cgit v1.1


From 60455643e7090924be7e0d9ddd1acd592aef7e3c Mon Sep 17 00:00:00 2001
From: Keith Mok <kmok@cyngn.com>
Date: Fri, 15 Jul 2016 09:30:39 -0700
Subject: Settings: Always set text value in color temperature

onProgressChange is not always called if we set the
color temperature to minimum, since it is the default
value (no change).
Causing the text showing the color temperature is empty.

Call onProgressChange explicitly during init.

FEIJ-1581

Change-Id: I7e0f8995cfc62a53770e787dc649109b9c3bf189
---
 src/com/android/settings/livedisplay/DisplayTemperature.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/livedisplay/DisplayTemperature.java b/src/com/android/settings/livedisplay/DisplayTemperature.java
index 920d197..350ef62 100644
--- a/src/com/android/settings/livedisplay/DisplayTemperature.java
+++ b/src/com/android/settings/livedisplay/DisplayTemperature.java
@@ -244,6 +244,10 @@ public class DisplayTemperature extends DialogPreference {
             }
             mSeekBar.setMax(mBarMax);
             mSeekBar.setOnSeekBarChangeListener(this);
+
+            // init text value
+            int p = mSeekBar.getProgress();
+            onProgressChanged(mSeekBar, p, false);
         }
 
         @Override
-- 
cgit v1.1


From 4aab309bc9b1b089423729d001d65e1ce6148859 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Tue, 26 Jul 2016 11:28:01 -0700
Subject: Automatic translation import

Change-Id: I6b60b16ef9530eace717d3e93f576a0a3e451abf
Ticket: -
---
 res/values-es/cm_strings.xml | 10 ++++++++++
 res/values-hr/cm_strings.xml | 36 ++++++++++++++++++------------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 5c36180..aacde4f 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -618,6 +618,8 @@
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Usar pantalla sin calibrar</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptable</string>
+  <string name="live_display_color_profile_adaptive_summary">Los colores se adaptan a las condiciones ambientales</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icono de selección</string>
   <string name="ime_switcher_notify_summary">Mostrar el icono de selección del método de entrada</string>
@@ -1041,6 +1043,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operadores de red</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfocar el fondo</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Mostrar el clima</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1058,6 +1061,13 @@
   <string name="cm_radio_info_diag_log_on_label">Desactivar el registro Diag</string>
   <string name="cm_radio_info_diag_log_off_label">Activar el registro Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Fondo de pantalla</string>
+  <string name="not_available_with_app">No disponible con %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localiza el sensor de huella digital en el <xliff:g id="sensor_location">%1$s </xliff:g> de su teléfono.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">atrás</string>
+  <string name="security_settings_fingerprint_sensor_location_front">delante</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lado izquierdo</string>
+  <string name="security_settings_fingerprint_sensor_location_right">lado derecho</string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index da88f67..3a659f5 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -221,7 +221,7 @@
   <!-- Navigation Bar -->
   <string name="navigation_bar_category">Navigacijska traka</string>
   <string name="navigation_bar_left_title">Način rada za ljevake</string>
-  <string name="navigation_bar_left_summary">Stavi navigacijsku traku na lijevu stranu zaslona u pejzažnom načinu rada</string>
+  <string name="navigation_bar_left_summary">Postavlja navigacijsku traku na lijevu stranu zaslona u vodoravnom načinu rada.</string>
   <string name="navigation_bar_title">Tipke i izgled</string>
   <string name="navigation_bar_help_text">Za početak dodirnite ikonu izmjene da bi otključali navigacijsku traku za uređivanje.\n\nMožete dodirnuti ikonu za promijenu prečaca ili dugim pritiskom preurediti raspored ikone.\n\nDodirnite \'Spremi\' za spremanje promjena, ili \'Vrati zadano\' za vraćanje izgleda na zadane postavke.</string>
   <string name="navigation_restore_button_text">Vrati zadano</string>
@@ -229,7 +229,7 @@
   <string name="navigation_save_button_text">Spremi</string>
   <string name="navigation_bar_reset_message">Brisanje trenutnih postavki i vraćanje na zadani izgled?</string>
   <string name="navigation_bar_arrow_keys_title">Prikaži strelice tijekom upisivanja</string>
-  <string name="navigation_bar_arrow_keys_summary">Prikaz lijeve i desne kursorske tipke tijekom unosa teksta. Zamjenjuje IME switcher.</string>
+  <string name="navigation_bar_arrow_keys_summary">Prikazuje lijeve i desne kursorske gumbe tijekom unosa teksta. Zamjenjuje gumb za promjenu tipkovnice.</string>
   <string name="navigation_bar_recents_title">Nedavne akcije dugog dodira</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Uređivanje postavki svjetla</string>
@@ -456,17 +456,17 @@
   <string name="device_hostname">Naziv uređaja</string>
   <string name="unlock_scramble_pin_layout_title">Nasumičan raspored</string>
   <string name="unlock_scramble_pin_layout_summary">Nasumičan PIN raspored pri otključavanju uređaja</string>
-  <string name="button_pref_title">Tipke</string>
+  <string name="button_pref_title">Gumbi</string>
   <string name="hardware_keys_power_key_title">Gumb za napajanje</string>
-  <string name="hardware_keys_home_key_title">Home tipka</string>
+  <string name="hardware_keys_home_key_title">Gumb za početni zaslon</string>
   <string name="hardware_keys_back_key_title">Tipka za natrag</string>
   <string name="hardware_keys_menu_key_title">Tipka izbornika</string>
   <string name="hardware_keys_assist_key_title">Tipka za pretraživanje</string>
   <string name="hardware_keys_appswitch_key_title">Tipka nedavno</string>
   <string name="hardware_keys_camera_key_title">Tipka kamere</string>
-  <string name="hardware_keys_volume_keys_title">Tipke za glasnoću</string>
-  <string name="hardware_keys_short_press_title">Kratki pritisak tipke</string>
-  <string name="hardware_keys_long_press_title">Dugi pritisak tipke</string>
+  <string name="hardware_keys_volume_keys_title">Gumbi za glasnoću</string>
+  <string name="hardware_keys_short_press_title">Radnja kratkog pritiska</string>
+  <string name="hardware_keys_long_press_title">Radnja dugog pritiska</string>
   <string name="hardware_keys_double_tap_title">Dvostruki dodir</string>
   <string name="hardware_keys_action_nothing">Ostavi nepromijenjeno</string>
   <string name="hardware_keys_action_menu">Otvori/zatvori izbornik</string>
@@ -529,8 +529,8 @@
   <string name="power_menu_sound_title">Zvučna ploča</string>
   <string name="power_menu_bug_report_disabled">Izvještavanje greški je onemogućeno u razvojnim postavkama</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">Omogući zaslonsku navigacijsku traku</string>
-  <string name="disable_navkeys_summary">Omogući zaslonsku navigacijsku traku i onemogući hardverske tipke</string>
+  <string name="disable_navkeys_title">Zaslonska navigacijska traka</string>
+  <string name="disable_navkeys_summary">Omogućite zaslonsku navigacijsku traku i onemogućite hardverske tipke.</string>
   <!-- tap-to-wake -->
   <string name="double_tap_to_wake_title">Dvaput dodirnite za buđenje</string>
   <string name="double_tap_to_wake_summary">Dvaput dodirnite zaslon da biste uključili uređaj</string>
@@ -538,10 +538,10 @@
   <string name="double_tap_to_sleep_title">Dvostruki dodir za spavanje</string>
   <string name="double_tap_to_sleep_summary">Dvaput dodirnite statusnu traku za isključivanje zaslona</string>
   <!-- Proximity wake -->
-  <string name="proximity_wake_title">Sprečavanje slučajnog buđenja</string>
+  <string name="proximity_wake_title">Sprječavanje slučajnog buđenja</string>
   <string name="proximity_wake_summary">Provjeri udaljenost senzora prije buđenja zaslona</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
-  <string name="wake_when_plugged_or_unplugged_title">Probudite na priključivanje na napajanje</string>
+  <string name="wake_when_plugged_or_unplugged_title">Buđenje pri priključivanju</string>
   <string name="wake_when_plugged_or_unplugged_summary">Uključite zaslon prilikom spajanja ili odspajanja izvora napajanja</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
@@ -625,9 +625,9 @@
   <string name="ime_switcher_notify">Selektor obavijesti</string>
   <string name="ime_switcher_notify_summary">Prikaz načina unosa za odabir ikona</string>
   <!-- Heads up -->
-  <string name="heads_up_notifications">Heads up</string>
-  <string name="summary_heads_up_enabled">Skočne obavijest su uključene</string>
-  <string name="summary_heads_up_disabled">Skočne obavijest su isključene</string>
+  <string name="heads_up_notifications">Plutajuće obavijesti</string>
+  <string name="summary_heads_up_enabled">Skočne su obavijesti omogućene.</string>
+  <string name="summary_heads_up_disabled">Skočne su obavijesti onemogućene.</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
   <string name="bluetooth_accept_all_files">Prihvati sve vrste datoteka</string>
   <!-- High touch sensitivity -->
@@ -765,7 +765,7 @@
   <!-- Whether the keyguard will directly pass to PIN entry -->
   <string name="lock_directly_show_pin">Izravno prikazivanje PIN unosa</string>
   <!-- lock screen visualizer -->
-  <string name="lockscreen_visualizer_title">Prikaži vizualizer glazbe</string>
+  <string name="lockscreen_visualizer_title">Prikaži vizualizator glazbe</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Onemogućeno od strane pločice brzih postavki</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Dodirnite da biste omogućili zaključavanje zaslona</string>
@@ -801,7 +801,7 @@
   <string name="kill_app_longpress_back">Zatvori aplikaciju tipkom natrag</string>
   <string name="kill_app_longpress_back_summary">Zatvori pozadinske aplikacije dugim pritiskom tipke natrag</string>
   <!-- Show/Hide Search Bar -->
-  <string name="recents_show_searchbar">Prikaži prozor za pretraživanje u nedavnim </string>
+  <string name="recents_show_searchbar">Traka za pretraživanje u nedavnim apl.</string>
   <string name="keywords_recents_show_searchbar">nedavne nedavni onemogući omogući prikaži sakrij traka za pretraživanje</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">Glasovno buđenje</string>
@@ -818,7 +818,7 @@
   <string name="blacklist_prefs">Postavke</string>
   <string name="blacklist_button_delete">Obriši</string>
   <string name="blacklist_empty_text">Nemate blokiranih brojeva. Dodajte unos dodirom na gumb Dodaj (+).</string>
-  <string name="blacklist_disabled_empty_text">Da spriječiš telefonski broj da te pozove ili pošalje poruku omogući popis blokiranih sugovornika.</string>
+  <string name="blacklist_disabled_empty_text">Da biste spriječili telefonske brojeve da vas zove ili da vam šalju poruke, omogućite popis blokiranih pozivatelja.</string>
   <string name="blacklist_summary_disabled">Onemogućeno</string>
   <string name="blacklist_summary">Nećete primati dolazne pozive ili poruke od telefonskih brojeva na popisu blokiranih pozivatelja</string>
   <string name="blacklist_notify">Prikaži obavijest</string>
@@ -908,7 +908,7 @@
   <string name="category_misc">Razno</string>
   <string name="title_general">Općenito</string>
   <string name="advanced">Napredno</string>
-  <string name="link_volume_option_title">Spoji glasnoće za ton zvona i obavijesti</string>
+  <string name="link_volume_option_title">Spoji glasnoće tona zvona i obavijesti</string>
   <string name="lcd_density_prompt_message">Neke aplikacije možda neće funkcionirati u ne standardnom DPI.\n\nOvo će ponovno pokrenuti uređaj.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">APN PPP telefonski broj</string>
-- 
cgit v1.1


From 9176a64ebcf2f59b01f0159ae129c56230b28cb6 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Sat, 2 Jul 2016 00:48:22 +0800
Subject: Settings: Improve vibrator intensity dialog layout

 - Remove redundant 'Vibrator intensity' text
 - Align the text and seekbars
 - Get rid of the ScrollView
 - Clean up

Visual:
http://imgur.com/YB7Ez3m

Change-Id: I4d80f7df2f18b580eaef1ca44ce0560e044ee065
---
 res/layout/vibrator_intensity.xml | 69 +++++++++++++++++----------------------
 res/values/cm_strings.xml         |  2 +-
 2 files changed, 31 insertions(+), 40 deletions(-)

diff --git a/res/layout/vibrator_intensity.xml b/res/layout/vibrator_intensity.xml
index dcbc676..171f90e 100644
--- a/res/layout/vibrator_intensity.xml
+++ b/res/layout/vibrator_intensity.xml
@@ -13,46 +13,37 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:paddingTop="24dp"
+    android:paddingBottom="24dp"
+    android:paddingEnd="24dp" >
 
-    <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center_horizontal"
-            android:paddingBottom="20dip">
+    <SeekBar
+        android:id="@*android:id/seekbar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="8dp"
+        android:layout_toStartOf="@id/value" />
 
-        <TextView android:id="@+id/text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/vibrator_intensity_title"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <TextView android:id="@+id/value"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentRight="true"
-                android:paddingTop="10dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
-        <SeekBar android:id="@*android:id/seekbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/text"
-                android:paddingTop="2dip"
-                android:paddingLeft="20dip"
-                android:paddingRight="20dip" />
+    <TextView
+        android:id="@+id/value"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_marginStart="4dp"
+        android:gravity="center_horizontal"
+        android:minEms="2" />
 
-        <TextView
-                android:id="@+id/warning_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@*android:id/seekbar"
-                android:paddingTop="8dip"
-                android:gravity="center"
-                android:textSize="15dp" />
+    <TextView
+        android:id="@+id/warning_text"
+        android:layout_below="@*android:id/seekbar"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginStart="24dp"
+        android:layout_marginTop="24dp" />
 
-    </RelativeLayout>
-</ScrollView>
+</RelativeLayout>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index cd091fd..cf5ad54 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -626,7 +626,7 @@
 
     <!-- Hardware tunables - Vibrator intensity -->
     <string name="vibrator_intensity_title">Vibrator intensity</string>
-    <string name="vibrator_warning">Values higher than %1$d are not recommended</string>
+    <string name="vibrator_warning">Values higher than %1$d%% are not recommended</string>
 
     <!-- Hardware tunables - Color calibration -->
     <string name="color_calibration_title">Color calibration</string>
-- 
cgit v1.1


From 29d679a18784e8c28d2146ad3037c420abc00928 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Fri, 22 Jul 2016 18:16:59 +0200
Subject: Settings: Fix possible crash

applicationInfo is null sometimes, check that first

Change-Id: I4c2d73cced26b8900c95ede08e5a9c478c107529
Reference: BugDumps 13-20160715-21 L#52
---
 src/com/android/settings/applications/InstalledAppDetails.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index f9dda55..43c3489 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -413,8 +413,9 @@ public class InstalledAppDetails extends AppInfoBase
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         menu.findItem(UNINSTALL_UPDATES).setVisible(mUpdatedSysApp && !mAppControlRestricted);
 
-        menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo.applicationInfo.protect);
-
+        if (mPackageInfo.applicationInfo != null) {
+            menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo.applicationInfo.protect);
+        }
     }
 
     @Override
-- 
cgit v1.1


From 581f936c95135410f800ff012dc2ee146876902c Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Wed, 27 Jul 2016 12:19:19 -0700
Subject: Automatic translation import

Change-Id: I75b51c7dd6065f768c28d1ae09d173ea55239845
Ticket: -
---
 res/values-af/cm_strings.xml      | 1 -
 res/values-ar/cm_strings.xml      | 1 -
 res/values-as-rIN/cm_strings.xml  | 1 -
 res/values-ast-rES/cm_strings.xml | 1 -
 res/values-az-rAZ/cm_strings.xml  | 1 -
 res/values-be/cm_strings.xml      | 1 -
 res/values-bg/cm_strings.xml      | 5 ++---
 res/values-bn-rBD/cm_strings.xml  | 1 -
 res/values-ca/cm_strings.xml      | 1 -
 res/values-cs/cm_strings.xml      | 1 -
 res/values-da/cm_strings.xml      | 1 -
 res/values-de/cm_strings.xml      | 1 -
 res/values-el/cm_strings.xml      | 1 -
 res/values-en-rAU/cm_strings.xml  | 1 -
 res/values-en-rIN/cm_strings.xml  | 1 -
 res/values-eo/cm_strings.xml      | 1 -
 res/values-es-rUS/cm_strings.xml  | 1 -
 res/values-es/cm_strings.xml      | 1 -
 res/values-et-rEE/cm_strings.xml  | 1 -
 res/values-eu-rES/cm_strings.xml  | 1 -
 res/values-fa/cm_strings.xml      | 1 -
 res/values-fi/cm_strings.xml      | 1 -
 res/values-fr/cm_strings.xml      | 1 -
 res/values-gu-rIN/cm_strings.xml  | 1 -
 res/values-hi/cm_strings.xml      | 1 -
 res/values-hr/cm_strings.xml      | 3 +--
 res/values-hu/cm_strings.xml      | 1 -
 res/values-in/cm_strings.xml      | 1 -
 res/values-it/cm_strings.xml      | 1 -
 res/values-iw/cm_strings.xml      | 1 -
 res/values-ja/cm_strings.xml      | 1 -
 res/values-kn-rIN/cm_strings.xml  | 1 -
 res/values-ko/cm_strings.xml      | 1 -
 res/values-ku/cm_strings.xml      | 1 -
 res/values-lb/cm_strings.xml      | 1 -
 res/values-lt/cm_strings.xml      | 1 -
 res/values-lv/cm_strings.xml      | 1 -
 res/values-ml-rIN/cm_strings.xml  | 1 -
 res/values-mr-rIN/cm_strings.xml  | 1 -
 res/values-nb/cm_strings.xml      | 1 -
 res/values-nl/cm_strings.xml      | 1 -
 res/values-or-rIN/cm_strings.xml  | 1 -
 res/values-pl/cm_strings.xml      | 1 -
 res/values-pt-rBR/cm_strings.xml  | 1 -
 res/values-pt-rPT/cm_strings.xml  | 1 -
 res/values-ro/cm_strings.xml      | 1 -
 res/values-ru/cm_strings.xml      | 1 -
 res/values-si-rLK/cm_strings.xml  | 1 -
 res/values-sk/cm_strings.xml      | 1 -
 res/values-sl/cm_strings.xml      | 1 -
 res/values-sr/cm_strings.xml      | 1 -
 res/values-sv/cm_strings.xml      | 1 -
 res/values-ta-rIN/cm_strings.xml  | 1 -
 res/values-te-rIN/cm_strings.xml  | 1 -
 res/values-th/cm_strings.xml      | 1 -
 res/values-tr/cm_strings.xml      | 1 -
 res/values-ug/cm_strings.xml      | 1 -
 res/values-uk/cm_strings.xml      | 1 -
 res/values-vi/cm_strings.xml      | 1 -
 res/values-zh-rCN/cm_strings.xml  | 1 -
 res/values-zh-rHK/cm_strings.xml  | 1 -
 res/values-zh-rTW/cm_strings.xml  | 1 -
 62 files changed, 3 insertions(+), 65 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 59d781a..4918e03 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">Volume verander klanke</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensiteit</string>
-  <string name="vibrator_warning">Waardes hoër as %1$d word nie aanbeveel nie</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kleur kalibrasie</string>
   <string name="color_calibration_summary">Kalibreer skerm kleure</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 119021c..7c22d77 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -553,7 +553,6 @@
   <string name="volume_adjust_sounds_title">أصوات تعديل حجم الصوت </string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">شدة الاهتزاز</string>
-  <string name="vibrator_warning">لا ينصح باستخدام قيم أعلى من %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">معايرة الألوان</string>
   <string name="color_calibration_summary">معايرة للألوان على الشاشة</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 026d5f0..89b9c92 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">ভলিউম মিলোৱাৰ ধ্বনি</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">ভাইব্ৰেটৰৰ তীব্ৰতা</string>
-  <string name="vibrator_warning">%1$d তকৈ ডাঙৰ মান অনুমোদিত নহয়</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">ৰং কেলিব্ৰেচন</string>
   <string name="color_calibration_summary">অন স্ক্ৰীণ ৰং কেলিব্ৰেট কৰক</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 4ce239b..595754e 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -544,7 +544,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="volume_adjust_sounds_title">Sonios d\'axuste de volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidá de vibración</string>
-  <string name="vibrator_warning">Nun son recomendables valores superiores a %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibración de color</string>
   <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 1672e85..da9fe1c 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -448,7 +448,6 @@
   <string name="volume_adjust_sounds_title">Səs artırma tonları</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Titrəmə intensivliyi</string>
-  <string name="vibrator_warning">%1$d üstündəki dəyərlər tövsiyə edilmir</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Rəng kalibrasiyası</string>
   <string name="color_calibration_summary">Ekran rənglərini kalibrlə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 5517466..47bae4d 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">Гук пры рэгулёўцы гучнасці</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Магутнасць вібрасігналу</string>
-  <string name="vibrator_warning">Усталёўка значэнняў ад %1$d і вышэй не рэкамендуецца</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Колер</string>
   <string name="color_calibration_summary">Налада колераперадачы экрана</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index d7bc1ad..5d58700 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Звук при регулиране на силата на звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Мощност на вибрация</string>
-  <string name="vibrator_warning">Стойности по-високи от %1$d не се препоръчват</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калибриране на цвета</string>
   <string name="color_calibration_summary">Калибриране на цветовете на екрана</string>
@@ -695,8 +694,8 @@
   <string name="status_bar_title">Лента на състоянието</string>
   <string name="status_bar_toggle_brightness">Контрол на яркостта</string>
   <string name="status_bar_toggle_brightness_summary">Настройване на яркостта чрез плъзгане в лентата на състоянието</string>
-  <string name="status_bar_notif_count_title">Показване броя на известията</string>
-  <string name="status_bar_notif_count_summary">Показва броя на новите известия</string>
+  <string name="status_bar_notif_count_title">Брой известия</string>
+  <string name="status_bar_notif_count_summary">Показва броя на новите известия в лентата на състоянието</string>
   <string name="status_bar_quick_qs_pulldown_title">Бързи настройки</string>
   <string name="status_bar_quick_qs_pulldown_summary">Дръпнете %1$s лентата на състоянието за бързи настройки</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Вляво</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 405bcc4..ec42245 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -358,7 +358,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">কম্পক তীব্রতা</string>
-  <string name="vibrator_warning">মান %1$d এর বেশী গ্রহণযোগ্য নয়</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">রং এর পরিমাপ</string>
   <string name="color_calibration_summary">পর্দার রং এর শক্তির পরিমাপ</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 14aa5cc..0e23d61 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Sons d\'ajust del volum</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitat del vibrador</string>
-  <string name="vibrator_warning">No es recomanen valors més alts de %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibració de color</string>
   <string name="color_calibration_summary">Calibra els colors de la pantalla</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index a26c3db..eb9659b 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -550,7 +550,6 @@
   <string name="volume_adjust_sounds_title">Zvuk při změně hlasitosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzita vibrací</string>
-  <string name="vibrator_warning">Nedoporučuje se použít hodnoty větší než %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Barevná kalibrace</string>
   <string name="color_calibration_summary">Kalibrovat barvy obrazovky</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 6b53179..497c8d6 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -543,7 +543,6 @@
   <string name="volume_adjust_sounds_title">Lyd for lydstyrkejustering</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator-intensitet</string>
-  <string name="vibrator_warning">Værdier højere end %1$d anbefales ikke</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Farvekalibrering</string>
   <string name="color_calibration_summary">Kalibrér skærmfarver</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index be01083..95abdcf 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Ton bei Lautstärkeänderung</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrationsstärke</string>
-  <string name="vibrator_warning">Höhere Werte als %1$d werden nicht empfohlen</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Farbkalibrierung</string>
   <string name="color_calibration_summary">Displayfarben kalibrieren</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index f63a1d5..cb1faf8 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Ήχοι πλήκτρων έντασης</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Ένταση δόνησης</string>
-  <string name="vibrator_warning">Δεν συνιστώνται τιμές άνω του %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Βελτίωση χρωμάτων</string>
   <string name="color_calibration_summary">Βελτίωση των χρωμάτων της οθόνης</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index d51ee76..27204d9 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -449,7 +449,6 @@
   <string name="volume_adjust_sounds_title">Volume adjustment sounds</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensity</string>
-  <string name="vibrator_warning">Values higher than %1$d are not recommended</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Colour calibration</string>
   <string name="color_calibration_summary">Calibrate on-screen colours</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 93eacf9..37a4479 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -490,7 +490,6 @@
   <string name="volume_adjust_sounds_title">Volume adjustment sounds</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensity</string>
-  <string name="vibrator_warning">Values higher than %1$d are not recommended</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Color calibration</string>
   <string name="color_calibration_summary">Calibrate on-screen colors</string>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 2c87b2a..d4575aa 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -473,7 +473,6 @@
   <string name="volume_adjust_sounds_title">Sonoj je la laŭteca agordo</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenceso de la vibrado</string>
-  <string name="vibrator_warning">Valoroj pli altaj ol %1$d ne estas konsilataj</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kolora kalibro</string>
   <string name="color_calibration_summary">Kalibri ekranajn kolorojn</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 1b8e904..f07a72d 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Sonidos de ajuste de volumen</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidad de vibración</string>
-  <string name="vibrator_warning">No son recomendables valores superiores a %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibración de color</string>
   <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index aacde4f..d861282 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Sonidos de ajuste de volumen</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidad de vibración</string>
-  <string name="vibrator_warning">Los valores superiores a %1$d no son recomendables</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibración de color</string>
   <string name="color_calibration_summary">Calibrar los colores de la pantalla</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index f86477a..1520615 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -481,7 +481,6 @@
   <string name="volume_adjust_sounds_title">Helitugevuse muutmise helid</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibreerimise intensiivsus</string>
-  <string name="vibrator_warning">Väärtused suuremad kui %1$d ei ole soovitatud</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Värvide kalibreerimine</string>
   <string name="color_calibration_summary">Kalibreeri ekraani värvid</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 6fa0988..305be68 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Bolumen doitze soinuak</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Bibrazioaren intentsitatea</string>
-  <string name="vibrator_warning">%1$d -tik gorako balioak ez daude gomendatuta</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kolore kalibrazioa</string>
   <string name="color_calibration_summary">Pantailaren koloreak kalibratu</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 29477a4..bdf1a11 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -483,7 +483,6 @@
   <string name="volume_adjust_sounds_title">تن تنظیم بلندی صدا</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">شدت لرزش</string>
-  <string name="vibrator_warning">مقادیر بالاتر از %1$d توصیه نمی‌شود</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">تنظیم رنگ</string>
   <string name="color_calibration_summary">تنظیم رنگ‌های خروجی صفحه</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 97afeeb..5d67548 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Äänenvoimakkuuden säädön merkkiääni</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Värinän voimakkuus</string>
-  <string name="vibrator_warning">Korkeampia arvoja kuin %1$d ei suositella</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Värien kalibrointi</string>
   <string name="color_calibration_summary">Kalibroi näytön värit</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index d20e9a5..4fbeafa 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -550,7 +550,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="volume_adjust_sounds_title">Son lors du réglage du volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensité du vibreur</string>
-  <string name="vibrator_warning">Les valeurs supérieures à %1$d ne sont pas recommandées</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrage des couleurs</string>
   <string name="color_calibration_summary">Calibrer les couleurs de l\'écran</string>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 9b29812..84238a9 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">વૉલ્યુમ સમાયોજન ધ્વનિ</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">વાઇબ્રેટર તીવ્રતા</string>
-  <string name="vibrator_warning">%1$d કરતા વધુ મૂલ્યોની ભલામણ કરવામાં આવતી નથી</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">રંગ અનુમાપન</string>
   <string name="color_calibration_summary">સ્ક્રીન રંગો પર અનુમાપન કરો</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 8e5e1f5..f0c5334 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -479,7 +479,6 @@
   <string name="volume_adjust_sounds_title">वोल्यूम समायोजन ध्वनियाँ</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">कंपक तीव्रता</string>
-  <string name="vibrator_warning">%1$d से बड़े मान उचित नहीं रहेंगे</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">रंग अंशांकन</string>
   <string name="color_calibration_summary">ऑन-स्क्रीन रंगों को अंशांकित करें</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 3a659f5..b3990e5 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -27,7 +27,7 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
   <string name="show_dev_already_cm">Nema potrebe, već ste omogućili postavke za razvoj.</string>
   <!-- Launch Dev Tools -->
-  <string name="development_tools_title">Razvojni alati</string>
+  <string name="development_tools_title">Alati za razvojne programere</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Prečac razvojnih postavki</string>
   <string name="development_shortcut_summary">Omogući prečac upravljanja aplikacijama u popisu nedavno korištenih aplikacija</string>
@@ -550,7 +550,6 @@
   <string name="volume_adjust_sounds_title">Zvuk podešavanja glasnoće</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzitet vibracije</string>
-  <string name="vibrator_warning">Vrijednosti veće od %1$d se ne preporučuju</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibracija boja</string>
   <string name="color_calibration_summary">Kalibriraj boje zaslona</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 8a5b648..4058425 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">Hangerő állítási hangok</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Rezgés erőssége</string>
-  <string name="vibrator_warning">Nem ajánlott %1$d százaléknál nagyobbra állítani</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Színek kalibrálása</string>
   <string name="color_calibration_summary">Képernyőn megjelenő színek kalibrálása</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 58b7815..b1e9252 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="volume_adjust_sounds_title">Penyesuaian volume suara</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitas penggetar</string>
-  <string name="vibrator_warning">Nilai-nilai yang lebih tinggi daripada %1$d tidak direkomendasikan</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibrasi warna</string>
   <string name="color_calibration_summary">Menyesuaikan layar warna</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 727322b..6c7b140 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Suono regolazione volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensità vibrazione</string>
-  <string name="vibrator_warning">Valori superiori a %1$d non sono raccomandati</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrazione colore</string>
   <string name="color_calibration_summary">Calibra i colori dello schermo</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 8643461..4c8e801 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -551,7 +551,6 @@
   <string name="volume_adjust_sounds_title">צליל שינוי עוצמת קול</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">עוצמת רטט</string>
-  <string name="vibrator_warning">ערכים גבוהים מ-%1$d אינם מומלצים</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">כיול צבע</string>
   <string name="color_calibration_summary">כיול צבעי מסך</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 02b6f44..92ba476 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="volume_adjust_sounds_title">音量調整の音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">バイブレーションの強さ</string>
-  <string name="vibrator_warning">%1$dより大きい値は推奨されません</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">色の調整</string>
   <string name="color_calibration_summary">画面の色を調整する</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index c7bc03c..71d557a 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">ವಾಲ್ಯೂಂ ಹೊಂದಾಣಿಕೆ ಶಬ್ಧಗಳು</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">ಕಂಪಕ ತೀವ್ರತೆ</string>
-  <string name="vibrator_warning">%1$dಕಿಂತ ಹೆಚ್ಚಿನ ಮೌಲ್ಯಗಳು ಸೂಕ್ತವಲ್ಲ</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">ಬಣ್ಣ ಮಾಪನಾಂಕ</string>
   <string name="color_calibration_summary">ತೆರೆಯ-ಮೇಲಿನ ಬಣ್ಣಗಳನ್ನು ಮಾಪನಾಂಕಿಸಿ</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 3dd9b9f..f448178 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="volume_adjust_sounds_title">소리 크기 조정</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">진동 세기</string>
-  <string name="vibrator_warning">%1$d보다 더 높은 값은 권장하지 않습니다.</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">색상 보정</string>
   <string name="color_calibration_summary">화면의 색상을 보정합니다</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 33dedc6..57d5189 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -449,7 +449,6 @@
   <string name="volume_adjust_sounds_title">دەستکاریکردنی دەنگ</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">له‌رینه‌وه‌ی توندێتی</string>
-  <string name="vibrator_warning">به‌های به‌رزتر له‌ %1$d پشتگیری نه‌کراوه‌</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">ڕه‌نگ کالیبره‌یشن</string>
   <string name="color_calibration_summary">کالیبره‌یت له‌سه‌ر ڕه‌نگی ڕوونما</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index a700588..9041af1 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -526,7 +526,6 @@
   <string name="volume_adjust_sounds_title">Lautstäerktännerungstoun</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibratiounsintensitéit</string>
-  <string name="vibrator_warning">Wäerter méi héich wéI %1$d sinn net recommandéiert</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Faarfkalibréierung</string>
   <string name="color_calibration_summary">Schiermfaarwe kalibréieren</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index e84d986..5f3e46c 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -484,7 +484,6 @@
   <string name="volume_adjust_sounds_title">Garsumo reguliavimo garsai</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibravimo intensyvumas</string>
-  <string name="vibrator_warning">Vertės didesnės nei %1$d yra nerekomenduojamos</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Spalvų kalibravimas</string>
   <string name="color_calibration_summary">Kalibruoti ekranines spalvas</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index db2986b..5ef150d 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -350,7 +350,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrāciju stiprums</string>
-  <string name="vibrator_warning">Vērtības, lielākas par %1$d, nav ieteicamas</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Krāsu kalibrēšana</string>
   <string name="color_calibration_summary">Kalibrēt ekrāna krāsas</string>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 58270bb..efcbb20 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">വോളിയം ക്രമീകരണ ശബ്ദങ്ങൾ</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">വൈബ്രേറ്റർ തീവ്രത</string>
-  <string name="vibrator_warning">%1$d ല്‍ കൂടുതൽ ഉള്ള മൂല്യങ്ങൾക്ക് ശുപാർശ ചെയ്യപ്പെടുന്നില്ല</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">നിറം കാലിബ്രേഷൻ</string>
   <string name="color_calibration_summary">ഓൺ-സ്ക്രീൻ നിറങ്ങൾ കാലിബ്രേറ്റ് ചെയ്യുക</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 0508028..4967a37 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">ध्वनी समायोजन ध्वनी</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">कंपन तीव्रता</string>
-  <string name="vibrator_warning">%1$d पेक्षा उच्च मूल्यांची शिफारस केली जात नाही</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">रंग कॅलिब्रेशन</string>
   <string name="color_calibration_summary">ऑन-स्क्रीन रंग कॅलिब्रेट करा</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index a4430df..1e5d669 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Volum justeringslyd</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensitet</string>
-  <string name="vibrator_warning">Verdier høyere enn %1$d er ikke anbefalt</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Fargekalibrering</string>
   <string name="color_calibration_summary">Kalibrere skjermens farger</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index cd3ab4b..5cb7547 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">Aanpassingsgeluid volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Trilintensiteit</string>
-  <string name="vibrator_warning">Waarden hoger dan %1$d worden niet aangeraden</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kleuren kalibreren</string>
   <string name="color_calibration_summary">Schermkleur kalibreren</string>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 300256d..0ca3c47 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">ଭୋଲ୍ୟୁମ୍‍ ଆଡ୍‍ଜଷ୍ଟ ସାଉଣ୍ଡ</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">ଭାଇବ୍ରେଟର୍‍ ତୀବ୍ରତା</string>
-  <string name="vibrator_warning">%1$Dରୁ ଅଧିକ ମୂଲ୍ୟ ପାଇଁ ଅନୁମତି ଦିଆଯାଇନାହିଁ</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">ରଙ୍ଗ କାଲିବ୍ରେସନ୍‍</string>
   <string name="color_calibration_summary">ଅନ୍‍-ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ କାଲିବ୍ରେଟ୍‍ କରନ୍ତୁ</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 04bf9b7..ce7a5f2 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -544,7 +544,6 @@
   <string name="volume_adjust_sounds_title">Dźwięk regulacji głośności</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Siła wibracji</string>
-  <string name="vibrator_warning">Wartości wyższe niż %1$d nie są zalecane</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibracja kolorów</string>
   <string name="color_calibration_summary">Kalibruje wyświetlane kolory</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index fdd177e..3459048 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Som de ajuste do volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidade de vibração</string>
-  <string name="vibrator_warning">Valores maiores que %1$d não são recomendados</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibragem de cor</string>
   <string name="color_calibration_summary">Calibra as cores da tela</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 1297d32..88008de 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Sons de ajuste do volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidade de vibração</string>
-  <string name="vibrator_warning">Valores superiores a %1$d não são recomendados</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibração de cores</string>
   <string name="color_calibration_summary">Calibrar as cores do ecrã</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index b703b17..91bc452 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -518,7 +518,6 @@
   <string name="volume_adjust_sounds_title">Sunet ajustare volum</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitate vibrare</string>
-  <string name="vibrator_warning">Valorile mai mari de %1$d nu sunt recomandate</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrare culoare</string>
   <string name="color_calibration_summary">Calibrare culori pe ecran</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 90d8759..1112f15 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -550,7 +550,6 @@
   <string name="volume_adjust_sounds_title">Звук при регулировке громкости</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Мощность вибросигнала</string>
-  <string name="vibrator_warning">Не рекомендуется устанавливать значения свыше %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Цвет</string>
   <string name="color_calibration_summary">Настройка цветопередачи экрана</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 4287864..1b80e53 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -358,7 +358,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">කම්පකයේ තීව්‍රතාව</string>
-  <string name="vibrator_warning">%1$d ට වඩා වැඩි අගයන් නිර්දේශ නොකරයි</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">වර්ණ ප්‍රමාණ ශෝධනය</string>
   <string name="color_calibration_summary">තිරයේ වර්ණ ප්‍රමාණ ශෝධනය කරන්න</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 0ef6db5..9c6ee32 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -484,7 +484,6 @@
   <string name="volume_adjust_sounds_title">Zvuk pri úprave hlasitosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzita vibrácií</string>
-  <string name="vibrator_warning">Hodnoty vyššie než %1$d nie sú odporúčané</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibrácia farieb</string>
   <string name="color_calibration_summary">Kalibrovať farby na obrazovke</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index da43d1d..1ba75a0 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -551,7 +551,6 @@
   <string name="volume_adjust_sounds_title">Zvoki za prilagoditev glasnosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Jakost vibriranja</string>
-  <string name="vibrator_warning">Vrednosti višje od %1$d niso priporočljive</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Umerjanje barv</string>
   <string name="color_calibration_summary">Umeri barve na zaslonu</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index b4e2063..677176c 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -550,7 +550,6 @@
   <string name="volume_adjust_sounds_title">Регулисање јачине звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Интензитет вибрације</string>
-  <string name="vibrator_warning">Вредност већа од %1$d није препоручена</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калибрација боје</string>
   <string name="color_calibration_summary">Калибрација боја на екрану</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index d304b7b..f0298b8 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="volume_adjust_sounds_title">Ljud vid volymjustering</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibratorintensitet</string>
-  <string name="vibrator_warning">Värden högre än %1$d är inte rekommenderade</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Färgkalibrering</string>
   <string name="color_calibration_summary">Kalibrera skärmfärger</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index df54efc..236a36f 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">வால்யூம் சரிசெய்தல் ஆடியோகள்</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">அதிர்வான் அளவு</string>
-  <string name="vibrator_warning">%1$dஐவிட உயர்வான மதிப்புகள் பரிந்துரைக்கப்படுவதில்லை</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">நிற அளவிடுதல்</string>
   <string name="color_calibration_summary">திரைமீதுள்ள நிறங்களை அளவிடு</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index ea1c99c..61ed966 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">వాల్యూమ్ సవరణ శబ్దాలు</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">వైబ్రేటర్ తీవ్రత</string>
-  <string name="vibrator_warning">%1$d కంటే ఎక్కువగా ఉండే విలువలు సిఫార్సు చేయబడవు</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">రంగు క్రమాంకనం</string>
   <string name="color_calibration_summary">ఆన్-స్క్రీన్ రంగులను క్రమాంకనం చేయుము</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index fb1789a..6e4c04f 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="volume_adjust_sounds_title">เสียงปรับความดัง</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">ความแรงการสั่น</string>
-  <string name="vibrator_warning">ไม่แนะนำให้ใช้ค่ามากกว่า %1$d</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">การปรับเทียบสี</string>
   <string name="color_calibration_summary">ปรับเทียบสีบนจอ</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 5fa6f57..89d625e 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -549,7 +549,6 @@
   <string name="volume_adjust_sounds_title">Ses arttırma tonları</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Titreşim yoğunluğu</string>
-  <string name="vibrator_warning">%1$d üzerindeki değerler önerilmez</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Renk kalibrasyonu</string>
   <string name="color_calibration_summary">Ekran renklerini kalibre edin</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 0fc7d55..9a1f929 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -546,7 +546,6 @@
   <string name="volume_adjust_sounds_title">ئاۋاز مىقدارىنى تەڭشەش ئەسكەرتىش ئاۋازى</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">تىترەتكۈچ كۈچلۈكلۈكى</string>
-  <string name="vibrator_warning">قىممىتى %1$d دىن يۇقىرى بولۇشى تەۋسىيە قىلىنمايدۇ</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">رەڭ توغرىلاش</string>
   <string name="color_calibration_summary">ئېكراندىكى رەڭلەرنى توغرىلايدۇ</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 85aa207..7408b7b 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -532,7 +532,6 @@
   <string name="volume_adjust_sounds_title">Звуки регулювання гучності</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Інтенсивність вібро</string>
-  <string name="vibrator_warning">Значення вище, ніж %1$d не рекомендується</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калібрування кольору</string>
   <string name="color_calibration_summary">Калібрування кольору на екрані</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index e941946..e491700 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="volume_adjust_sounds_title">Âm thanh điều chỉnh âm lượng</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Cường độ rung</string>
-  <string name="vibrator_warning">Giá trị cao hơn %1$d không được khuyên dùng</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Hiệu chỉnh màu sắc</string>
   <string name="color_calibration_summary">Hiệu chỉnh màu sắc trên màn hình</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 7cceac7..a115ad0 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -545,7 +545,6 @@
   <string name="volume_adjust_sounds_title">音量调节提示音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">振动强度</string>
-  <string name="vibrator_warning">不推荐高于 %1$d 的振动强度</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">颜色校准</string>
   <string name="color_calibration_summary">校准屏幕颜色</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index a71c995..b3e32fe 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -453,7 +453,6 @@
   <!-- Volume settings - Volume adjustment sound -->
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">震動強度</string>
-  <string name="vibrator_warning">不建議超過 %1$d 的數值</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">顏色校準</string>
   <string name="color_calibration_summary">校準螢幕顏色</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 47947ff..b233241 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -531,7 +531,6 @@
   <string name="volume_adjust_sounds_title">音量調整指示音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">震動強度</string>
-  <string name="vibrator_warning">不建議大於 %1$d 的值</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">顏色校準</string>
   <string name="color_calibration_summary">校準螢幕上的顏色</string>
-- 
cgit v1.1


From 39a3d541b75bd3aa8ebde881fd8fbe5821257fa6 Mon Sep 17 00:00:00 2001
From: d34d <clark@cyngn.com>
Date: Wed, 27 Jul 2016 10:43:24 -0700
Subject: Add SIM status string for localizing voice/data strings

SIM status hard codes "voice" and "data" and therefore cannot be
translated.  This patch adds a format string that can now be
properly translated.

Change-Id: I3797b795d00aae875c0d33a1ee152f4c1e09021b
TICKET: CYNGNOS-3227
---
 res/values/cm_strings.xml                          | 3 +++
 src/com/android/settings/deviceinfo/SimStatus.java | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index cf5ad54..3f5113d 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1258,4 +1258,7 @@
     <string name="security_settings_fingerprint_sensor_location_front">front</string>
     <string name="security_settings_fingerprint_sensor_location_left">left side</string>
     <string name="security_settings_fingerprint_sensor_location_right">right side</string>
+
+    <!-- SIM status format string -->
+    <string name="sim_status_format_string">Voice: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/src/com/android/settings/deviceinfo/SimStatus.java b/src/com/android/settings/deviceinfo/SimStatus.java
index 7410cd3..b40a255 100644
--- a/src/com/android/settings/deviceinfo/SimStatus.java
+++ b/src/com/android/settings/deviceinfo/SimStatus.java
@@ -297,7 +297,8 @@ public class SimStatus extends InstrumentedPreferenceActivity {
 
         String dataDisplay = Utils.getServiceStateString(dataState, mRes);
 
-        setSummaryText(KEY_SERVICE_STATE, "Voice: " + voiceDisplay + " / Data: " + dataDisplay);
+        setSummaryText(KEY_SERVICE_STATE, getString(R.string.sim_status_format_string,
+                voiceDisplay, dataDisplay));
 
         if (serviceState.getRoaming()) {
             setSummaryText(KEY_ROAMING_STATE, mRes.getString(R.string.radioInfo_roaming_in));
-- 
cgit v1.1


From 14a996fdb68ae6e0f2e398c968eb1409a956f441 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <ricardo@cyngn.com>
Date: Thu, 28 Jul 2016 12:29:40 +0100
Subject: SimSettings: Make provisioning optional even if qti-telephony is
 present

Current code assumes the manual provisioning options should come
up if the qti-telephony blob is present. Don't make that assumption.

Change-Id: I5e4f28b628e3fe3fe9e506631e92c85103e87ccf
---
 res/values/config.xml                         | 4 ++++
 src/com/android/settings/sim/SimSettings.java | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index f463615..a2ad7d0 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -133,4 +133,8 @@
          3 = right side
     -->
     <integer name="config_fingerprintSensorLocation">0</integer>
+
+    <!-- Does the device allow for manual subscription provisioning? Only works for multi-sim devices,
+         and currently depends on QC's proprietary telephony stack -->
+    <bool name="config_enableManualSubProvisioning">true</bool>
 </resources>
diff --git a/src/com/android/settings/sim/SimSettings.java b/src/com/android/settings/sim/SimSettings.java
index 88ed36f..b97ee03 100644
--- a/src/com/android/settings/sim/SimSettings.java
+++ b/src/com/android/settings/sim/SimSettings.java
@@ -512,7 +512,8 @@ public class SimSettings extends RestrictedSettingsFragment implements Indexable
             // Disable manual provisioning option to user when
             // device is in Airplane mode. Hide it if the extphone framework
             // is not present, as the operation relies on said framework.
-            if (mExtTelephony == null) {
+            if (mExtTelephony == null ||
+                   !mContext.getResources().getBoolean(R.bool.config_enableManualSubProvisioning)) {
                 mSwitch.setVisibility(View.GONE);
             } else {
                 mSwitch.setVisibility(View.VISIBLE);
-- 
cgit v1.1


From 32416ca07e7f85a2f6b93bee82accb70a09aea5c Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Wed, 27 Jul 2016 11:42:45 -0700
Subject: ZenMode rules: Show days list in the correct order

Populate the days list based on what the first day of the week is
for the current locale. Ex. Sunday is the first item in the
list for US, whereas Monday is for UK

Change-Id: Ib3c03a59cee73cfcd809fb115a5d49e5eb7c2e45
TICKET: CYNGNOS-3181
---
 .../android/settings/notification/ZenModeScheduleDaysSelection.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
index 3e88046..a0af03f 100644
--- a/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
+++ b/src/com/android/settings/notification/ZenModeScheduleDaysSelection.java
@@ -61,8 +61,9 @@ public class ZenModeScheduleDaysSelection extends ScrollView {
         }
         mLayout.setOrientation(LinearLayout.VERTICAL);
         final Calendar c = Calendar.getInstance();
+        int i = c.getFirstDayOfWeek() - 1;
         final LayoutInflater inflater = LayoutInflater.from(context);
-        for (int i = 0; i < DAYS.length; i++) {
+        for (int d = 0; d < DAYS.length; d++) {
             final int day = DAYS[i];
             final CheckBox checkBox = (CheckBox) inflater.inflate(R.layout.zen_schedule_rule_day,
                     this, false);
@@ -77,6 +78,7 @@ public class ZenModeScheduleDaysSelection extends ScrollView {
                 }
             });
             mLayout.addView(checkBox);
+            i = ++i % DAYS.length;
         }
     }
 
-- 
cgit v1.1


From d7c7c8e8b23c1b4191f6d37f4bd15feca37dad13 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Thu, 28 Jul 2016 12:34:39 -0700
Subject: Automatic translation import

Change-Id: I2db12f567932f5357531631a68c436657f49f59c
Ticket: -
---
 res/values-af/cm_strings.xml      | 1 +
 res/values-am/cm_strings.xml      | 1 +
 res/values-ar/cm_strings.xml      | 1 +
 res/values-as-rIN/cm_strings.xml  | 1 +
 res/values-ast-rES/cm_strings.xml | 1 +
 res/values-az-rAZ/cm_strings.xml  | 1 +
 res/values-be/cm_strings.xml      | 1 +
 res/values-bg/cm_strings.xml      | 2 ++
 res/values-bn-rBD/cm_strings.xml  | 1 +
 res/values-br-rFR/cm_strings.xml  | 1 +
 res/values-ca/cm_strings.xml      | 1 +
 res/values-cs/cm_strings.xml      | 1 +
 res/values-csb-rPL/cm_strings.xml | 1 +
 res/values-cy/cm_strings.xml      | 1 +
 res/values-da/cm_strings.xml      | 1 +
 res/values-de/cm_strings.xml      | 1 +
 res/values-el/cm_strings.xml      | 1 +
 res/values-en-rAU/cm_strings.xml  | 1 +
 res/values-en-rGB/cm_strings.xml  | 1 +
 res/values-en-rIN/cm_strings.xml  | 1 +
 res/values-en-rPT/cm_strings.xml  | 1 +
 res/values-eo/cm_strings.xml      | 1 +
 res/values-es-rMX/cm_strings.xml  | 1 +
 res/values-es-rUS/cm_strings.xml  | 1 +
 res/values-es/cm_strings.xml      | 2 ++
 res/values-et-rEE/cm_strings.xml  | 1 +
 res/values-eu-rES/cm_strings.xml  | 1 +
 res/values-fa/cm_strings.xml      | 1 +
 res/values-fi/cm_strings.xml      | 1 +
 res/values-fil-rPH/cm_strings.xml | 1 +
 res/values-fr-rCA/cm_strings.xml  | 1 +
 res/values-fr/cm_strings.xml      | 1 +
 res/values-frp-rIT/cm_strings.xml | 1 +
 res/values-fy-rNL/cm_strings.xml  | 1 +
 res/values-gd-rGB/cm_strings.xml  | 1 +
 res/values-gl-rES/cm_strings.xml  | 1 +
 res/values-gu-rIN/cm_strings.xml  | 1 +
 res/values-hi/cm_strings.xml      | 1 +
 res/values-hr/cm_strings.xml      | 1 +
 res/values-hu/cm_strings.xml      | 1 +
 res/values-hy-rAM/cm_strings.xml  | 1 +
 res/values-in/cm_strings.xml      | 1 +
 res/values-is-rIS/cm_strings.xml  | 1 +
 res/values-it/cm_strings.xml      | 1 +
 res/values-iw/cm_strings.xml      | 1 +
 res/values-ja/cm_strings.xml      | 1 +
 res/values-ka-rGE/cm_strings.xml  | 1 +
 res/values-kk-rKZ/cm_strings.xml  | 1 +
 res/values-km-rKH/cm_strings.xml  | 1 +
 res/values-kn-rIN/cm_strings.xml  | 1 +
 res/values-ko/cm_strings.xml      | 4 +---
 res/values-ku/cm_strings.xml      | 1 +
 res/values-ky-rKG/cm_strings.xml  | 1 +
 res/values-lb/cm_strings.xml      | 1 +
 res/values-lo-rLA/cm_strings.xml  | 1 +
 res/values-lt/cm_strings.xml      | 1 +
 res/values-lv/cm_strings.xml      | 1 +
 res/values-mk-rMK/cm_strings.xml  | 1 +
 res/values-ml-rIN/cm_strings.xml  | 1 +
 res/values-mn-rMN/cm_strings.xml  | 1 +
 res/values-mr-rIN/cm_strings.xml  | 1 +
 res/values-ms-rMY/cm_strings.xml  | 1 +
 res/values-my-rMM/cm_strings.xml  | 1 +
 res/values-nb/cm_strings.xml      | 1 +
 res/values-ne-rNP/cm_strings.xml  | 1 +
 res/values-nl/cm_strings.xml      | 2 ++
 res/values-oc-rFR/cm_strings.xml  | 1 +
 res/values-or-rIN/cm_strings.xml  | 1 +
 res/values-pa-rIN/cm_strings.xml  | 1 +
 res/values-pl/cm_strings.xml      | 6 ++++++
 res/values-pt-rBR/cm_strings.xml  | 1 +
 res/values-pt-rPT/cm_strings.xml  | 1 +
 res/values-rm/cm_strings.xml      | 1 +
 res/values-ro/cm_strings.xml      | 1 +
 res/values-ru/cm_strings.xml      | 1 +
 res/values-si-rLK/cm_strings.xml  | 1 +
 res/values-sk/cm_strings.xml      | 1 +
 res/values-sl/cm_strings.xml      | 2 ++
 res/values-sq-rAL/cm_strings.xml  | 1 +
 res/values-sr/cm_strings.xml      | 1 +
 res/values-sv/cm_strings.xml      | 1 +
 res/values-sw/cm_strings.xml      | 1 +
 res/values-ta-rIN/cm_strings.xml  | 1 +
 res/values-te-rIN/cm_strings.xml  | 1 +
 res/values-th/cm_strings.xml      | 1 +
 res/values-tr/cm_strings.xml      | 1 +
 res/values-ug/cm_strings.xml      | 1 +
 res/values-uk/cm_strings.xml      | 1 +
 res/values-ur-rPK/cm_strings.xml  | 1 +
 res/values-uz-rUZ/cm_strings.xml  | 1 +
 res/values-vi/cm_strings.xml      | 1 +
 res/values-zh-rCN/cm_strings.xml  | 2 ++
 res/values-zh-rHK/cm_strings.xml  | 1 +
 res/values-zh-rTW/cm_strings.xml  | 1 +
 res/values-zu/cm_strings.xml      | 1 +
 95 files changed, 105 insertions(+), 3 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 4918e03..9bba2f8 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -1024,4 +1024,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 7c22d77..6c86d3c 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -1058,4 +1058,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 89b9c92..5d98cc3 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 595754e..1ae73ea 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -1009,4 +1009,5 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index da9fe1c..4153728 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -719,4 +719,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 47bae4d..76a79c0 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -1023,4 +1023,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 5d58700..b440a91 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Звук при регулиране на силата на звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Мощност на вибрация</string>
+  <string name="vibrator_warning">Стойности по-високи от %1$d%% не са препоръчителни</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калибриране на цвета</string>
   <string name="color_calibration_summary">Калибриране на цветовете на екрана</string>
@@ -1075,4 +1076,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">Отпред</string>
   <string name="security_settings_fingerprint_sensor_location_left">Лява страна</string>
   <string name="security_settings_fingerprint_sensor_location_right">Дясна страна</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index ec42245..552af91 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -566,4 +566,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 0e23d61..ee9abab 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">davant</string>
   <string name="security_settings_fingerprint_sensor_location_left">costat esquerre</string>
   <string name="security_settings_fingerprint_sensor_location_right">costat dret</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index eb9659b..3d41c4f 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">přední</string>
   <string name="security_settings_fingerprint_sensor_location_left">levá strana</string>
   <string name="security_settings_fingerprint_sensor_location_right">pravá strana</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 497c8d6..a4e4f09 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -1046,4 +1046,5 @@
   <string name="not_available_with_app">Ikke tilgængelig med %1$s</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 95abdcf..5648b4f 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">Rückseite</string>
   <string name="security_settings_fingerprint_sensor_location_left">linken Seite</string>
   <string name="security_settings_fingerprint_sensor_location_right">rechten Seite</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index cb1faf8..559e472 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -1079,4 +1079,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">στο μπροστινό μέρος</string>
   <string name="security_settings_fingerprint_sensor_location_left">στην αριστερή πλευρά</string>
   <string name="security_settings_fingerprint_sensor_location_right">στη δεξιά πλευρά</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 27204d9..84a17b6 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -778,4 +778,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 3acfd1a..5daeda0 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -201,4 +201,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 37a4479..528f0fb 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -922,4 +922,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index d4575aa..3dbff19 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -857,4 +857,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index 69cbe96..bcfc992 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -303,4 +303,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index f07a72d..184df08 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -1052,4 +1052,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index d861282..847ef7c 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1069,4 +1069,6 @@
   <string name="security_settings_fingerprint_sensor_location_front">delante</string>
   <string name="security_settings_fingerprint_sensor_location_left">lado izquierdo</string>
   <string name="security_settings_fingerprint_sensor_location_right">lado derecho</string>
+  <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voz: <xliff:g id="voice_status">%1$s</xliff:g> / Datos: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 1520615..33b933c 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -897,4 +897,5 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 305be68..6ca9628 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">aurrealdean</string>
   <string name="security_settings_fingerprint_sensor_location_left">ezkerraldean</string>
   <string name="security_settings_fingerprint_sensor_location_right">eskuinaldean</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index bdf1a11..87485a2 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -906,4 +906,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 5d67548..c5597bf 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">edestä</string>
   <string name="security_settings_fingerprint_sensor_location_left">vasemmasta reunasta</string>
   <string name="security_settings_fingerprint_sensor_location_right">oikeasta reunasta</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 4fbeafa..014e9b8 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -1052,4 +1052,5 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index d46a2cc..74fa14a 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -197,4 +197,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 331a725..ad17123 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -443,4 +443,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 84238a9..0eec73e 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -1019,4 +1019,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index f0c5334..14ecdb5 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -870,4 +870,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index b3990e5..3095962 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -1076,4 +1076,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">prednjoj strani</string>
   <string name="security_settings_fingerprint_sensor_location_left">lijevoj strani</string>
   <string name="security_settings_fingerprint_sensor_location_right">desnoj strani</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 4058425..c329cc5 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -1019,4 +1019,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index b1e9252..c4d4676 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -1051,4 +1051,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 6c7b140..6cd1e50 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1077,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">anteriore</string>
   <string name="security_settings_fingerprint_sensor_location_left">sinistra</string>
   <string name="security_settings_fingerprint_sensor_location_right">destra</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 4c8e801..d6e20ed 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -1059,4 +1059,5 @@
   <string name="lockscreen_wallpaper_title">טפט</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 92ba476..c94c5bd 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -1072,4 +1072,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">前面</string>
   <string name="security_settings_fingerprint_sensor_location_left">左側面</string>
   <string name="security_settings_fingerprint_sensor_location_right">右側面</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 71d557a..6fa6c16 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -1019,4 +1019,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index f448178..a996da0 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -695,8 +695,6 @@
   <string name="status_bar_notif_count_summary">읽지 않은 알림 숫자 표시</string>
   <string name="status_bar_quick_qs_pulldown_title">빠른 설정 내리기</string>
   <string name="status_bar_quick_qs_pulldown_summary">상태 바의 %1$s 끝에서는 빠른 설정을 내립니다.</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">왼쪽</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">오른쪽</string>
   <string name="status_bar_quick_qs_pulldown_off">끄기</string>
   <string name="status_bar_quick_qs_pulldown_left">왼쪽</string>
   <string name="status_bar_quick_qs_pulldown_right">오른쪽</string>
@@ -1034,7 +1032,6 @@
   <string name="shortcut_carrier_title">네트워크 영업자</string>
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">날씨 표시</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">잠금 화면에 표시</string>
   <string name="app_notification_show_on_keyguard_summary">잠금화면에 알림을 표시</string>
@@ -1045,4 +1042,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 57d5189..34fca70 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -779,4 +779,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 9041af1..2182d75 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -948,4 +948,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 5f3e46c..967f04a 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -905,4 +905,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 5ef150d..96523cc 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -558,4 +558,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index efcbb20..dc849aa 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -1018,4 +1018,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 4967a37..795f0fa 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 1e5d669..2a00f78 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">forsiden</string>
   <string name="security_settings_fingerprint_sensor_location_left">venstre siden</string>
   <string name="security_settings_fingerprint_sensor_location_right">høyre siden</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 5cb7547..a4c98d2 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -547,6 +547,7 @@
   <string name="volume_adjust_sounds_title">Aanpassingsgeluid volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Trilintensiteit</string>
+  <string name="vibrator_warning">Waarden hoger dan %1$d%% worden niet aangeraden</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kleuren kalibreren</string>
   <string name="color_calibration_summary">Schermkleur kalibreren</string>
@@ -1026,4 +1027,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 0ca3c47..afcbc36 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index ce7a5f2..5ee3eff 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1060,6 +1060,12 @@
   <string name="cm_radio_info_diag_log_off_label">Wł. diagnostyczne logowanie</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Tapeta</string>
+  <string name="not_available_with_app">Niedostępne z %1$s</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">tył</string>
+  <string name="security_settings_fingerprint_sensor_location_front">przód</string>
+  <string name="security_settings_fingerprint_sensor_location_left">lewa strona</string>
+  <string name="security_settings_fingerprint_sensor_location_right">prawa strona</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 3459048..4d6b68e 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">frente</string>
   <string name="security_settings_fingerprint_sensor_location_left">lado esquerdo</string>
   <string name="security_settings_fingerprint_sensor_location_right">lado direito</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 88008de..d3ca0d3 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -1075,4 +1075,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">parte frontal</string>
   <string name="security_settings_fingerprint_sensor_location_left">lateral esquerda</string>
   <string name="security_settings_fingerprint_sensor_location_right">lateral direita</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 91bc452..2dec126 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -941,4 +941,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 1112f15..427b443 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -1076,4 +1076,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">передней панели</string>
   <string name="security_settings_fingerprint_sensor_location_left">левой грани</string>
   <string name="security_settings_fingerprint_sensor_location_right">правой грани</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 1b80e53..29408c1 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -566,4 +566,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 9c6ee32..8744330 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -905,4 +905,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 1ba75a0..914117d 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -551,6 +551,7 @@
   <string name="volume_adjust_sounds_title">Zvoki za prilagoditev glasnosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Jakost vibriranja</string>
+  <string name="vibrator_warning">Vrednosti višje od %1$d %% niso priporočljive</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Umerjanje barv</string>
   <string name="color_calibration_summary">Umeri barve na zaslonu</string>
@@ -1079,4 +1080,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">sprednji strani</string>
   <string name="security_settings_fingerprint_sensor_location_left">levi strani</string>
   <string name="security_settings_fingerprint_sensor_location_right">desni strani</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 677176c..bc90179 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -1074,4 +1074,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">испред</string>
   <string name="security_settings_fingerprint_sensor_location_left">на левој страни</string>
   <string name="security_settings_fingerprint_sensor_location_right">на десној страни</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index f0298b8..5d908d2 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -1037,4 +1037,5 @@ inkluderar en unik identifikation,
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 236a36f..ec4e4f3 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 61ed966..3415593 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -1017,4 +1017,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 6e4c04f..a496f86 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -1051,4 +1051,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 89d625e..1c38ad9 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -1052,4 +1052,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 9a1f929..029ffc0 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -1026,4 +1026,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 7408b7b..9d06bff 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -953,4 +953,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index e491700..60e2959 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -1051,4 +1051,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index a115ad0..205e502 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -545,6 +545,7 @@
   <string name="volume_adjust_sounds_title">音量调节提示音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">振动强度</string>
+  <string name="vibrator_warning">不推荐高于 %1$d%% 的振动强度</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">颜色校准</string>
   <string name="color_calibration_summary">校准屏幕颜色</string>
@@ -1072,4 +1073,5 @@
   <string name="security_settings_fingerprint_sensor_location_front">前置</string>
   <string name="security_settings_fingerprint_sensor_location_left">左侧</string>
   <string name="security_settings_fingerprint_sensor_location_right">右侧</string>
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index b3e32fe..05aafab 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -845,4 +845,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index b233241..80b5fe9 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -979,4 +979,5 @@
   <string name="lockscreen_wallpaper_title">桌布</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index f6b2203..56d934d 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -188,4 +188,5 @@
   <!-- Lock screen wallpaper -->
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
 </resources>
-- 
cgit v1.1


From d3f3d0dfdd50f4abb2f7c3432d4ca02a9079f2f6 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Fri, 29 Jul 2016 13:04:45 -0700
Subject: Automatic translation import

Change-Id: If6551faaef84e6b870131465c757fc46b5456725
Ticket: -
---
 res/values-bg/cm_strings.xml     | 3 ++-
 res/values-ca/cm_strings.xml     | 2 ++
 res/values-pt-rBR/cm_strings.xml | 2 ++
 res/values-sl/cm_strings.xml     | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index b440a91..6e7e463 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -272,7 +272,7 @@
   <string name="notification_light_automagic">Автоматичен избор на цветове</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Настройки на светлината</string>
-  <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
+  <string name="led_notification_text">LED светлини, разрешени в настройките</string>
   <string name="notification_light_no_apps_summary">За да добавите отделен контрол за приложение, активирайте \'%1$s\' и натиснете \'\u002b\' в лентата на менюто</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Режим за отстраняване на грешки</string>
@@ -1077,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">Лява страна</string>
   <string name="security_settings_fingerprint_sensor_location_right">Дясна страна</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Глас: <xliff:g id="voice_status">%1$s</xliff:g> / Данни: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ee9abab..7b5a7b0 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Sons d\'ajust del volum</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitat del vibrador</string>
+  <string name="vibrator_warning">No es recomanen valors superiors a %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibració de color</string>
   <string name="color_calibration_summary">Calibra els colors de la pantalla</string>
@@ -1076,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">costat esquerre</string>
   <string name="security_settings_fingerprint_sensor_location_right">costat dret</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Veu: <xliff:g id="voice_status">%1$s</xliff:g> / Dades: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 4d6b68e..b60702a 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Som de ajuste do volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidade de vibração</string>
+  <string name="vibrator_warning">Valores superiores a %1$d%% não são recomendados</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibragem de cor</string>
   <string name="color_calibration_summary">Calibra as cores da tela</string>
@@ -1076,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">lado esquerdo</string>
   <string name="security_settings_fingerprint_sensor_location_right">lado direito</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voz: <xliff:g id="voice_status">%1$s</xliff:g> / Dados: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 914117d..585ffdd 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -1081,4 +1081,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">levi strani</string>
   <string name="security_settings_fingerprint_sensor_location_right">desni strani</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Glas: <xliff:g id="voice_status">%1$s</xliff:g> / Podatki: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
-- 
cgit v1.1


From 1d2150098a56b29cba96c0bac6da0974a474c8d3 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 31 Jul 2016 19:00:43 -0700
Subject: Automatic translation import

Change-Id: I181b7c06e3af2101e5506bd2490d8ae35c45a0b9
Ticket: -
---
 res/values-eu-rES/cm_strings.xml | 2 ++
 res/values-iw/cm_strings.xml     | 8 ++++++++
 res/values-nl/cm_strings.xml     | 2 ++
 res/values-pt-rPT/cm_strings.xml | 2 ++
 res/values-zh-rCN/cm_strings.xml | 1 +
 5 files changed, 15 insertions(+)

diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 6ca9628..802e0e1 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Bolumen doitze soinuak</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Bibrazioaren intentsitatea</string>
+  <string name="vibrator_warning">%1$d%% baino gorago dauden balioak ez dira gomendatzen</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kolore kalibrazioa</string>
   <string name="color_calibration_summary">Pantailaren koloreak kalibratu</string>
@@ -1076,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">ezkerraldean</string>
   <string name="security_settings_fingerprint_sensor_location_right">eskuinaldean</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Ahotsa: <xliff:g id="voice_status">%1$s</xliff:g> / Datuak: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index d6e20ed..c3a3dd1 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -551,6 +551,7 @@
   <string name="volume_adjust_sounds_title">צליל שינוי עוצמת קול</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">עוצמת רטט</string>
+  <string name="vibrator_warning">ערכים גבוהים מ-%1$d%% אינם מומלצים</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">כיול צבע</string>
   <string name="color_calibration_summary">כיול צבעי מסך</string>
@@ -619,6 +620,7 @@
   <string name="live_display_color_profile_photography_summary">שפר הפקת צבעים עבור תמונות</string>
   <string name="live_display_color_profile_basic_title">בסיסי</string>
   <string name="live_display_color_profile_basic_summary">השתמש בתצוגה ללא כיול</string>
+  <string name="live_display_color_profile_adaptive_title">מסתגל</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">סמל בורר</string>
   <string name="ime_switcher_notify_summary">הצג סמל בחירת קלט כתיבה</string>
@@ -1058,6 +1060,12 @@
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">טפט</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">אתר את חיישן טביעות האצבע הנמצא ב<xliff:g id="sensor_location">%1$s</xliff:g> המכשיר שלך.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">חלק האחורי</string>
+  <string name="security_settings_fingerprint_sensor_location_front">חלק הקדמי</string>
+  <string name="security_settings_fingerprint_sensor_location_left">צד שמאל</string>
+  <string name="security_settings_fingerprint_sensor_location_right">צד ימין</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">קול: <xliff:g id="voice_status">%1$s</xliff:g> / נתונים: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index a4c98d2..611c8c8 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -1007,6 +1007,7 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Weer</string>
+  <string name="weather_settings_activity_not_found">Kan instellingenmenu van deze aanbieder niet openen</string>
   <string name="weather_settings_general_settings_title">Algemeen</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
@@ -1028,4 +1029,5 @@
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Spraak: <xliff:g id="voice_status">%1$s</xliff:g> / Gegevens: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index d3ca0d3..dfceabf 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Sons de ajuste do volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensidade de vibração</string>
+  <string name="vibrator_warning">Valores superiores a %1$d%% não são recomendados</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibração de cores</string>
   <string name="color_calibration_summary">Calibrar as cores do ecrã</string>
@@ -1076,4 +1077,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">lateral esquerda</string>
   <string name="security_settings_fingerprint_sensor_location_right">lateral direita</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voz: <xliff:g id="voice_status">%1$s</xliff:g> / Dados: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 205e502..f0fec8b 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -1074,4 +1074,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">左侧</string>
   <string name="security_settings_fingerprint_sensor_location_right">右侧</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">语音：<xliff:g id="voice_status">%1$s</xliff:g> / 数据：<xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
-- 
cgit v1.1


From 3827d9784da7d74139971100c23dc6156b18b89f Mon Sep 17 00:00:00 2001
From: Sam Mortimer <sam@mortimer.me.uk>
Date: Mon, 18 Jul 2016 20:48:39 -0700
Subject: Allow restricted users to change status bar settings

Change-Id: I121653cfd8e74333db32d7db18fc2dde05f00e2d
---
 src/com/android/settings/SettingsActivity.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index a68005a..9a8076e 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -281,6 +281,7 @@ public class SettingsActivity extends Activity
             R.id.display_and_lights_settings,
             R.id.lockscreen_settings,
             R.id.notification_manager,
+            R.id.status_bar_settings,
             R.id.storage_settings,
             R.id.application_settings,
             R.id.battery_settings,
-- 
cgit v1.1


From c094d113153bfba705df2eb58013a2c3314890fe Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 21 Jul 2016 23:43:51 -0700
Subject: livedisplay: Add picture adjustment settings

 * Allow user setting of hue, saturation, intensity, and contrast
 * These controls are associated by the current display mode

Change-Id: I5de24a0b5c2972f115920167fa97afa3a136b80d
---
 res/layout/display_picture_adjustment.xml          | 125 ++++++++++
 res/values/cm_strings.xml                          |   8 +
 res/xml/livedisplay.xml                            |  21 +-
 .../android/settings/livedisplay/LiveDisplay.java  |  32 ++-
 .../settings/livedisplay/PictureAdjustment.java    | 262 +++++++++++++++++++++
 5 files changed, 425 insertions(+), 23 deletions(-)
 create mode 100644 res/layout/display_picture_adjustment.xml
 create mode 100644 src/com/android/settings/livedisplay/PictureAdjustment.java

diff --git a/res/layout/display_picture_adjustment.xml b/res/layout/display_picture_adjustment.xml
new file mode 100644
index 0000000..e1d9da9
--- /dev/null
+++ b/res/layout/display_picture_adjustment.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2013-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.
+-->
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+    <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center_horizontal"
+            android:paddingStart="20dip"
+            android:paddingEnd="20dip"
+            android:paddingBottom="20dip">
+
+        <TextView android:id="@+id/adj_hue_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/adj_hue_title"
+                android:paddingTop="10dip" />
+        <TextView android:id="@+id/adj_hue_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:paddingTop="10dip" />
+        <com.android.settings.IntervalSeekBar android:id="@+id/adj_hue_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_hue_text"
+                android:paddingTop="2dip"
+                settings:min="0.20"
+                settings:max="1.00"
+                settings:defaultValue="1.00"
+                settings:digits="4" />
+
+        <TextView android:id="@+id/adj_saturation_text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_hue_seekbar"
+                android:text="@string/adj_saturation_title"
+                android:paddingTop="10dip" />
+        <TextView android:id="@+id/adj_saturation_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_hue_seekbar"
+                android:layout_alignParentRight="true"
+                android:paddingTop="10dip" />
+        <com.android.settings.IntervalSeekBar android:id="@+id/adj_saturation_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_saturation_text"
+                android:paddingTop="2dip"
+                settings:min="0.20"
+                settings:max="1.00"
+                settings:defaultValue="1.00"
+                settings:digits="4" />
+
+        <TextView android:id="@+id/adj_intensity_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_saturation_seekbar"
+                android:text="@string/adj_intensity_title"
+                android:paddingTop="10dip" />
+        <TextView android:id="@+id/adj_intensity_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_saturation_seekbar"
+                android:layout_alignParentRight="true"
+                android:paddingTop="10dip" />
+        <com.android.settings.IntervalSeekBar android:id="@+id/adj_intensity_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_intensity_text"
+                android:paddingTop="2dip"
+                settings:min="0.20"
+                settings:max="1.00"
+                settings:defaultValue="1.00"
+                settings:digits="4" />
+
+        <TextView android:id="@+id/adj_contrast_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_intensity_seekbar"
+                android:text="@string/adj_contrast_title"
+                android:paddingTop="10dip" />
+        <TextView android:id="@+id/adj_contrast_value"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_intensity_seekbar"
+                android:layout_alignParentRight="true"
+                android:paddingTop="10dip" />
+        <com.android.settings.IntervalSeekBar android:id="@+id/adj_contrast_seekbar"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/adj_contrast_text"
+                android:paddingTop="2dip"
+                settings:min="0.20"
+                settings:max="1.00"
+                settings:defaultValue="1.00"
+                settings:digits="4" />
+
+
+        <ImageView android:id="@+id/black_scale_picture_adjustment"
+                android:src="@drawable/color_tuning_preview"
+                android:layout_width="match_parent"
+                android:layout_height="40dip"
+                android:layout_below="@id/adj_contrast_seekbar"
+                android:paddingTop="20dip" />
+
+    </RelativeLayout>
+</ScrollView>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 3f5113d..3e8c02a 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -708,6 +708,14 @@
     <string name="live_display_color_profile_adaptive_title">Adaptive</string>
     <string name="live_display_color_profile_adaptive_summary">Colors adapt to ambient conditions</string>
 
+    <!-- LiveDisplay : Picture Adjustment -->
+    <string name="picture_adjustment_title">Picture adjustment</string>
+    <string name="picture_adjustment_summary">Adjust hue, saturation, intensity, and contrast</string>
+    <string name="adj_hue_title">Hue</string>
+    <string name="adj_saturation_title">Saturation</string>
+    <string name="adj_intensity_title">Intensity</string>
+	<string name="adj_contrast_title">Contrast</string>
+
     <!-- Whether to display IME switcher notifcation -->
     <string name="ime_switcher_notify">Selector icon</string>
     <string name="ime_switcher_notify_summary">Display input method selector icon</string>
diff --git a/res/xml/livedisplay.xml b/res/xml/livedisplay.xml
index fa93a19..3f0af3a 100644
--- a/res/xml/livedisplay.xml
+++ b/res/xml/livedisplay.xml
@@ -52,18 +52,7 @@
             android:key="advanced"
             android:title="@string/advanced">
 
-        <!-- screen color -->
-        <PreferenceScreen
-                android:persistent="false"
-                android:key="screencolor_settings"
-                android:title="@string/screencolor"
-                android:summary="@string/screencolor_summary">
-            <intent
-                    android:action="com.qualcomm.display.PPService"
-                    android:targetPackage="com.android.settings"
-                    android:targetClass="com.android.settings.ScreenColorSettings" />
-        </PreferenceScreen>
-
+        <!-- RGB display color adjustments -->
         <com.android.settings.livedisplay.DisplayColor
                 android:key="color_calibration"
                 android:title="@string/color_calibration_title"
@@ -71,6 +60,14 @@
                 android:summary="@string/color_calibration_summary"
                 android:persistent="false"/>
 
+        <!-- HSIC display color adjustments -->
+        <com.android.settings.livedisplay.PictureAdjustment
+                android:key="picture_adjustment"
+                android:title="@string/picture_adjustment_title"
+                android:dialogTitle="@string/picture_adjustment_title"
+                android:summary="@string/picture_adjustment_summary"
+                android:persistent="false"/>
+
         <!-- Adaptive backlight -->
         <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
                 android:key="display_low_power"
diff --git a/src/com/android/settings/livedisplay/LiveDisplay.java b/src/com/android/settings/livedisplay/LiveDisplay.java
index 51a295d..a3f4636 100644
--- a/src/com/android/settings/livedisplay/LiveDisplay.java
+++ b/src/com/android/settings/livedisplay/LiveDisplay.java
@@ -16,8 +16,10 @@
 package com.android.settings.livedisplay;
 
 import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_CABC;
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_COLOR_ADJUSTMENT;
 import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_COLOR_ENHANCEMENT;
 import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_DISPLAY_MODES;
+import static cyanogenmod.hardware.LiveDisplayManager.FEATURE_PICTURE_ADJUSTMENT;
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_OFF;
 import static cyanogenmod.hardware.LiveDisplayManager.MODE_OUTDOOR;
 
@@ -71,7 +73,7 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     private static final String KEY_LIVE_DISPLAY_TEMPERATURE = "live_display_color_temperature";
 
     private static final String KEY_DISPLAY_COLOR = "color_calibration";
-    private static final String KEY_SCREEN_COLOR_SETTINGS = "screencolor_settings";
+    private static final String KEY_PICTURE_ADJUSTMENT = "picture_adjustment";
 
     private static final String KEY_LIVE_DISPLAY_COLOR_PROFILE = "live_display_color_profile";
 
@@ -84,8 +86,9 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
     private SwitchPreference mLowPower;
     private SwitchPreference mOutdoorMode;
 
-    private PreferenceScreen mScreenColorSettings;
+    private PictureAdjustment mPictureAdjustment;
     private DisplayTemperature mDisplayTemperature;
+    private DisplayColor mDisplayColor;
 
     private ListPreference mColorProfile;
     private String[] mColorProfileSummaries;
@@ -186,12 +189,18 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             mColorEnhancement = null;
         }
 
-        mScreenColorSettings = (PreferenceScreen) findPreference(KEY_SCREEN_COLOR_SETTINGS);
-        if (advancedPrefs != null) {
-            if (mScreenColorSettings != null &&
-                    (mHasDisplayModes ||!isPostProcessingSupported(getActivity()))) {
-                advancedPrefs.removePreference(mScreenColorSettings);
-            }
+        mPictureAdjustment = (PictureAdjustment) findPreference(KEY_PICTURE_ADJUSTMENT);
+        if (advancedPrefs != null && mPictureAdjustment != null &&
+                    !mConfig.hasFeature(LiveDisplayManager.FEATURE_PICTURE_ADJUSTMENT)) {
+            advancedPrefs.removePreference(mPictureAdjustment);
+            mPictureAdjustment = null;
+        }
+
+        mDisplayColor = (DisplayColor) findPreference(KEY_DISPLAY_COLOR);
+        if (advancedPrefs != null && mDisplayColor != null &&
+                !mConfig.hasFeature(LiveDisplayManager.FEATURE_COLOR_ADJUSTMENT)) {
+            advancedPrefs.removePreference(mDisplayColor);
+            mDisplayColor = null;
         }
     }
 
@@ -405,11 +414,12 @@ public class LiveDisplay extends SettingsPreferenceFragment implements
             if (!config.hasFeature(FEATURE_CABC)) {
                 result.add(KEY_LIVE_DISPLAY_LOW_POWER);
             }
-            if (!isPostProcessingSupported(context)) {
-                result.add(KEY_SCREEN_COLOR_SETTINGS);
-            } else {
+            if (!config.hasFeature(FEATURE_COLOR_ADJUSTMENT)) {
                 result.add(KEY_DISPLAY_COLOR);
             }
+            if (!config.hasFeature(FEATURE_PICTURE_ADJUSTMENT)) {
+                result.add(KEY_PICTURE_ADJUSTMENT);
+            }
             return result;
         }
     };
diff --git a/src/com/android/settings/livedisplay/PictureAdjustment.java b/src/com/android/settings/livedisplay/PictureAdjustment.java
new file mode 100644
index 0000000..657d7d4
--- /dev/null
+++ b/src/com/android/settings/livedisplay/PictureAdjustment.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2016 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.
+ */
+
+package com.android.settings.livedisplay;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.DialogPreference;
+import android.util.AttributeSet;
+import android.util.Range;
+import android.view.View;
+import android.widget.Button;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import com.android.settings.IntervalSeekBar;
+import com.android.settings.R;
+
+import cyanogenmod.hardware.HSIC;
+import cyanogenmod.hardware.LiveDisplayManager;
+
+import java.util.List;
+
+/**
+ * Special preference type that allows configuration of Color settings
+ */
+public class PictureAdjustment extends DialogPreference {
+    private static final String TAG = "PictureAdjustment";
+
+    private final Context mContext;
+    private final LiveDisplayManager mLiveDisplay;
+    private final List<Range<Float>> mRanges;
+
+    // These arrays must all match in length and order
+    private static final int[] SEEKBAR_ID = new int[] {
+        R.id.adj_hue_seekbar,
+        R.id.adj_saturation_seekbar,
+        R.id.adj_intensity_seekbar,
+        R.id.adj_contrast_seekbar
+    };
+
+    private static final int[] SEEKBAR_VALUE_ID = new int[] {
+        R.id.adj_hue_value,
+        R.id.adj_saturation_value,
+        R.id.adj_intensity_value,
+        R.id.adj_contrast_value
+    };
+
+    private ColorSeekBar[] mSeekBars = new ColorSeekBar[SEEKBAR_ID.length];
+
+    private final float[] mCurrentAdj = new float[5];
+    private final float[] mOriginalAdj = new float[5];
+
+    public PictureAdjustment(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        mContext = context;
+        mLiveDisplay = LiveDisplayManager.getInstance(mContext);
+        mRanges = mLiveDisplay.getConfig().getPictureAdjustmentRanges();
+
+        setDialogLayoutResource(R.layout.display_picture_adjustment);
+    }
+
+    @Override
+    protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
+        builder.setNeutralButton(R.string.settings_reset_button,
+                new DialogInterface.OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+            }
+        });
+    }
+
+    private void updateBars() {
+        for (int i = 0; i < SEEKBAR_ID.length; i++) {
+            mSeekBars[i].setValue(mCurrentAdj[i]);
+        }
+    }
+
+    @Override
+    protected void onBindDialogView(View view) {
+        super.onBindDialogView(view);
+
+        System.arraycopy(mLiveDisplay.getPictureAdjustment().toFloatArray(), 0, mOriginalAdj, 0, 5);
+        System.arraycopy(mOriginalAdj, 0, mCurrentAdj, 0, 5);
+
+        for (int i = 0; i < SEEKBAR_ID.length; i++) {
+            IntervalSeekBar seekBar = (IntervalSeekBar) view.findViewById(SEEKBAR_ID[i]);
+            TextView value = (TextView) view.findViewById(SEEKBAR_VALUE_ID[i]);
+            final Range<Float> range = mRanges.get(i);
+            mSeekBars[i] = new ColorSeekBar(seekBar, range, value, i);
+        }
+        updateBars();
+    }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        super.showDialog(state);
+
+        // Can't use onPrepareDialogBuilder for this as we want the dialog
+        // to be kept open on click
+        AlertDialog d = (AlertDialog) getDialog();
+        Button defaultsButton = d.getButton(DialogInterface.BUTTON_NEUTRAL);
+        defaultsButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                System.arraycopy(mLiveDisplay.getDefaultPictureAdjustment().toFloatArray(),
+                        0, mCurrentAdj, 0, 5);
+                updateBars();
+                updateAdjustment(mCurrentAdj);
+            }
+        });
+    }
+
+    @Override
+    protected void onDialogClosed(boolean positiveResult) {
+        super.onDialogClosed(positiveResult);
+        updateAdjustment(positiveResult ? mCurrentAdj : mOriginalAdj);
+    }
+
+    @Override
+    protected Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        if (getDialog() == null || !getDialog().isShowing()) {
+            return superState;
+        }
+
+        // Save the dialog state
+        final SavedState myState = new SavedState(superState);
+        myState.currentAdj = mCurrentAdj;
+        myState.originalAdj = mOriginalAdj;
+
+        // Restore the old state when the activity or dialog is being paused
+        updateAdjustment(mOriginalAdj);
+
+        return myState;
+    }
+
+    @Override
+    protected void onRestoreInstanceState(Parcelable state) {
+        if (state == null || !state.getClass().equals(SavedState.class)) {
+            // Didn't save state for us in onSaveInstanceState
+            super.onRestoreInstanceState(state);
+            return;
+        }
+
+        SavedState myState = (SavedState) state;
+        super.onRestoreInstanceState(myState.getSuperState());
+
+        System.arraycopy(myState.originalAdj, 0, mOriginalAdj, 0, 5);
+        System.arraycopy(myState.currentAdj, 0, mCurrentAdj, 0, 5);
+
+        updateBars();
+        updateAdjustment(mCurrentAdj);
+    }
+
+    private static class SavedState extends BaseSavedState {
+        float[] originalAdj;
+        float[] currentAdj;
+
+        public SavedState(Parcelable superState) {
+            super(superState);
+        }
+
+        public SavedState(Parcel source) {
+            super(source);
+            originalAdj = source.createFloatArray();
+            currentAdj = source.createFloatArray();
+        }
+
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            super.writeToParcel(dest, flags);
+            dest.writeFloatArray(originalAdj);
+            dest.writeFloatArray(currentAdj);
+        }
+
+        public static final Creator<SavedState> CREATOR =
+                new Creator<PictureAdjustment.SavedState>() {
+
+            public PictureAdjustment.SavedState createFromParcel(Parcel in) {
+                return new PictureAdjustment.SavedState(in);
+            }
+
+            public PictureAdjustment.SavedState[] newArray(int size) {
+                return new PictureAdjustment.SavedState[size];
+            }
+        };
+    }
+
+    private void updateAdjustment(final float[] adjustment) {
+        mLiveDisplay.setPictureAdjustment(HSIC.fromFloatArray(adjustment));
+    }
+
+    private class ColorSeekBar implements SeekBar.OnSeekBarChangeListener {
+        private int mIndex;
+        private final IntervalSeekBar mSeekBar;
+        private TextView mValue;
+        private Range<Float> mRange;
+
+        public ColorSeekBar(IntervalSeekBar seekBar, Range<Float> range, TextView value, int index) {
+            mSeekBar = seekBar;
+            mValue = value;
+            mIndex = index;
+            mRange = range;
+            mSeekBar.setMinimum(range.getLower());
+            mSeekBar.setMaximum(range.getUpper());
+
+            mSeekBar.setOnSeekBarChangeListener(this);
+        }
+
+        @Override
+        public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+            IntervalSeekBar isb = (IntervalSeekBar)seekBar;
+            float fp = isb.getProgressFloat();
+            if (fromUser) {
+                mCurrentAdj[mIndex] = mRanges.get(mIndex).clamp(fp);
+                updateAdjustment(mCurrentAdj);
+            }
+            mValue.setText(getLabel(mCurrentAdj[mIndex]));
+        }
+
+        @Override
+        public void onStartTrackingTouch(SeekBar seekBar) {
+            // Do nothing here
+        }
+
+        @Override
+        public void onStopTrackingTouch(SeekBar seekBar) {
+            // Do nothing here
+        }
+
+        private String getLabel(float value) {
+            if (mRange.getUpper() == 1.0f) {
+                return String.format("%d%%", Math.round(100F * value));
+            }
+            return String.format("%d", Math.round(value));
+        }
+
+        public void setValue(float value) {
+            mSeekBar.setProgressFloat(value);
+            mValue.setText(getLabel(value));
+        }
+    }
+}
-- 
cgit v1.1


From 228f65e1c460f0e632ad38351820a49821e81589 Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Thu, 21 Jul 2016 23:55:13 -0700
Subject: Revert "Settings: Add screen color settings"

 * We now have support for HSIC controls in LiveDisplay and this
   can be deprecated. A new UI to bring the same kind of functionality
   is underway as well.

This reverts commit 853513841512a0fbf15dc22c7164a98d0a2de80b.

Change-Id: I4fa3af25f64b05338a78ba7832e75333cf15e448
---
 Android.mk                                         |   3 -
 AndroidManifest.xml                                |  10 -
 res/drawable-hdpi/btn_default.9.png                | Bin 1214 -> 0 bytes
 res/drawable-hdpi/btn_default_disabled.9.png       | Bin 1210 -> 0 bytes
 .../btn_default_disabled_focused_holo_dark.9.png   | Bin 421 -> 0 bytes
 .../btn_default_focused_holo_dark.9.png            | Bin 457 -> 0 bytes
 .../btn_default_pressed_holo_dark.9.png            | Bin 645 -> 0 bytes
 res/drawable-hdpi/default_screencolor_setting.png  | Bin 428934 -> 0 bytes
 res/drawable-hdpi/ic_down.png                      | Bin 3163 -> 0 bytes
 res/drawable-hdpi/ic_down_pressed.png              | Bin 3466 -> 0 bytes
 res/drawable-hdpi/ic_more_default.png              | Bin 2835 -> 0 bytes
 res/drawable-hdpi/ic_more_pressed.png              | Bin 3119 -> 0 bytes
 res/drawable-hdpi/ic_new_default.png               | Bin 3109 -> 0 bytes
 res/drawable-hdpi/ic_new_dis.png                   | Bin 2843 -> 0 bytes
 res/drawable-hdpi/ic_new_glow.png                  | Bin 3831 -> 0 bytes
 res/drawable-hdpi/ic_new_pressed.png               | Bin 3075 -> 0 bytes
 res/drawable-hdpi/ic_previous_default.png          | Bin 3415 -> 0 bytes
 res/drawable-hdpi/ic_previous_dis.png              | Bin 3087 -> 0 bytes
 res/drawable-hdpi/ic_previous_glow.png             | Bin 4804 -> 0 bytes
 res/drawable-hdpi/ic_previous_pressed.png          | Bin 3268 -> 0 bytes
 res/drawable-hdpi/ic_up.png                        | Bin 3168 -> 0 bytes
 res/drawable-hdpi/ic_up_pressed.png                | Bin 3473 -> 0 bytes
 res/drawable-hdpi/ic_zoom_in_holo_dark.png         | Bin 515 -> 0 bytes
 res/drawable-hdpi/ic_zoom_in_holo_light.png        | Bin 506 -> 0 bytes
 res/drawable-hdpi/ic_zoom_out_holo_dark.png        | Bin 379 -> 0 bytes
 res/drawable-hdpi/ic_zoom_out_holo_light.png       | Bin 406 -> 0 bytes
 res/drawable-hdpi/ic_zoom_slider.png               | Bin 2110 -> 0 bytes
 res/drawable-hdpi/scrubber_track_holo_dark.9.png   | Bin 167 -> 0 bytes
 res/drawable/down_button.xml                       |  33 -
 res/drawable/ic_zoom_in.xml                        |  34 -
 res/drawable/ic_zoom_out.xml                       |  34 -
 res/drawable/more_button.xml                       |  33 -
 res/drawable/new_button.xml                        |  33 -
 res/drawable/new_glow_button.xml                   |  33 -
 res/drawable/previous_button.xml                   |  33 -
 res/drawable/previous_glow_button.xml              |  33 -
 res/drawable/screencolor_btn.xml                   |  44 --
 res/drawable/seekbar_define_style.xml              |  33 -
 res/drawable/up_button.xml                         |  33 -
 res/layout/custom_screencolor.xml                  | 287 --------
 res/layout/screen_color_item.xml                   |  93 ---
 res/layout/screencolor_settings.xml                |  49 --
 res/menu/screencolor_more.xml                      |  46 --
 res/values-af/cm_strings.xml                       |   8 -
 res/values-ar/cm_strings.xml                       |   8 -
 res/values-as-rIN/cm_strings.xml                   |   8 -
 res/values-ast-rES/cm_strings.xml                  |   8 -
 res/values-az-rAZ/cm_strings.xml                   |   8 -
 res/values-be/cm_strings.xml                       |   8 -
 res/values-bg/cm_strings.xml                       |   8 -
 res/values-bn-rBD/cm_strings.xml                   |   5 -
 res/values-ca/cm_strings.xml                       |   8 -
 res/values-cs/cm_strings.xml                       |   8 -
 res/values-da/cm_strings.xml                       |   8 -
 res/values-de/cm_strings.xml                       |   8 -
 res/values-el/cm_strings.xml                       |   8 -
 res/values-en-rAU/cm_strings.xml                   |   8 -
 res/values-en-rIN/cm_strings.xml                   |   8 -
 res/values-eo/cm_strings.xml                       |   8 -
 res/values-es-rUS/cm_strings.xml                   |   8 -
 res/values-es/cm_strings.xml                       |   8 -
 res/values-et-rEE/cm_strings.xml                   |   8 -
 res/values-eu-rES/cm_strings.xml                   |   8 -
 res/values-fa/cm_strings.xml                       |   8 -
 res/values-fi/cm_strings.xml                       |   8 -
 res/values-fr/cm_strings.xml                       |   8 -
 res/values-fy-rNL/cm_strings.xml                   |   2 -
 res/values-gu-rIN/cm_strings.xml                   |   8 -
 res/values-hi/cm_strings.xml                       |   8 -
 res/values-hr/cm_strings.xml                       |   8 -
 res/values-hu/cm_strings.xml                       |   8 -
 res/values-in/cm_strings.xml                       |   8 -
 res/values-it/cm_strings.xml                       |   8 -
 res/values-iw/cm_strings.xml                       |   8 -
 res/values-ja/cm_strings.xml                       |   8 -
 res/values-kn-rIN/cm_strings.xml                   |   8 -
 res/values-ko/cm_strings.xml                       |   8 -
 res/values-ku/cm_strings.xml                       |   7 -
 res/values-lb/cm_strings.xml                       |   8 -
 res/values-lt/cm_strings.xml                       |   8 -
 res/values-lv/cm_strings.xml                       |   5 -
 res/values-ml-rIN/cm_strings.xml                   |   8 -
 res/values-mr-rIN/cm_strings.xml                   |   8 -
 res/values-nb/cm_strings.xml                       |   8 -
 res/values-nl/cm_strings.xml                       |   8 -
 res/values-or-rIN/cm_strings.xml                   |   8 -
 res/values-pl/cm_strings.xml                       |   8 -
 res/values-pt-rBR/cm_strings.xml                   |   8 -
 res/values-pt-rPT/cm_strings.xml                   |   8 -
 res/values-ro/cm_strings.xml                       |   8 -
 res/values-ru/cm_strings.xml                       |   8 -
 res/values-si-rLK/cm_strings.xml                   |   5 -
 res/values-sk/cm_strings.xml                       |   8 -
 res/values-sl/cm_strings.xml                       |   8 -
 res/values-sr/cm_strings.xml                       |   8 -
 res/values-sv/cm_strings.xml                       |   8 -
 res/values-ta-rIN/cm_strings.xml                   |   8 -
 res/values-te-rIN/cm_strings.xml                   |   8 -
 res/values-th/cm_strings.xml                       |   8 -
 res/values-tr/cm_strings.xml                       |   8 -
 res/values-ug/cm_strings.xml                       |   8 -
 res/values-uk/cm_strings.xml                       |   8 -
 res/values-vi/cm_strings.xml                       |   8 -
 res/values-zh-rCN/cm_strings.xml                   |   8 -
 res/values-zh-rHK/cm_strings.xml                   |   8 -
 res/values-zh-rTW/cm_strings.xml                   |   8 -
 res/values/cm_arrays.xml                           |   7 -
 res/values/cm_colors.xml                           |   4 -
 res/values/cm_strings.xml                          |  19 -
 res/values/config.xml                              |  36 -
 src/com/android/display/IPPService.aidl            |   7 -
 src/com/android/settings/CustomScreenColor.java    | 721 ---------------------
 src/com/android/settings/DisplaySettings.java      |   2 -
 src/com/android/settings/ScreenColorSettings.java  | 269 --------
 114 files changed, 2417 deletions(-)
 delete mode 100644 res/drawable-hdpi/btn_default.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_disabled.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_focused_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/btn_default_pressed_holo_dark.9.png
 delete mode 100644 res/drawable-hdpi/default_screencolor_setting.png
 delete mode 100644 res/drawable-hdpi/ic_down.png
 delete mode 100644 res/drawable-hdpi/ic_down_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_more_default.png
 delete mode 100644 res/drawable-hdpi/ic_more_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_new_default.png
 delete mode 100644 res/drawable-hdpi/ic_new_dis.png
 delete mode 100644 res/drawable-hdpi/ic_new_glow.png
 delete mode 100644 res/drawable-hdpi/ic_new_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_previous_default.png
 delete mode 100644 res/drawable-hdpi/ic_previous_dis.png
 delete mode 100644 res/drawable-hdpi/ic_previous_glow.png
 delete mode 100644 res/drawable-hdpi/ic_previous_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_up.png
 delete mode 100644 res/drawable-hdpi/ic_up_pressed.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_in_holo_dark.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_in_holo_light.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_out_holo_dark.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_out_holo_light.png
 delete mode 100644 res/drawable-hdpi/ic_zoom_slider.png
 delete mode 100644 res/drawable-hdpi/scrubber_track_holo_dark.9.png
 delete mode 100644 res/drawable/down_button.xml
 delete mode 100644 res/drawable/ic_zoom_in.xml
 delete mode 100644 res/drawable/ic_zoom_out.xml
 delete mode 100644 res/drawable/more_button.xml
 delete mode 100644 res/drawable/new_button.xml
 delete mode 100644 res/drawable/new_glow_button.xml
 delete mode 100644 res/drawable/previous_button.xml
 delete mode 100644 res/drawable/previous_glow_button.xml
 delete mode 100644 res/drawable/screencolor_btn.xml
 delete mode 100644 res/drawable/seekbar_define_style.xml
 delete mode 100644 res/drawable/up_button.xml
 delete mode 100644 res/layout/custom_screencolor.xml
 delete mode 100644 res/layout/screen_color_item.xml
 delete mode 100644 res/layout/screencolor_settings.xml
 delete mode 100644 res/menu/screencolor_more.xml
 delete mode 100644 src/com/android/display/IPPService.aidl
 delete mode 100644 src/com/android/settings/CustomScreenColor.java
 delete mode 100644 src/com/android/settings/ScreenColorSettings.java

diff --git a/Android.mk b/Android.mk
index db32ed1..78c561c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,9 +17,6 @@ LOCAL_SRC_FILES := \
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_SRC_FILES += \
-        src/com/android/display/IPPService.aidl
-
 LOCAL_PACKAGE_NAME := Settings
 LOCAL_CERTIFICATE := platform
 LOCAL_PRIVILEGED_MODULE := true
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ed8d6ed..700c93c 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -98,16 +98,6 @@
             android:allowBackup="false"
             android:usesCleartextTraffic="true">
 
-        <!-- Screen color Settings Controls -->
-        <activity android:name=".ScreenColorSettings" android:label="@string/screencolor"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="nosensor">
-        </activity>
-        <activity android:name=".CustomScreenColor" android:label="@string/custom_screencolor"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:screenOrientation="nosensor">
-        </activity>
-
         <activity android:name="Settings"
                 android:taskAffinity="com.android.settings"
                 android:label="@string/settings_label_launcher"
diff --git a/res/drawable-hdpi/btn_default.9.png b/res/drawable-hdpi/btn_default.9.png
deleted file mode 100644
index a82048e..0000000
Binary files a/res/drawable-hdpi/btn_default.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_disabled.9.png b/res/drawable-hdpi/btn_default_disabled.9.png
deleted file mode 100644
index 45fa090..0000000
Binary files a/res/drawable-hdpi/btn_default_disabled.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png
deleted file mode 100644
index 13ab8f7..0000000
Binary files a/res/drawable-hdpi/btn_default_disabled_focused_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_focused_holo_dark.9.png b/res/drawable-hdpi/btn_default_focused_holo_dark.9.png
deleted file mode 100644
index fee599a..0000000
Binary files a/res/drawable-hdpi/btn_default_focused_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png b/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png
deleted file mode 100644
index baf7018..0000000
Binary files a/res/drawable-hdpi/btn_default_pressed_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable-hdpi/default_screencolor_setting.png b/res/drawable-hdpi/default_screencolor_setting.png
deleted file mode 100644
index 90de65d..0000000
Binary files a/res/drawable-hdpi/default_screencolor_setting.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_down.png b/res/drawable-hdpi/ic_down.png
deleted file mode 100644
index f2ae375..0000000
Binary files a/res/drawable-hdpi/ic_down.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_down_pressed.png b/res/drawable-hdpi/ic_down_pressed.png
deleted file mode 100644
index 4646056..0000000
Binary files a/res/drawable-hdpi/ic_down_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_more_default.png b/res/drawable-hdpi/ic_more_default.png
deleted file mode 100644
index b05d204..0000000
Binary files a/res/drawable-hdpi/ic_more_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_more_pressed.png b/res/drawable-hdpi/ic_more_pressed.png
deleted file mode 100644
index 30ef4f3..0000000
Binary files a/res/drawable-hdpi/ic_more_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_default.png b/res/drawable-hdpi/ic_new_default.png
deleted file mode 100644
index 24f96f3..0000000
Binary files a/res/drawable-hdpi/ic_new_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_dis.png b/res/drawable-hdpi/ic_new_dis.png
deleted file mode 100644
index 2454ced..0000000
Binary files a/res/drawable-hdpi/ic_new_dis.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_glow.png b/res/drawable-hdpi/ic_new_glow.png
deleted file mode 100644
index 201ec86..0000000
Binary files a/res/drawable-hdpi/ic_new_glow.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_new_pressed.png b/res/drawable-hdpi/ic_new_pressed.png
deleted file mode 100644
index 4f0c46a..0000000
Binary files a/res/drawable-hdpi/ic_new_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_default.png b/res/drawable-hdpi/ic_previous_default.png
deleted file mode 100644
index a84990e..0000000
Binary files a/res/drawable-hdpi/ic_previous_default.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_dis.png b/res/drawable-hdpi/ic_previous_dis.png
deleted file mode 100644
index aea14f3..0000000
Binary files a/res/drawable-hdpi/ic_previous_dis.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_glow.png b/res/drawable-hdpi/ic_previous_glow.png
deleted file mode 100644
index ec83882..0000000
Binary files a/res/drawable-hdpi/ic_previous_glow.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_previous_pressed.png b/res/drawable-hdpi/ic_previous_pressed.png
deleted file mode 100644
index 75af0be..0000000
Binary files a/res/drawable-hdpi/ic_previous_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up.png b/res/drawable-hdpi/ic_up.png
deleted file mode 100644
index 2d51f39..0000000
Binary files a/res/drawable-hdpi/ic_up.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_up_pressed.png b/res/drawable-hdpi/ic_up_pressed.png
deleted file mode 100644
index ee03700..0000000
Binary files a/res/drawable-hdpi/ic_up_pressed.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_dark.png b/res/drawable-hdpi/ic_zoom_in_holo_dark.png
deleted file mode 100644
index 89b5f15..0000000
Binary files a/res/drawable-hdpi/ic_zoom_in_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_in_holo_light.png b/res/drawable-hdpi/ic_zoom_in_holo_light.png
deleted file mode 100644
index 9751ca3..0000000
Binary files a/res/drawable-hdpi/ic_zoom_in_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_dark.png b/res/drawable-hdpi/ic_zoom_out_holo_dark.png
deleted file mode 100644
index f4a2589..0000000
Binary files a/res/drawable-hdpi/ic_zoom_out_holo_dark.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_out_holo_light.png b/res/drawable-hdpi/ic_zoom_out_holo_light.png
deleted file mode 100644
index ba094ac..0000000
Binary files a/res/drawable-hdpi/ic_zoom_out_holo_light.png and /dev/null differ
diff --git a/res/drawable-hdpi/ic_zoom_slider.png b/res/drawable-hdpi/ic_zoom_slider.png
deleted file mode 100644
index 8427e4d..0000000
Binary files a/res/drawable-hdpi/ic_zoom_slider.png and /dev/null differ
diff --git a/res/drawable-hdpi/scrubber_track_holo_dark.9.png b/res/drawable-hdpi/scrubber_track_holo_dark.9.png
deleted file mode 100644
index 0c0ccda..0000000
Binary files a/res/drawable-hdpi/scrubber_track_holo_dark.9.png and /dev/null differ
diff --git a/res/drawable/down_button.xml b/res/drawable/down_button.xml
deleted file mode 100644
index 29dbf42..0000000
--- a/res/drawable/down_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_down_pressed" />
-    <item android:drawable="@drawable/ic_down" />
-</selector>
diff --git a/res/drawable/ic_zoom_in.xml b/res/drawable/ic_zoom_in.xml
deleted file mode 100644
index 3a10ff1..0000000
--- a/res/drawable/ic_zoom_in.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/ic_zoom_in_holo_light" />
-    <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_in_holo_light" />
-    <item android:drawable="@drawable/ic_zoom_in_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_zoom_out.xml b/res/drawable/ic_zoom_out.xml
deleted file mode 100644
index 070cffd..0000000
--- a/res/drawable/ic_zoom_out.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true" android:drawable="@drawable/ic_zoom_out_holo_light" />
-    <item android:state_pressed="true" android:drawable="@drawable/ic_zoom_out_holo_light" />
-    <item android:drawable="@drawable/ic_zoom_out_holo_dark" />
-</selector>
diff --git a/res/drawable/more_button.xml b/res/drawable/more_button.xml
deleted file mode 100644
index bbad9d4..0000000
--- a/res/drawable/more_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_more_pressed" />
-    <item android:drawable="@drawable/ic_more_default" />
-</selector>
diff --git a/res/drawable/new_button.xml b/res/drawable/new_button.xml
deleted file mode 100644
index 4ed9daf..0000000
--- a/res/drawable/new_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" />
-    <item android:drawable="@drawable/ic_new_default" />
-</selector>
diff --git a/res/drawable/new_glow_button.xml b/res/drawable/new_glow_button.xml
deleted file mode 100644
index 506d8cf..0000000
--- a/res/drawable/new_glow_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_new_pressed" />
-    <item android:drawable="@drawable/ic_new_glow" />
-</selector>
diff --git a/res/drawable/previous_button.xml b/res/drawable/previous_button.xml
deleted file mode 100644
index ab7317b..0000000
--- a/res/drawable/previous_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" />
-    <item android:drawable="@drawable/ic_previous_default" />
-</selector>
diff --git a/res/drawable/previous_glow_button.xml b/res/drawable/previous_glow_button.xml
deleted file mode 100644
index 1e896c6..0000000
--- a/res/drawable/previous_glow_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_previous_pressed" />
-    <item android:drawable="@drawable/ic_previous_glow" />
-</selector>
diff --git a/res/drawable/screencolor_btn.xml b/res/drawable/screencolor_btn.xml
deleted file mode 100644
index d89ae58..0000000
--- a/res/drawable/screencolor_btn.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_window_focused="false" android:state_enabled="true"
-        android:drawable="@drawable/btn_default" />
-    <item android:state_window_focused="false" android:state_enabled="false"
-        android:drawable="@drawable/btn_default_disabled" />
-    <item android:state_pressed="true"
-        android:drawable="@drawable/btn_default_pressed_holo_dark" />
-    <item android:state_focused="true" android:state_enabled="true"
-        android:drawable="@drawable/btn_default_focused_holo_dark" />
-    <item android:state_enabled="true"
-        android:drawable="@drawable/btn_default" />
-    <item android:state_focused="true"
-        android:drawable="@drawable/btn_default_disabled_focused_holo_dark" />
-    <item
-         android:drawable="@drawable/btn_default_disabled" />
-</selector>
diff --git a/res/drawable/seekbar_define_style.xml b/res/drawable/seekbar_define_style.xml
deleted file mode 100644
index 1d097b1..0000000
--- a/res/drawable/seekbar_define_style.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
- <layer-list  xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+android:id/background" android:drawable="@drawable/scrubber_track_holo_dark" />
-    <item android:id="@+android:id/secondaryProgress" android:drawable="@drawable/scrubber_track_holo_dark" />
-    <item android:id="@+android:id/progress" android:drawable="@drawable/scrubber_track_holo_dark" />
-</layer-list>
diff --git a/res/drawable/up_button.xml b/res/drawable/up_button.xml
deleted file mode 100644
index 6f33a56..0000000
--- a/res/drawable/up_button.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:drawable="@drawable/ic_up_pressed" />
-    <item android:drawable="@drawable/ic_up" />
-</selector>
diff --git a/res/layout/custom_screencolor.xml b/res/layout/custom_screencolor.xml
deleted file mode 100644
index b6c153b..0000000
--- a/res/layout/custom_screencolor.xml
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/background_preview"
-    android:background="@drawable/default_screencolor_setting">
-
-    <LinearLayout
-        android:id="@+id/bottons_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_gravity="center_horizontal|bottom"
-        style="?android:attr/buttonBarStyle">
-        <Button
-            android:id="@+id/cancel"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/custom_screencolor_buttons_text_color"
-            android:text="@string/screencolor_cancel"
-            android:background="@drawable/screencolor_btn"/>
-        <Button
-            android:id="@+id/save"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:layout_gravity="center_vertical"
-            android:textColor="@color/custom_screencolor_buttons_text_color"
-            android:text="@string/screencolor_save"
-            android:background="@drawable/screencolor_btn"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/controls_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/bottons_layout"
-        android:paddingLeft="10dip"
-        android:paddingRight="10dip"
-        android:background="@drawable/transparent_background">
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-                <ImageView
-                    android:id="@+id/up_down"
-                    android:layout_width="48dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/down_button"/>
-                <ImageView
-                    android:id="@+id/more"
-                    android:layout_width="48dip"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"
-                    android:background="@drawable/more_button"/>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_toRightOf="@id/up_down"
-                    android:layout_toLeftOf="@id/more"
-                    android:gravity="center">
-                    <Button
-                        android:id="@+id/previous_btn"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/previous_button"/>
-                    <Button
-                        android:id="@+id/new_btn"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:background="@drawable/new_button"/>
-                </LinearLayout>
-            </RelativeLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/preview_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_above="@id/controls_layout"
-        android:paddingLeft="20dip"
-        android:paddingRight="20dip"
-        android:paddingBottom="10dip">
-        <LinearLayout android:id="@+id/screencolor_control"
-            android:orientation="vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <TextView android:id="@+id/hue"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="match_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/hue_str"/>
-
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_hue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"/>
-                <ImageView
-                    android:id="@+id/increase_hue"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/hcontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_hue"
-                    android:layout_toLeftOf="@id/increase_hue"
-                    android:maxHeight="12px"
-                    android:minHeight="12px"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/saturation"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/saturation_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_saturation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_saturation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/scontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_saturation"
-                    android:layout_toLeftOf="@id/increase_saturation"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/contrast"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/contrast_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip">
-                <ImageView
-                    android:id="@+id/reduce_contrast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_contrast"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/ccontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_contrast"
-                    android:layout_toLeftOf="@id/increase_contrast"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-
-            <TextView android:id="@+id/intensity"
-                android:layout_height="wrap_content"
-                android:paddingLeft="20dip"
-                android:paddingTop="10dip"
-                android:layout_width="fill_parent"
-                android:textColor="@color/custom_screencolor_buttons_text_color"
-                android:text="@string/intensity_str"/>
-            <RelativeLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingLeft="10dip"
-                android:paddingRight="10dip"
-                android:id="@+id/intensity_layout">
-                <ImageView
-                    android:id="@+id/reduce_intensity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_out"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true" />
-                <ImageView
-                    android:id="@+id/increase_intensity"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_zoom_in"
-                    android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true"/>
-                <SeekBar android:id="@+id/icontrol"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:thumb="@drawable/ic_zoom_slider"
-                    android:progressDrawable="@drawable/seekbar_define_style"
-                    android:layout_toRightOf="@id/reduce_intensity"
-                    android:layout_toLeftOf="@id/increase_intensity"
-                    android:paddingLeft="20dip"
-                    android:paddingTop="10dip"
-                    android:paddingRight="20dip"
-                    android:paddingBottom="10dip"/>
-            </RelativeLayout>
-        </LinearLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>
diff --git a/res/layout/screen_color_item.xml b/res/layout/screen_color_item.xml
deleted file mode 100644
index 7a87284..0000000
--- a/res/layout/screen_color_item.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
--->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingLeft="10dip"
-    android:paddingTop="4dip"
-    android:paddingRight="10dip"
-    android:paddingBottom="4dip" >
-
-    <RelativeLayout
-        android:id="@+id/widget_frame"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/divider"
-        android:clickable="true"
-        android:focusable="true"
-        android:paddingLeft="10dip" >
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_toStartOf="@android:id/button1"
-            android:layout_toEndOf="@android:id/icon"
-            android:ellipsize="end"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textAlignment="viewStart"
-            android:textColor="@color/screen_color_button_text_color"
-            android:labelFor="@android:id/button2" />
-
-        <RadioButton
-            android:id="@android:id/button1"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:layout_centerVertical="true"
-            android:duplicateParentState="true"
-            android:clickable="false"
-            android:focusable="false" />
-    </RelativeLayout>
-
-    <ImageView
-        android:id="@id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_centerVertical="true"
-        android:layout_toStartOf="@android:id/button2"
-        android:src="@drawable/nav_divider" />
-
-    <ImageView
-        android:id="@android:id/button2"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@android:id/widget_frame"
-        android:layout_alignParentEnd="true"
-        android:layout_alignTop="@android:id/widget_frame"
-        android:layout_centerVertical="true"
-        android:background="?android:attr/selectableItemBackground"
-        android:clickable="true"
-        android:focusable="true"
-        android:src="@drawable/ic_bt_config" />
-
-</RelativeLayout>
diff --git a/res/layout/screencolor_settings.xml b/res/layout/screencolor_settings.xml
deleted file mode 100644
index dd614a1..0000000
--- a/res/layout/screencolor_settings.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/background_preview"
-    android:orientation="vertical"
-    android:gravity="bottom"
-    android:background="@drawable/default_screencolor_setting">
-
-
-        <ListView
-            android:id="@+id/mode_list"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dip"
-            android:layout_marginRight="20dip"
-            android:layout_marginBottom="20dip"
-            android:layout_gravity="bottom"
-            android:background="@drawable/transparent_background" >
-        </ListView>
-</LinearLayout>
diff --git a/res/menu/screencolor_more.xml b/res/menu/screencolor_more.xml
deleted file mode 100644
index dc914b4..0000000
--- a/res/menu/screencolor_more.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/restore_preview"
-        android:title="@string/restore_preview"
-    />
-    <item
-        android:id="@+id/selectnewfile_menu"
-        android:title="@string/selectnewfile_menu"
-    />
-    <item
-        android:id="@+id/selectfile_menu"
-        android:title="@string/selectfile_menu"
-    />
-    <item
-        android:id="@+id/restore_default_str"
-        android:title="@string/restore_default_str"
-    />
-</menu>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 9bba2f8..459e101 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 grade</string>
   <string name="display_rotation_270_title">270 grade</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skerm kleur</string>
-  <string name="screencolor_summary">Verander skerm kleur, versadiging, kontras of intensiteit</string>
-  <string name="custom_screencolor">Persoonlike skerm kleur</string>
-  <string name="screencolor_save">Stoor</string>
-  <string name="screencolor_cancel">Kanselleer</string>
   <string name="restore_preview">Vertoon standaard foto</string>
   <string name="selectnewfile_menu">Vertoon nuwe foto van Galery</string>
   <string name="selectfile_menu">Vertoon foto vanuit Galery</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Versadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standaard</string>
-  <string name="screen_color_vivid">Lewendig</string>
-  <string name="screen_color_custom">Persoonlik</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimaliseer jou skerm gebaseer op die tyd van die dag en die omringende omstandighede om leesbaarheid te verbeter en verminder oogspanning</string>
   <string name="live_display_mode">Skerm modus</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 6c86d3c..2e9b70a 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -576,11 +576,6 @@
   <string name="display_rotation_180_title">180 درجة</string>
   <string name="display_rotation_270_title">270 درجة</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">لون الشاشة</string>
-  <string name="screencolor_summary">ضبط لون شاشة أو مستوى التشبع أو التباين أو الكثافة</string>
-  <string name="custom_screencolor">لون الشاشة المخصص</string>
-  <string name="screencolor_save">حفظ</string>
-  <string name="screencolor_cancel">الغاء</string>
   <string name="restore_preview">عرض الصورة المبدئيّة</string>
   <string name="selectnewfile_menu">عرض صورة جديدة من معرض الصور</string>
   <string name="selectfile_menu">عرض صورة من معرض الصور</string>
@@ -589,9 +584,6 @@
   <string name="saturation_str">التشبع: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">التباين: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">الكثافة: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">قياسى</string>
-  <string name="screen_color_vivid">حي</string>
-  <string name="screen_color_custom">مخصص</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">تحسين الشاشة بحسب الوقت من اليوم والظروف المحيطة لتسهيل القراءة وتقليل إجهاد العين</string>
   <string name="live_display_mode">نمط العرض</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 5d98cc3..bcef602 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ডিগ্ৰী</string>
   <string name="display_rotation_270_title">270 ডিগ্ৰী</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">স্ক্ৰীণৰ ৰং</string>
-  <string name="screencolor_summary">স্ক্ৰীণৰ হিউ, সংপৃক্ততা, বিষমতা আৰু তীব্ৰতা টিউন কৰক</string>
-  <string name="custom_screencolor">কাষ্টম স্ক্ৰীণ ৰং</string>
-  <string name="screencolor_save">ছেভ কৰা</string>
-  <string name="screencolor_cancel">নাকচ</string>
   <string name="restore_preview">ডিফ\'ল্ট ছবি চাওক</string>
   <string name="selectnewfile_menu">গেলাৰীৰ পৰা নতুন ছবি চাওক</string>
   <string name="selectfile_menu">গেলাৰীৰ পৰা ছবি চাওক</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ৰঙৰ গাঢ়তা: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বিষমতা: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্ৰতা: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ষ্টেণ্ডাৰ্ড</string>
-  <string name="screen_color_vivid">উজ্জ্বল</string>
-  <string name="screen_color_custom">কাষ্টম</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">পঠনযোগ্যতা আৰু চকুৰ ওপৰত চাপ হ্ৰাস কৰিবলৈ দিনৰ সময়ৰ আধাৰত আপোনাৰ স্ক্ৰীণ আৰু পাৰিপাৰ্শ্বিক অৱস্থা অপ্টিমাইজ কৰক</string>
   <string name="live_display_mode">প্রদর্শন মোড</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 1ae73ea..61c53b8 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -567,11 +567,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="display_rotation_180_title">180 graos</string>
   <string name="display_rotation_270_title">270 graos</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de la pantalla</string>
-  <string name="screencolor_summary">Axustar el tonu de la pantalla, saturación, contraste o intensidá</string>
-  <string name="custom_screencolor">Color personalizáu de la pantalla</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Encaboxar</string>
   <string name="restore_preview">Ver imaxe por defeutu</string>
   <string name="selectnewfile_menu">Ver imaxe nueva dende la Galería</string>
   <string name="selectfile_menu">Ver imaxe dende la Galería</string>
@@ -580,9 +575,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidá: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intensu</string>
-  <string name="screen_color_custom">Por defeutu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiza la to pantalla basándose na hora\'l día y les condiciones ambientales p\'ameyorar la llexibilidá y amenorgar el cansanciu de güeyos</string>
   <string name="live_display_color_temperature_title">Temperatura de color</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 4153728..a009f8b 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -470,11 +470,6 @@
   <string name="display_rotation_180_title">180 dərəcə</string>
   <string name="display_rotation_270_title">270 dərəcə</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekran rəngi</string>
-  <string name="screencolor_summary">Ekran rəng çalarını, doydurmanı, təzadını və gərginliyini tənzimlə</string>
-  <string name="custom_screencolor">Xüsusi ekran rəngi</string>
-  <string name="screencolor_save">Saxla</string>
-  <string name="screencolor_cancel">İmtina</string>
   <string name="restore_preview">İlkin şəklə bax</string>
   <string name="selectnewfile_menu">Qalereyadan yeni şəklə bax</string>
   <string name="selectfile_menu">Qalereyadan şəklə bax</string>
@@ -483,9 +478,6 @@
   <string name="saturation_str">Doydurma: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Təzad: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Gərginlik: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standart</string>
-  <string name="screen_color_vivid">Canlı</string>
-  <string name="screen_color_custom">Xüsusi</string>
   <!-- LiveDisplay -->
   <string name="live_display_day">Gündüz</string>
   <string name="live_display_night">Gecə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 76a79c0..200c969 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 градусаў</string>
   <string name="display_rotation_270_title">270 градусаў</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Колераперадача экрана</string>
-  <string name="screencolor_summary">Налада адцення, роўняў насычанасці і кантраснасці экрана</string>
-  <string name="custom_screencolor">Карыстальніцкая колераперадача</string>
-  <string name="screencolor_save">Захаваць</string>
-  <string name="screencolor_cancel">Скасаванне</string>
   <string name="restore_preview">Стандартны значок</string>
   <string name="selectnewfile_menu">Абраць новую выяву з \"Галерэі\"</string>
   <string name="selectfile_menu">Абраць з \"Галерэі\"</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Насычанасць: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Кантраснасць: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтэнсіўнасць: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартны</string>
-  <string name="screen_color_vivid">Яскравы</string>
-  <string name="screen_color_custom">Уласная</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Падладжваць экран на аснове часу сутак і асвятлення, каб палепшыць чытальнасць і зменшыць стомленасць вачэй</string>
   <string name="live_display_mode">Рэжым экрана</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 6e7e463..fe656ec 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 градуса</string>
   <string name="display_rotation_270_title">270 градуса</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Цвят на екрана</string>
-  <string name="screencolor_summary">Настройване на отенъка, наситеността, контраста или интензитета на екрана</string>
-  <string name="custom_screencolor">Персонализиран цвят на екрана</string>
-  <string name="screencolor_save">Запиши</string>
-  <string name="screencolor_cancel">Отказ</string>
   <string name="restore_preview">Изглед на картините по подразбиране</string>
   <string name="selectnewfile_menu">Виж нова снимка от галерията</string>
   <string name="selectfile_menu">Виж снимка от галерията</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Наситеност: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
-  <string name="screen_color_standard">Стандартен</string>
-  <string name="screen_color_vivid">Ярък</string>
-  <string name="screen_color_custom">По избор</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизира настройките на екрана, въз основа на времето от деня и условията на околната среда за да се подобри четливостта и да намали умората на очите</string>
   <string name="live_display_mode">Режим на екрана</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 552af91..40f1258 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -378,10 +378,6 @@
   <string name="display_rotation_180_title">১৮০ ডিগ্রী</string>
   <string name="display_rotation_270_title">২৭০ ডিগ্রী</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">পর্দার রঙ</string>
-  <string name="custom_screencolor">পছন্দসই পর্দার রঙ</string>
-  <string name="screencolor_save">সংরক্ষণ</string>
-  <string name="screencolor_cancel">বাতিল</string>
   <string name="restore_preview">পূর্ব-নির্ধারিত চিত্র প্রদর্শন</string>
   <string name="selectnewfile_menu">গ্যালারী থেকে নতুন চিত্র প্রদর্শন</string>
   <string name="selectfile_menu">গ্যালারী থেকে চিত্র প্রদর্শন</string>
@@ -390,7 +386,6 @@
   <string name="saturation_str">সম্পৃক্তিঃ <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">বৈপরীত্যঃ <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">তীব্রতাঃ <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">পছন্দসই</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 7b5a7b0..a8bca0c 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de la pantalla</string>
-  <string name="screencolor_summary">Ajusta el matís, la saturació, el contrast o la intensitat de la pantalla</string>
-  <string name="custom_screencolor">Color de pantalla personalitzat</string>
-  <string name="screencolor_save">Desa</string>
-  <string name="screencolor_cancel">Cancel·la</string>
   <string name="restore_preview">Mostra la imatge per defecte</string>
   <string name="selectnewfile_menu">Mostra una nova imatge des de la galeria</string>
   <string name="selectfile_menu">Mostra una imatge des de la galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturació: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitat: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estàndard</string>
-  <string name="screen_color_vivid">Viva</string>
-  <string name="screen_color_custom">Personalitzat</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimitza la teva pantalla basant-se en l\'hora del dia i les condicions ambientals per millorar la llegibilitat i reduir la fatiga ocular</string>
   <string name="live_display_mode">Mode de pantalla</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 3d41c4f..12dbaec 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 stupňů</string>
   <string name="display_rotation_270_title">270 stupňů</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Barvy obrazovky</string>
-  <string name="screencolor_summary">Upravit odstín, sytost, kontrast nebo intenzitu obrazovky</string>
-  <string name="custom_screencolor">Vlastní barvy obrazovky</string>
-  <string name="screencolor_save">Uložit</string>
-  <string name="screencolor_cancel">Zrušit</string>
   <string name="restore_preview">Zobrazit výchozí obrázek</string>
   <string name="selectnewfile_menu">Zobrazit nový obrázek z Galerie</string>
   <string name="selectfile_menu">Zobrazit obrázek z Galerie</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Sytost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardní</string>
-  <string name="screen_color_vivid">Živé</string>
-  <string name="screen_color_custom">Vlastní</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovat obrazovku podle denní doby a okolních podmínek pro lepší čitelnost a snížení namáhání očí</string>
   <string name="live_display_mode">Režim zobrazení</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index a4e4f09..803d1a0 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -566,11 +566,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skærmfarve</string>
-  <string name="screencolor_summary">Indstil skærmens nuance, mætning, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Tilpasset skærmfarve</string>
-  <string name="screencolor_save">Gem</string>
-  <string name="screencolor_cancel">Annuller</string>
   <string name="restore_preview">Vis standardbillede</string>
   <string name="selectnewfile_menu">Vis nyt billede fra Galleri</string>
   <string name="selectfile_menu">Vis billede fra Galleri</string>
@@ -579,9 +574,6 @@
   <string name="saturation_str">Farvemætning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levende</string>
-  <string name="screen_color_custom">Egen</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimér din skærm baseret på tidspunktet på dagen, samt omgivelserne, for at forbedre læsbarheden og nedsætte anstrengelsen af øjnene</string>
   <string name="live_display_mode">Visningstilstand</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 5648b4f..22c8e05 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Bildschirmfarbe</string>
-  <string name="screencolor_summary">Farbton, Sättigung, Kontrast und Intensität des Bildschirms anpassen</string>
-  <string name="custom_screencolor">Benutzerdefinierte Bildschirmfarbe</string>
-  <string name="screencolor_save">Speichern</string>
-  <string name="screencolor_cancel">Abbrechen</string>
   <string name="restore_preview">Standardbild anzeigen</string>
   <string name="selectnewfile_menu">Neues Bild aus Galerie anzeigen</string>
   <string name="selectfile_menu">Bild aus Galerie anzeigen</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Sättigung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensität: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Lebhaft</string>
-  <string name="screen_color_custom">Benutzerdefiniert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiert Ihren Bildschirm basierend auf der Tageszeit und den Umgebungsbedingungen, um die Lesbarkeit zu verbessern und die Ermüdung der Augen zu mildern</string>
   <string name="live_display_mode">Bildschirmmodus</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 559e472..8da8728 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 μοίρες</string>
   <string name="display_rotation_270_title">270 μοίρες</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Χρώμα οθόνης</string>
-  <string name="screencolor_summary">Βελτιώστε την απόχρωση, τον κορεσμό, την αντίθεση ή την ένταση της οθόνης</string>
-  <string name="custom_screencolor">Προσαρμοσμένο χρώμα οθόνης</string>
-  <string name="screencolor_save">Αποθήκευση</string>
-  <string name="screencolor_cancel">Ακύρωση</string>
   <string name="restore_preview">Προβολή προεπιλεγμένης εικόνας</string>
   <string name="selectnewfile_menu">Προβολή νέας εικόνας από τη Συλλογή</string>
   <string name="selectfile_menu">Προβολή εικόνας από τη Συλλογή</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Κορεσμός: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Αντίθεση: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Ένταση: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Κανονικό</string>
-  <string name="screen_color_vivid">Ζωντανό</string>
-  <string name="screen_color_custom">Προσαρμοσμένο</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Βελτιστοποίηση της οθόνης σας με βάση την ώρα της ημέρας και τις συνθήκες περιβάλλοντος για βελτίωση της αναγνωσιμότητας και μείωση της καταπόνησης των ματιών</string>
   <string name="live_display_mode">Λειτουργία οθόνης</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 84a17b6..5782ae7 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -471,11 +471,6 @@
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Screen colour</string>
-  <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-  <string name="custom_screencolor">Custom screen colour</string>
-  <string name="screencolor_save">Save</string>
-  <string name="screencolor_cancel">Cancel</string>
   <string name="restore_preview">View default picture</string>
   <string name="selectnewfile_menu">View new picture from Gallery</string>
   <string name="selectfile_menu">View picture from Gallery</string>
@@ -484,9 +479,6 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivid</string>
-  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 528f0fb..de59be9 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -513,11 +513,6 @@
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Screen color</string>
-  <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-  <string name="custom_screencolor">Custom screen color</string>
-  <string name="screencolor_save">Save</string>
-  <string name="screencolor_cancel">Cancel</string>
   <string name="restore_preview">View default picture</string>
   <string name="selectnewfile_menu">View new picture from Gallery</string>
   <string name="selectfile_menu">View picture from Gallery</string>
@@ -526,9 +521,6 @@
   <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivid</string>
-  <string name="screen_color_custom">Custom</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 3dbff19..1154fe6 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -496,11 +496,6 @@
   <string name="display_rotation_180_title">180 gradoj</string>
   <string name="display_rotation_270_title">270 gradoj</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrana koloro</string>
-  <string name="screencolor_summary">Agordeti kolortonon, saturecon, kontraston aŭ intensecon</string>
-  <string name="custom_screencolor">Propra ekrana koloro</string>
-  <string name="screencolor_save">Konservi</string>
-  <string name="screencolor_cancel">Rezigni</string>
   <string name="restore_preview">Vidi defaŭltan bildon</string>
   <string name="selectnewfile_menu">Vidi defaŭltan bildon el la Galerio</string>
   <string name="selectfile_menu">Vidi bildon el la Galerio</string>
@@ -509,9 +504,6 @@
   <string name="saturation_str">Satureco: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenseco: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Normala</string>
-  <string name="screen_color_vivid">Viva</string>
-  <string name="screen_color_custom">Propra</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimumigi vian ekranon laŭ la horo kaj la ĉirkaŭaĵa etoso por plibonigi la legebecon kaj malhelpi okulan malkomforton</string>
   <string name="live_display_mode">Vidiga reĝimo</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 184df08..9f1c3ba 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de pantalla</string>
-  <string name="screencolor_summary">Ajustar el matiz de la pantalla, saturación, contraste o intensidad</string>
-  <string name="custom_screencolor">Personalizar color de pantalla</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Ver imagen predeterminada</string>
   <string name="selectnewfile_menu">Ver nueva imagen desde la galería</string>
   <string name="selectfile_menu">Ver imagen desde la galería</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intenso</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 847ef7c..eb6d50f 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Color de pantalla</string>
-  <string name="screencolor_summary">Ajustar el matiz de la pantalla, saturación, contraste o intensidad</string>
-  <string name="custom_screencolor">Personalizar color</string>
-  <string name="screencolor_save">Guardar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Mostrar imagen por defecto</string>
   <string name="selectnewfile_menu">Mostrar nueva imagen desde Galería</string>
   <string name="selectfile_menu">Mostrar imagen desde Galería</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estándar</string>
-  <string name="screen_color_vivid">Intenso</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 33b933c..e3c872f 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -504,11 +504,6 @@
   <string name="display_rotation_180_title">180 kraadi</string>
   <string name="display_rotation_270_title">270 kraadi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekraani värv</string>
-  <string name="screencolor_summary">Häälesta värvus, küllastus, kontrast ja intensiivsus</string>
-  <string name="custom_screencolor">Kohandatud ekraani värv</string>
-  <string name="screencolor_save">Salvesta</string>
-  <string name="screencolor_cancel">Tühista</string>
   <string name="restore_preview">Kuva vaikepilt</string>
   <string name="selectnewfile_menu">Kuva uus pilti Galeriist</string>
   <string name="selectfile_menu">Kuva pilt Galeriist</string>
@@ -517,9 +512,6 @@
   <string name="saturation_str">Küllastus: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiivsus: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Ergas</string>
-  <string name="screen_color_custom">Kohandatud</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiseeri oma ekraan vastavalt päeva ajale ja ümbritsevatele tingimustele, et parandada loetavust ning vähendada silmade pinget</string>
   <string name="live_display_mode">Ekraani režiim</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 802e0e1..928ba1f 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 gradu</string>
   <string name="display_rotation_270_title">270 gradu</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Pantailaren kolorea</string>
-  <string name="screencolor_summary">Doitu pantailaren ñabardura, saturazioa, kontrastea edo intentsitatea</string>
-  <string name="custom_screencolor">Pertsonalizatutako pantaila kolorea</string>
-  <string name="screencolor_save">Gorde</string>
-  <string name="screencolor_cancel">Utzi</string>
   <string name="restore_preview">Ikusi lehenetsitako irudia</string>
   <string name="selectnewfile_menu">Ikusi irudi berria galeriatik</string>
   <string name="selectfile_menu">Ikusi irudia galeriatik</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturazioa:<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastea:<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intentsitatea:<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Estandarra</string>
-  <string name="screen_color_vivid">Bizia</string>
-  <string name="screen_color_custom">Lehenetsia</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizatu zure pantaila eguneko orduaren eta inguruneko baldintzen arabera irakurgarritasuna hobetzeko eta begien nekea gutxiagotzeko</string>
   <string name="live_display_mode">Pantaila modua</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 87485a2..1938b5c 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -506,11 +506,6 @@
   <string name="display_rotation_180_title">۱۸۰ درجه</string>
   <string name="display_rotation_270_title">۲۷۰ درجه</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">رنگ صفحه</string>
-  <string name="screencolor_summary">تنظیم ته‌رنگ، اشباع، کنتراست یا شدت رنگ صفحه</string>
-  <string name="custom_screencolor">رنگ سفارشی صفحه</string>
-  <string name="screencolor_save">ذخیره</string>
-  <string name="screencolor_cancel">لغو</string>
   <string name="restore_preview">مشاهده تصویر پیش‌فرض</string>
   <string name="selectnewfile_menu">مشاهده تصویر جدید از گالری</string>
   <string name="selectfile_menu">مشاهده تصویر از گالری</string>
@@ -519,9 +514,6 @@
   <string name="saturation_str">اشباع: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">شدت رنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">استاندارد</string>
-  <string name="screen_color_vivid">واضح</string>
-  <string name="screen_color_custom">شخصی</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">بهینه کردن صفحه بر اساس ساعات روز و شرایط محیطی برای افزایش خوانایی و کاهش خستگی چشم</string>
   <string name="live_display_mode">حالت نمایش</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index c5597bf..3da6cf9 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 astetta</string>
   <string name="display_rotation_270_title">270 astetta</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Näytön väri</string>
-  <string name="screencolor_summary">Säädä näytön värisävyä, kontrastia ja intensiteettiä</string>
-  <string name="custom_screencolor">Mukautettu näytön väri</string>
-  <string name="screencolor_save">Tallenna</string>
-  <string name="screencolor_cancel">Peruuta</string>
   <string name="restore_preview">Näytä oletuskuva</string>
   <string name="selectnewfile_menu">Näytä uusi kuva Galleriasta</string>
   <string name="selectfile_menu">Katso kuva Galleriasta</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Kylläisyys: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasti: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteetti: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardi</string>
-  <string name="screen_color_vivid">Eloisa</string>
-  <string name="screen_color_custom">Mukautettu</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimoi näyttösi kellonajan ja ympäristöolosuhteiden perusteella parantaaksesi luettavuutta ja vähentääksesi silmien rasitusta</string>
   <string name="live_display_mode">Näyttötila</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 014e9b8..5f49680 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -573,11 +573,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="display_rotation_180_title">180 degrés</string>
   <string name="display_rotation_270_title">270 degrés</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Couleur de l\'écran</string>
-  <string name="screencolor_summary">Régler la teinte, la saturation, le contraste ou l\'intensité de l\'écran</string>
-  <string name="custom_screencolor">Couleur d\'écran personnalisée</string>
-  <string name="screencolor_save">Enregistrer</string>
-  <string name="screencolor_cancel">Annuler</string>
   <string name="restore_preview">Afficher l\'image par défaut</string>
   <string name="selectnewfile_menu">Afficher la nouvelle image depuis la galerie</string>
   <string name="selectfile_menu">Afficher l\'image depuis la galerie</string>
@@ -586,9 +581,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="saturation_str">Saturation : <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste : <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensité : <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vive</string>
-  <string name="screen_color_custom">Personnalisée</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiser votre écran en fonction de l\'heure et des conditions ambiantes pour améliorer la lisibilité et réduire la fatigue oculaire</string>
   <string name="live_display_mode">Mode d\'affichage</string>
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 74fa14a..89e6c6e 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -97,8 +97,6 @@
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor_save">Bewarje</string>
-  <string name="screencolor_cancel">Annulearje</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 0eec73e..650c191 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 અંશ</string>
   <string name="display_rotation_270_title">270 અંશ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">સ્ક્રીન રંગ</string>
-  <string name="screencolor_summary">સ્ક્રીનના રંગ, સંતૃપ્તિ, કૉન્ટ્રાસ્ટ અથવા તીવ્રતાને ટ્યુન કરો</string>
-  <string name="custom_screencolor">કસ્ટમ સ્ક્રીન રંગ</string>
-  <string name="screencolor_save">સાચવો</string>
-  <string name="screencolor_cancel">રદ કરો</string>
   <string name="restore_preview">ડિફૉલ્ટ ચિત્ર જુઓ</string>
   <string name="selectnewfile_menu">ગૅલરીમાંથી નવું ચિત્ર જુઓ</string>
   <string name="selectfile_menu">ગૅલરીમાંથી ચિત્ર જુઓ</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">સંતૃપ્તિ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">કૉન્ટ્રાસ્ટ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ઉત્કટતા: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">પ્રમાણભૂત</string>
-  <string name="screen_color_vivid">વિવિધ</string>
-  <string name="screen_color_custom">કસ્ટમ</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">વાંચન ક્ષમતામાં સુધારો લાવવા અને આંખો પરનો તાણ ઘટાડવા દિવસનો સમય અને વ્યાપક હવામાનનાં આધારે તમારા સ્ક્રીનને અનુકૂળ બનાવો</string>
   <string name="live_display_mode">પ્રદર્શન મોડ</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 14ecdb5..c7d5258 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -502,11 +502,6 @@
   <string name="display_rotation_180_title">180 डिग्री</string>
   <string name="display_rotation_270_title">270 डिग्री</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">स्क्रीन का रंग</string>
-  <string name="screencolor_summary">स्क्रीन के रंग, संतृत्पि, कोंट्रास्ट या तीव्रता को समायोजित करें</string>
-  <string name="custom_screencolor">मनपसंद स्क्रीन रंग</string>
-  <string name="screencolor_save">सहेजें</string>
-  <string name="screencolor_cancel">रद्द करें</string>
   <string name="restore_preview">डिफ़ॉल्ट चित्र देखें</string>
   <string name="selectnewfile_menu">गैलरी से नया चित्र देखें</string>
   <string name="selectfile_menu">गैलरी से चित्र देखें</string>
@@ -515,9 +510,6 @@
   <string name="saturation_str">संतृप्ति: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">कोंट्रास्ट: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">मानक</string>
-  <string name="screen_color_vivid">सस्पष्ट</string>
-  <string name="screen_color_custom">मनपसंद</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">दिन के समय और परिवेशी स्थितियों के अनुसार स्क्रीन को इष्टतमीकृत करें ताकि पठनीयता बढ़ें और आँखों पर कम दबाव पड़े</string>
   <string name="live_display_mode">डिस्प्ले मोड</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 3095962..759ffd0 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 stupnjeva</string>
   <string name="display_rotation_270_title">270 stupnjeva</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Boja zaslona</string>
-  <string name="screencolor_summary">Podešavanje nijansi zaslona, zasićenje, kontrasta ili intenziteta</string>
-  <string name="custom_screencolor">Prilagođena boja zaslona</string>
-  <string name="screencolor_save">Spremi</string>
-  <string name="screencolor_cancel">Odustani</string>
   <string name="restore_preview">Vidi zadanu sliku</string>
   <string name="selectnewfile_menu">Pogledaj novu sliku iz galerije</string>
   <string name="selectfile_menu">Prikaz slike iz galerije</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Zasićenost: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Intenzitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardno</string>
-  <string name="screen_color_vivid">Živopisno</string>
-  <string name="screen_color_custom">Prilagođeno</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Prilagođuje zaslon prema vremenu dana i okolini za poboljšanje čitljivosti i smanjenje naprezanja očiju.</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index c329cc5..8fd4e5b 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 fok</string>
   <string name="display_rotation_270_title">270 fok</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Képernyő színe</string>
-  <string name="screencolor_summary">Képernyő színárnyalat, színtelítettség, kontraszt, vagy intenzitás hangolása</string>
-  <string name="custom_screencolor">Egyéni képernyő színek</string>
-  <string name="screencolor_save">Mentés</string>
-  <string name="screencolor_cancel">Mégsem</string>
   <string name="restore_preview">Alapértelmezett kép megtekintése</string>
   <string name="selectnewfile_menu">Új kép megtekintése a galériából</string>
   <string name="selectfile_menu">Kép megtekintése a galériából</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Telítettség: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontraszt: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzitás: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Hagyományos</string>
-  <string name="screen_color_vivid">Élénk</string>
-  <string name="screen_color_custom">Egyéni</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizálja a képernyőt a napszaknak és a fényviszonyoknak megfelelően, javítva az olvashatóságot és csökkentve a szemek terhelését</string>
   <string name="live_display_mode">Képernyő mód</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index c4d4676..b6a48c7 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 derajat</string>
   <string name="display_rotation_270_title">270 derajat</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Warna layar</string>
-  <string name="screencolor_summary">Menyetel warna layar, saturasi, kontras atau intensitas</string>
-  <string name="custom_screencolor">Warna layar khusus</string>
-  <string name="screencolor_save">Simpan</string>
-  <string name="screencolor_cancel">Batalkan</string>
   <string name="restore_preview">Lihat gambar semula</string>
   <string name="selectnewfile_menu">Lihat gambar baru dari Galeri</string>
   <string name="selectfile_menu">Lihat gambar dari Galeri</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standar</string>
-  <string name="screen_color_vivid">Jelas</string>
-  <string name="screen_color_custom">Khusus</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ruangan untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
   <string name="live_display_mode">Modus tampilan</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 6cd1e50..7657949 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 gradi</string>
   <string name="display_rotation_270_title">270 gradi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Colore schermo</string>
-  <string name="screencolor_summary">Imposta tonalità, saturazione, contrasto o intensità dello schermo</string>
-  <string name="custom_screencolor">Colore schermo personalizzato</string>
-  <string name="screencolor_save">Salva</string>
-  <string name="screencolor_cancel">Annulla</string>
   <string name="restore_preview">Visualizza immagine predefinita</string>
   <string name="selectnewfile_menu">Visualizza nuova immagine dalla Galleria</string>
   <string name="selectfile_menu">Visualizza immagine dalla Galleria</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Saturazione: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensità: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Vivido</string>
-  <string name="screen_color_custom">Personalizzato</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Ottimizza lo schermo in base all\'ora del giorno e alle condizioni ambientali per migliorare la leggibilità e ridurre l\'affaticamento degli occhi</string>
   <string name="live_display_mode">Modalità display</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index c3a3dd1..b6d3003 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -575,11 +575,6 @@
   <string name="display_rotation_180_title">180 מעלות</string>
   <string name="display_rotation_270_title">270 מעלות</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">צבע מסך</string>
-  <string name="screencolor_summary">שנה את הגדרות התצוגה: גוון, רוויה, ניגודיות או עוצמה</string>
-  <string name="custom_screencolor">צבע מסך מותאם אישית</string>
-  <string name="screencolor_save">שמור</string>
-  <string name="screencolor_cancel">בטל</string>
   <string name="restore_preview">צפה בתמונת ברירת מחדל</string>
   <string name="selectnewfile_menu">בחר תמונה חדשה מגלריה</string>
   <string name="selectfile_menu">בחר תמונה מגלריה</string>
@@ -588,9 +583,6 @@
   <string name="saturation_str">רוויה: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ניגודיות: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">עוצמה: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">רגיל</string>
-  <string name="screen_color_vivid">חי (Vivid)</string>
-  <string name="screen_color_custom">מותאם אישית</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">התאם את מסך מכשירך בהתאם לשעה ולתנאי הסביבה על מנת לשפר את נוחות הקריאה ולהפחית את עייפות העין</string>
   <string name="live_display_mode">מצב תצוגה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index c94c5bd..5b3a9e9 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180度</string>
   <string name="display_rotation_270_title">270度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">画面の色</string>
-  <string name="screencolor_summary">画面の色彩、彩度、コントラストまたは輝度を調整する</string>
-  <string name="custom_screencolor">カスタムの画面の色</string>
-  <string name="screencolor_save">保存</string>
-  <string name="screencolor_cancel">キャンセル</string>
   <string name="restore_preview">デフォルトの写真を表示</string>
   <string name="selectnewfile_menu">ギャラリーから新しい写真を表示</string>
   <string name="selectfile_menu">ギャラリーから写真を表示</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">彩度: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">コントラスト: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">スタンダード</string>
-  <string name="screen_color_vivid">ビビッド</string>
-  <string name="screen_color_custom">カスタム</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">画面を見やすく、目の疲れを軽減するために、時間と周囲の環境に合わせて画面を最適化する</string>
   <string name="live_display_mode">ディスプレイのモード</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 6fa6c16..6079a57 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ಡಿಗ್ರಿ</string>
   <string name="display_rotation_270_title">270 ಡಿಗ್ರಿ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ಪರದೆ ಬಣ್ಣ</string>
-  <string name="screencolor_summary">ಪರದೆ ವರ್ಣ, ಸ್ಯಾಚುರೇಶನ್, ಕಾಂಟ್ರಾಸ್ಟ್ ಅಥವ ತೀವ್ರತೆಯನ್ನು ಸರಿಹೊಂದಿಸಿ</string>
-  <string name="custom_screencolor">ಕಸ್ಟಮ್ ಪರದೆ ಬಣ್ಣ</string>
-  <string name="screencolor_save">ಉಳಿಸು</string>
-  <string name="screencolor_cancel">ರದ್ದು</string>
   <string name="restore_preview">ಡೀಫಾಲ್ಟ್ ಫೋಟೋ ವೀಕ್ಷಿಸಿ</string>
   <string name="selectnewfile_menu">ಹೊಸ ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
   <string name="selectfile_menu">ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ಸ್ಯಾಚುರೇಶನ್: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ಕಾಂಟ್ರಾಸ್ಟ್: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ತೀವ್ರತೆ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ಸ್ಟಾಂಡರ್ಡ್</string>
-  <string name="screen_color_vivid">ಎದ್ದುಕಾಣುವ</string>
-  <string name="screen_color_custom">ಕಸ್ಟಮ್</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ದಿನದ ಸಮಯ ಮತ್ತು ಆಂಬಿಯೆಂಟ್ ಪರಿಸ್ಥಿತಿಯನ್ನು ಆಧಾರಿಸಿ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡುವುದರ ಮೂಲಕ ವಾಚನೀಯತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದರೊಂದಿಗೆ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
   <string name="live_display_mode">ಪ್ರದರ್ಶನ ಮೋಡ್</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index a996da0..92fe4ac 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180도</string>
   <string name="display_rotation_270_title">270도</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">화면 색상</string>
-  <string name="screencolor_summary">화면 색상, 채도, 명암비 또는 집적도를 조정</string>
-  <string name="custom_screencolor">사용자 정의 화면 색상</string>
-  <string name="screencolor_save">저장</string>
-  <string name="screencolor_cancel">취소</string>
   <string name="restore_preview">기본 사진 보기</string>
   <string name="selectnewfile_menu">갤러리에서 새 사진 보기</string>
   <string name="selectfile_menu">갤러리에서 사진 보기</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">채도: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">대비: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">강도: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">표준</string>
-  <string name="screen_color_vivid">생생하게</string>
-  <string name="screen_color_custom">사용자 지정</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">가독성을 향상시키고 눈의 피로를 줄이기 위해 주변 환경과 시간에 따라 화면을 최적화</string>
   <string name="live_display_mode">디스플레이 모드</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 34fca70..6a29850 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -471,10 +471,6 @@
   <string name="display_rotation_180_title">180 پلە</string>
   <string name="display_rotation_270_title">270 پلە</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ڕەنگی ڕوونما</string>
-  <string name="custom_screencolor">ڕێکخستنی ڕەنگی ڕوونما</string>
-  <string name="screencolor_save">پاشەکەوتکردن</string>
-  <string name="screencolor_cancel">پاشگەزبوونەوە</string>
   <string name="restore_preview">بینینی وێنەی بنەڕەتی</string>
   <string name="selectnewfile_menu">بینینی وێنەی نوێ لە پێشانگەوە</string>
   <string name="selectfile_menu">بینینی وێنە لە پێشانگەوە</string>
@@ -483,9 +479,6 @@
   <string name="saturation_str">تێریی ڕەنگ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">کۆنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">توندێتیی ڕەنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">پێوانەی</string>
-  <string name="screen_color_vivid">زیرەکی</string>
-  <string name="screen_color_custom">درووستکراو</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">پاشینەسازی لەسەر شاشەکەت  بەندە بە کاتی ڕۆژ وە مەرجی چاکسازی بۆ خوێندنەوەی و کەمکردنەوەی چاوسوین</string>
   <string name="live_display_mode">پیشاندانی بار</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 2182d75..862b713 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -549,11 +549,6 @@
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Schiermfaarf</string>
-  <string name="screencolor_summary">Faarftoun, Faarfsättegung, Kontrast an Intensitéit vum Schierm veränneren</string>
-  <string name="custom_screencolor">Benotzerdefinéiert Schiermfaarf</string>
-  <string name="screencolor_save">Späicheren</string>
-  <string name="screencolor_cancel">Ofbriechen</string>
   <string name="restore_preview">Standard-Bild uweisen</string>
   <string name="selectnewfile_menu">Neit Bild aus der Galerie uweisen</string>
   <string name="selectfile_menu">Bild aus der Galerie uweisen</string>
@@ -562,9 +557,6 @@
   <string name="saturation_str">Sättegung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitéit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Lieweg</string>
-  <string name="screen_color_custom">Ugepasst</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optiméiert däi Schierm andeem s e sech op der Dageszäit an den Ëmgéigendskonditioune baséiert, fir d\'Liesbarkeet ze verbesseren an d\'Ermiddung vun den Aen ze reduzéieren</string>
   <string name="live_display_mode">Schiermmodus</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 967f04a..dfafc8b 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -507,11 +507,6 @@
   <string name="display_rotation_180_title">180 laipsnių</string>
   <string name="display_rotation_270_title">270 laipsnių</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrano spalva</string>
-  <string name="screencolor_summary">Nustatyti ekrano atspalvį, saturaciją, kontrastą arba intensyvumą</string>
-  <string name="custom_screencolor">Tinkinta ekrano spalva</string>
-  <string name="screencolor_save">Išsaugoti</string>
-  <string name="screencolor_cancel">Atšaukti</string>
   <string name="restore_preview">Žiūrėti numatytąjį vaizdą</string>
   <string name="selectnewfile_menu">Žiūrėti naują vaizdą iš galerijos</string>
   <string name="selectfile_menu">Žiūrėti vaizdą iš galerijos</string>
@@ -520,9 +515,6 @@
   <string name="saturation_str">Saturacija: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrastas: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensyvumas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standartinis</string>
-  <string name="screen_color_vivid">Ryškus</string>
-  <string name="screen_color_custom">Priskirtas</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizuoti ekraną remiantis paros metu ir aplinkos sąlygomis, siekiant pagerinti įskaitomumą ir sumažinti akių įtampą</string>
   <string name="live_display_mode">Rodymo režimas</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 96523cc..10b71f3 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -370,10 +370,6 @@
   <string name="display_rotation_180_title">180 grādi</string>
   <string name="display_rotation_270_title">270 grādi</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekrāna krāsa</string>
-  <string name="custom_screencolor">Pielāgota ekrāna krāsa</string>
-  <string name="screencolor_save">Saglabāt</string>
-  <string name="screencolor_cancel">Atcelt</string>
   <string name="restore_preview">Skatīt noklusēto attēlu</string>
   <string name="selectnewfile_menu">Skatīt jaunu attēlu no galerijas</string>
   <string name="selectfile_menu">Skatīt attēlu no galerijas</string>
@@ -382,7 +378,6 @@
   <string name="saturation_str">Piesātinājums: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrasts: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Spilgtums: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">Pielāgots</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index dc849aa..c3cfce2 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ഡിഗ്രി</string>
   <string name="display_rotation_270_title">270 ഡിഗ്രി</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">സ്ക്രീൻ നിറം</string>
-  <string name="screencolor_summary">സ്ക്രീൻ ഹ്യൂ, സാച്ചുറേഷൻ, ദൃശ്യതീവ്രത അല്ലെങ്കിൽ തീവ്രത ട്യൂണ്‍ ചെയ്യുക</string>
-  <string name="custom_screencolor">ഇഷ്ടാനുസൃത സ്ക്രീൻ നിറം</string>
-  <string name="screencolor_save">സംരക്ഷിക്കുക</string>
-  <string name="screencolor_cancel">റദ്ദാക്കുക</string>
   <string name="restore_preview">ഡിഫോള്‍ട്ട് ചിത്രം കാണുക</string>
   <string name="selectnewfile_menu">ഗാലറിയിൽ നിന്നും പുതിയ ചിത്രം കാണുക</string>
   <string name="selectfile_menu">ഗാലറിയിൽ നിന്നും ചിത്രം കാണുക</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">സാച്ചുറേഷൻ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ദൃശ്യതീവ്രത: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">തീവ്രത: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">അടിസ്ഥാനം</string>
-  <string name="screen_color_vivid">ഉജ്ജ്വലം</string>
-  <string name="screen_color_custom">ഇഷ്‌ടാനുസൃതം</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">വായനാക്ഷമത മെച്ചപ്പെടുത്തുന്നതിനും കണ്ണുകളുടെ സമ്മര്‍ദ്ദം കുറയ്ക്കാനും സമയത്തിന്‍റെയും ചുറ്റുപാടിന്റെ സാഹചര്യത്തിന്റെയും അടിസ്ഥാനത്തില്‍ നിങ്ങളുടെ സ്ക്രീന്‍ ഒപ്റ്റിമൈസ് ചെയ്യുക.</string>
   <string name="live_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 795f0fa..110df02 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 अंश</string>
   <string name="display_rotation_270_title">270 अंश</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">स्क्रीन रंग</string>
-  <string name="screencolor_summary">स्क्रीन रंगछटा, संपृक्तता, वैधर्म्य किंवा तीव्रता</string>
-  <string name="custom_screencolor">स्क्रीन रंग सानुकूल करा</string>
-  <string name="screencolor_save">जतन करा</string>
-  <string name="screencolor_cancel">रद्द करा</string>
   <string name="restore_preview">डिफॉल्ट चित्र पाहा</string>
   <string name="selectnewfile_menu">गॅलरीतून नवीन चित्र पाहा</string>
   <string name="selectfile_menu">गॅलरीतून चित्र पाहा</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">संपृक्तता: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">वैधर्म्य: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">मानक</string>
-  <string name="screen_color_vivid">स्पष्ट</string>
-  <string name="screen_color_custom">सानुकूल</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">वाचनीयता सुधारण्यासाठी आणि डोळ्यांवरील ताण कमी करण्यासाठी दिवसाची वेळ आणि आसपासची स्थिती यानुसार तुमचा स्क्रीन अनुकूल करा</string>
   <string name="live_display_mode">प्रदर्शन मोड</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 2a00f78..cd404e8 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skjermfarge</string>
-  <string name="screencolor_summary">Justere skjermens sorttype, metning, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Tilpasset skjermfarge</string>
-  <string name="screencolor_save">Lagre</string>
-  <string name="screencolor_cancel">Avbryt</string>
   <string name="restore_preview">Vis standardbilde</string>
   <string name="selectnewfile_menu">Vis nytt bilde fra galleriet</string>
   <string name="selectfile_menu">Vis bilde fra galleriet</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Metning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levende</string>
-  <string name="screen_color_custom">Egendefinert</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalisere skjermen basert på tidspunkt på dagen og omgivelsesforhold å forbedre lesbarhet og redusere belastningen på øynene</string>
   <string name="live_display_mode">Visningsmodus</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 611c8c8..cf14d07 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 graden</string>
   <string name="display_rotation_270_title">270 graden</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Schermkleur</string>
-  <string name="screencolor_summary">Tint, verzadiging, contrast en intensiteit van het scherm aanpassen</string>
-  <string name="custom_screencolor">Aangepaste schermkleur</string>
-  <string name="screencolor_save">Opslaan</string>
-  <string name="screencolor_cancel">Annuleren</string>
   <string name="restore_preview">Standaardfoto bekijken</string>
   <string name="selectnewfile_menu">Nieuwe foto uit Galerij bekijken</string>
   <string name="selectfile_menu">Foto uit Galerij bekijken</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Verzadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standaard</string>
-  <string name="screen_color_vivid">Levendig</string>
-  <string name="screen_color_custom">Aangepast</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Uw scherm optimaliseren aan de hand van tijdstip op de dag en lichtomstandigheden om de leesbaarheid te verbeteren en oogvermoeidheid te verminderen</string>
   <string name="live_display_mode">Weergavemodus</string>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index afcbc36..a135040 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 ଡିଗ୍ରୀ</string>
   <string name="display_rotation_270_title">270 ଡିଗ୍ରୀ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ</string>
-  <string name="screencolor_summary">ଘ୍ୟୁ, ସାଚୁରେସନ୍‍, କଂଟ୍ରାଷ୍ଟ ବା ତୀବ୍ରତା ଟ୍ଯୁନ୍‍ କରନ୍ତୁ</string>
-  <string name="custom_screencolor">ସ୍କ୍ରିନ୍‍ ରଙ୍ଗ କଷ୍ଟମ୍‍ କରନ୍ତୁ</string>
-  <string name="screencolor_save">ସଞ୍ଚୟ</string>
-  <string name="screencolor_cancel">ବାତିଲ</string>
   <string name="restore_preview">ଡିଫଲ୍ଟ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
   <string name="selectnewfile_menu">ଗ୍ୟାଲେରୀରୁ ନୂଆ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
   <string name="selectfile_menu">ଗ୍ୟାଲେରୀରୁ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">ସାଚୁରେସନ୍‍: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">କଣ୍ଟ୍ରାଷ୍ଟ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ତୀବ୍ରତା: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ମାନାଙ୍କ</string>
-  <string name="screen_color_vivid">ଭିଭିଦ</string>
-  <string name="screen_color_custom">କଷ୍ଟମ୍</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ରିଡେବିଲିଟି ବୃଦ୍ଧି କରିବା ପାଇଁ ଓ ୱ୍ୱିଷ୍ଟ୍ରେନ୍‍ ହ୍ରାସ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଦିନର ସମୟ ଓ ଆମ୍ବିଏଣ୍ଟ ସର୍ତ୍ତାବଳି ଉପରେ ନିଭର କରି ଅପ୍ଟିମାଇଜ୍‍ କରନ୍ତୁ</string>
   <string name="live_display_mode">ଡିସ୍‍ପ୍ଲେ ମୋଡ୍‍</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 5ee3eff..fbd8f65 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -567,11 +567,6 @@
   <string name="display_rotation_180_title">180 stopni</string>
   <string name="display_rotation_270_title">270 stopni</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Kolor ekranu</string>
-  <string name="screencolor_summary">Dostosuj odcień, nasycenie, kontrast lub intensywność ekranu</string>
-  <string name="custom_screencolor">Własny kolor ekranu</string>
-  <string name="screencolor_save">Zapisz</string>
-  <string name="screencolor_cancel">Anuluj</string>
   <string name="restore_preview">Pokaż domyślny obraz</string>
   <string name="selectnewfile_menu">Zobacz nowy obraz w Galerii</string>
   <string name="selectfile_menu">Zobacz zdjęcie z Galerii</string>
@@ -580,9 +575,6 @@
   <string name="saturation_str">Nasycenie: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensywność: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standardowo</string>
-  <string name="screen_color_vivid">Żywy</string>
-  <string name="screen_color_custom">Własna</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optymalizuj swój ekran bazując na porze dnia i warunkach panujących w otoczeniu, aby zwiększyć czytelność i zmniejszyć uczucie zmęczenia oczu</string>
   <string name="live_display_mode">Tryb wyświetlania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index b60702a..c5e0b52 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Cor da tela</string>
-  <string name="screencolor_summary">Ajustar tom, saturação, contraste ou intensidade da tela</string>
-  <string name="custom_screencolor">Cor personalizada da tela</string>
-  <string name="screencolor_save">Salvar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Visualizar imagem padrão</string>
   <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
   <string name="selectfile_menu">Visualizar imagem da Galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Padrão</string>
-  <string name="screen_color_vivid">Vívido</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza sua tela com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir o cansaço visual</string>
   <string name="live_display_mode">Modo da tela</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index dfceabf..ef12bdb 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Cor do ecrã</string>
-  <string name="screencolor_summary">Ajustar o tom, saturação, contraste ou intensidade do ecrã</string>
-  <string name="custom_screencolor">Cor personalizada do ecrã</string>
-  <string name="screencolor_save">Gravar</string>
-  <string name="screencolor_cancel">Cancelar</string>
   <string name="restore_preview">Visualizar imagem predefinida</string>
   <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
   <string name="selectfile_menu">Visualizar imagem da Galeria</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Padrão</string>
-  <string name="screen_color_vivid">Brilhante</string>
-  <string name="screen_color_custom">Personalizado</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza o ecrã com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir a fadiga ocular</string>
   <string name="live_display_mode">Modo de exibição</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 2dec126..1f0e8c7 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -541,11 +541,6 @@
   <string name="display_rotation_180_title">180 de grade</string>
   <string name="display_rotation_270_title">270 de grade</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Culoare ecran</string>
-  <string name="screencolor_summary">Reglează nuanța, saturația, contrastul sau intensitatea ecranului</string>
-  <string name="custom_screencolor">Culoare ecran personalizată</string>
-  <string name="screencolor_save">Salvaţi</string>
-  <string name="screencolor_cancel">Revocaţi</string>
   <string name="restore_preview">Vezi imaginea implicită</string>
   <string name="selectnewfile_menu">Vezi noua imagine din Galerie</string>
   <string name="selectfile_menu">Vezi imaginea din Galerie</string>
@@ -554,9 +549,6 @@
   <string name="saturation_str">Saturația: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Contrastul: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitatea: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Viu</string>
-  <string name="screen_color_custom">Particularizat</string>
   <!-- LiveDisplay -->
   <string name="live_display_mode">Mod de afișare</string>
   <string name="live_display_color_temperature_title">Temperatura culorii</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 427b443..6e5b38c 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 градусов</string>
   <string name="display_rotation_270_title">270 градусов</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Цветопередача экрана</string>
-  <string name="screencolor_summary">Настройка оттенка, уровней насыщенности и контрастности экрана</string>
-  <string name="custom_screencolor">Пользовательская цветопередача</string>
-  <string name="screencolor_save">Сохранить</string>
-  <string name="screencolor_cancel">Отмена</string>
   <string name="restore_preview">Стандартный значок</string>
   <string name="selectnewfile_menu">Выбрать новое изображение из «Галереи»</string>
   <string name="selectfile_menu">Выбрать из «Галереи»</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Насыщенность: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контрастность: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интенсивность: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартный</string>
-  <string name="screen_color_vivid">Яркий</string>
-  <string name="screen_color_custom">Не задано</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Подстраивать экран на основе времени суток и освещения, чтобы повысить удобочитаемость и снизить нагрузку на глаза</string>
   <string name="live_display_mode">Режим экрана</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 29408c1..beb668e 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -378,10 +378,6 @@
   <string name="display_rotation_180_title">අංශක 180</string>
   <string name="display_rotation_270_title">අංශක 270</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">තිරයේ පැහැය</string>
-  <string name="custom_screencolor">රිසිවූ තිර පැහැය</string>
-  <string name="screencolor_save">සුරකින්න</string>
-  <string name="screencolor_cancel">එපා</string>
   <string name="restore_preview">පෙරනිමි පින්තූරය බලන්න</string>
   <string name="selectnewfile_menu">ගැලරියෙන් නව පින්තූරයක් බලන්න</string>
   <string name="selectfile_menu">ගැලරියෙන් පින්තූරය බලන්න</string>
@@ -390,7 +386,6 @@
   <string name="saturation_str">සන්තෘප්තිය: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ප්‍රභේදනය: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">තීව්‍රතාව: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_custom">රිසිවූ</string>
   <!-- LiveDisplay -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 8744330..1424557 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -507,11 +507,6 @@
   <string name="display_rotation_180_title">180 stupňov</string>
   <string name="display_rotation_270_title">270 stupňov</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Farba obrazovky</string>
-  <string name="screencolor_summary">Upraviť tón, sýtosť, kontrast alebo intenzitu displeja</string>
-  <string name="custom_screencolor">Vlastná farba obrazovky</string>
-  <string name="screencolor_save">Uložiť</string>
-  <string name="screencolor_cancel">Zrušiť</string>
   <string name="restore_preview">Zobraziť predvolený obrázok</string>
   <string name="selectnewfile_menu">Zobraziť nový obrázok z Galérie</string>
   <string name="selectfile_menu">Zobraziť obrázok z Galérie</string>
@@ -520,9 +515,6 @@
   <string name="saturation_str">Sýtosť: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Štandardná</string>
-  <string name="screen_color_vivid">Sýta</string>
-  <string name="screen_color_custom">Vlastná</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovať vašu obrazovku na základe dennej doby a podmienok okolia na zlepšenie čitateľnosti a zníženie únavy očí</string>
   <string name="live_display_mode">Režim zobrazenia</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 585ffdd..fce24c2 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -575,11 +575,6 @@
   <string name="display_rotation_180_title">180 stopinj</string>
   <string name="display_rotation_270_title">270 stopinj</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Barva zaslona</string>
-  <string name="screencolor_summary">Naravnajte odtenek, nasičenost, kontrast in jakost zaslona</string>
-  <string name="custom_screencolor">Barva zaslona po meri</string>
-  <string name="screencolor_save">Shrani</string>
-  <string name="screencolor_cancel">Prekliči</string>
   <string name="restore_preview">Pokaži privzeto sliko</string>
   <string name="selectnewfile_menu">Pokaži novo sliko iz galerije</string>
   <string name="selectfile_menu">Pokaži sliko iz galerije</string>
@@ -588,9 +583,6 @@
   <string name="saturation_str">Nasičenost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Jakost: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Običajno</string>
-  <string name="screen_color_vivid">Živahno</string>
-  <string name="screen_color_custom">Po meri</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiziraj zaslon glede na čas dneva in pogoje okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
   <string name="live_display_mode">Način prikaza</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index bc90179..b87d888 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -573,11 +573,6 @@
   <string name="display_rotation_180_title">180 степени</string>
   <string name="display_rotation_270_title">270 степени</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Боја екрана</string>
-  <string name="screencolor_summary">Подеси нијансу, засићење, контраст и интензитет</string>
-  <string name="custom_screencolor">Прилагођена боја екрана</string>
-  <string name="screencolor_save">Сачувај</string>
-  <string name="screencolor_cancel">Откажи</string>
   <string name="restore_preview">Погледај подразумевану слику</string>
   <string name="selectnewfile_menu">Погледај нову слику из Галерије</string>
   <string name="selectfile_menu">Погледај слику из Галерије</string>
@@ -586,9 +581,6 @@
   <string name="saturation_str">Засићење: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандардно</string>
-  <string name="screen_color_vivid">Живописно</string>
-  <string name="screen_color_custom">Прилагођено</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизуј екран у складу са дневним и просторним приликама да побољшаш читљивост и умањиш замарање очију</string>
   <string name="live_display_mode">Режим екрана</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 5d908d2..cdd510d 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -570,11 +570,6 @@
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Skärmfärg</string>
-  <string name="screencolor_summary">Ställ in skärmnyans, mättnad, kontrast eller intensitet</string>
-  <string name="custom_screencolor">Anpassad skärmfärg</string>
-  <string name="screencolor_save">Spara</string>
-  <string name="screencolor_cancel">Avbryt</string>
   <string name="restore_preview">Visa standardbild</string>
   <string name="selectnewfile_menu">Visa ny bild från galleriet</string>
   <string name="selectfile_menu">Visa bild från galleriet</string>
@@ -583,9 +578,6 @@
   <string name="saturation_str">Mättnad: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standard</string>
-  <string name="screen_color_vivid">Levande</string>
-  <string name="screen_color_custom">Anpassad</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimera din skärm baserad på dygnets tidpunkt och omgivande förhållanden för att förbättra läsbarhet och minska belastningen på ögonen</string>
   <string name="live_display_mode">Visningsläge</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index ec4e4f3..531b9ca 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 டிகிரீ</string>
   <string name="display_rotation_270_title">270 டிகிரீ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">திரை நிறம்</string>
-  <string name="screencolor_summary">திரை வண்ணக்கூறு, கான்டிராஸ்ட் அல்லது தீவிரத்தை டியூன் செய்</string>
-  <string name="custom_screencolor">தனிப்பயனாக்கப்பட்ட திரை நிறம்</string>
-  <string name="screencolor_save">சேமி</string>
-  <string name="screencolor_cancel">ரத்துசெய்</string>
   <string name="restore_preview">இயல்நிலை படத்தை காண்</string>
   <string name="selectnewfile_menu">கேலரியில் இருந்து புது படத்தைக் காண்</string>
   <string name="selectfile_menu">கேலரியில் இருநந்து படத்தைக் காண்</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">சாச்சுரேசன்: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">கான்டிராஸ்ட்: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">இன்டென்சிட்டி: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">நிலையான</string>
-  <string name="screen_color_vivid">தெளிவு</string>
-  <string name="screen_color_custom">தனிப்பயன்</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">வாசிக்கும்தன்மையை மேம்படுத்தவும் கண்ணுக்கு சிரமத்தை குறைக்கவும் நாளின் நேரத்தையும் சுற்றுச்சூழல் நிலைமைகளையும் பொருத்து உங்கள் திரையை உகந்ததாக்குங்கள்</string>
   <string name="live_display_mode">காட்சி முறை</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 3415593..24db942 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 డిగ్రీలు</string>
   <string name="display_rotation_270_title">270 డిగ్రీలు</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">స్క్రీన్ రంగు</string>
-  <string name="screencolor_summary">స్క్రీన్ వర్ణం, సంతృప్తత, వర్ణ వ్యత్యాసం లేదా తీవ్రతలను ట్యూన్ చేయుము</string>
-  <string name="custom_screencolor">స్క్రీన్ రంగును అనుకూలితం చేయుము</string>
-  <string name="screencolor_save">సేవ్ చేయి</string>
-  <string name="screencolor_cancel">రద్దు చేయి</string>
   <string name="restore_preview">స్వయంసిద్ధ చిత్రాన్ని వీక్షించుము</string>
   <string name="selectnewfile_menu">గ్యాలరీ నుండి క్రొత్త చిత్రాన్ని వీక్షించుము</string>
   <string name="selectfile_menu">గ్యాలరీ నుండి చిత్రాన్ని వీక్షించుము</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">సంతృప్తత: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">వర్ణ వ్యత్యాసం: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">తీవ్రత: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ప్రామాణిక</string>
-  <string name="screen_color_vivid">ప్రకాశవంతమైన</string>
-  <string name="screen_color_custom">అనుకూలం</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">చదవడానికి అనుకూలంగా ఉండే విధంగా మరియు కళ్ళ పైన ఒత్తిడిని తగ్గించేందుకు రోజు యొక్క సమయం మరియు పరిసర పరిస్థితులను బట్టి సమయాన్ని సెట్ చేయండి</string>
   <string name="live_display_mode">ప్రదర్శిత మోడ్</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index a496f86..40cd242 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 องศา</string>
   <string name="display_rotation_270_title">270 องศา</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">สีหน้าจอ</string>
-  <string name="screencolor_summary">ปรับแต่งสี ความอิ่มต้ว ความคมชัด หรือความเข้มของหน้าจอ</string>
-  <string name="custom_screencolor">สีหน้าจอกำหนดเอง</string>
-  <string name="screencolor_save">บันทึก</string>
-  <string name="screencolor_cancel">ยกเลิก</string>
   <string name="restore_preview">ดูรูปภาพเริ่มต้น</string>
   <string name="selectnewfile_menu">ดูรูปภาพใหม่จากแกลเลอรี</string>
   <string name="selectfile_menu">ดูรูปภาพจากแกลลอรี</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">ความอิ่มตัว: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ความเข้มจาง: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">ความเข้มข้น: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">มาตราฐาน</string>
-  <string name="screen_color_vivid">สดใส</string>
-  <string name="screen_color_custom">กำหนดเอง</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ปรับหน้าความสว่างหน้าจอตามเวลาและแสงโดยรอบเพื่อทำให้อ่านได้ง่ายขึ้นและลดอาการปวดตา</string>
   <string name="live_display_mode">รูปแบบการแสดงผล</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 1c38ad9..d16e190 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -572,11 +572,6 @@
   <string name="display_rotation_180_title">180 derece</string>
   <string name="display_rotation_270_title">270 derece</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Ekran rengi</string>
-  <string name="screencolor_summary">Ekran renk tonunu, doygunluğunu, karşıtlığını veya yoğunluğunu ayarla</string>
-  <string name="custom_screencolor">Özel ekran rengi</string>
-  <string name="screencolor_save">Kaydet</string>
-  <string name="screencolor_cancel">İptal</string>
   <string name="restore_preview">Varsayılan resmi görüntüle</string>
   <string name="selectnewfile_menu">Galeriden yeni resmi görüntüle</string>
   <string name="selectfile_menu">Galeriden resmi görüntüle</string>
@@ -585,9 +580,6 @@
   <string name="saturation_str">Doygunluk: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Zıtlık: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Yoğunluk: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Standart</string>
-  <string name="screen_color_vivid">Canlı</string>
-  <string name="screen_color_custom">Özel</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Okunabilirliği artırmak ve göz yorgunluğu azaltmak için gün ve ortam koşulları zamanına bağlı olarak ekranı iyileştirir</string>
   <string name="live_display_mode">Görüntü modu</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 029ffc0..fe73c1d 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 گرادۇس</string>
   <string name="display_rotation_270_title">270 گرادۇس</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">ئېكران رەڭگى</string>
-  <string name="screencolor_summary">رەڭ تۈسى، تويۇنۇشچانلىقى، ئاق-قارىلىقى ياكى يورۇقلۇقىنى تەڭشەيدۇ</string>
-  <string name="custom_screencolor">ئىختىيارىي ئېكران رەڭگى</string>
-  <string name="screencolor_save">ساقلا</string>
-  <string name="screencolor_cancel">ۋاز كەچ</string>
   <string name="restore_preview">كۆڭۈلدىكى رەسىمنى كۆرسىتىدۇ</string>
   <string name="selectnewfile_menu">رەسىم توپلىمىدىن يېڭى رەسىمنى كۆرسىتىدۇ</string>
   <string name="selectfile_menu">رەسىم توپلىمىدىن رەسىمنى كۆرسىتىدۇ</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">تويۇنۇشچانلىقى: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">ئاق-قارىلىقى: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">يورۇقلۇقى: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">ئۆلچەملىك</string>
-  <string name="screen_color_vivid">جانلىق</string>
-  <string name="screen_color_custom">ئىختىيارىي</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ۋاقىت ۋە مۇھىت شەرتى ئاساسىدا ئېكرانىڭىزنى ئەلالاشتۇرۇپ ئوقۇشچانلىقنى ياخشىلاپ كۆز چارچاشنى تۆۋەنلىتىدۇ</string>
   <string name="live_display_mode">كۆرسىتىش ھالىتى</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 9d06bff..4ed8089 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -555,11 +555,6 @@
   <string name="display_rotation_180_title">180 градусів</string>
   <string name="display_rotation_270_title">270 градусів</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Колір екрану</string>
-  <string name="screencolor_summary">Налаштування відтінку екрану, насиченості, контрасту або інтенсивності</string>
-  <string name="custom_screencolor">Налаштування кольору екрану</string>
-  <string name="screencolor_save">Зберегти</string>
-  <string name="screencolor_cancel">Скасувати</string>
   <string name="restore_preview">Стандартний значок</string>
   <string name="selectnewfile_menu">Вибрати нове зображення з «Галереї»</string>
   <string name="selectfile_menu">Вибрати зображення з «Галереї»</string>
@@ -568,9 +563,6 @@
   <string name="saturation_str">Насиченість: <xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">Інтенсивність: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">Стандартний</string>
-  <string name="screen_color_vivid">Яскравий</string>
-  <string name="screen_color_custom">Не заданий</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Налаштовувати екран залежно від часу доби і умов освітлення для підвищення зручності читання і зменшення втоми очей</string>
   <string name="live_display_mode">Режим екрану</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 60e2959..4b24827 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -571,11 +571,6 @@
   <string name="display_rotation_180_title">180 độ</string>
   <string name="display_rotation_270_title">270 độ</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">Màu sắc màn hình</string>
-  <string name="screencolor_summary">Điều chỉnh tông màu, độ bão hòa, độ tương phản hoặc cường độ màn hình</string>
-  <string name="custom_screencolor">Tùy chỉnh màu sắc màn hình</string>
-  <string name="screencolor_save">Lưu</string>
-  <string name="screencolor_cancel">Huỷ</string>
   <string name="restore_preview">Xem ảnh mặc định</string>
   <string name="selectnewfile_menu">Xem ảnh mới từ Thư viện</string>
   <string name="selectfile_menu">Xem hình ảnh từ Thư viện</string>
@@ -584,9 +579,6 @@
   <string name="saturation_str">Độ bão hòa: <xliff:g id="saturation_value">%1$s </xliff:g></string>
   <string name="contrast_str">Độ tương phản: <xliff:g id="contrast_value">%1$s </xliff:g></string>
   <string name="intensity_str">Cường độ: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
-  <string name="screen_color_standard">Chuẩn</string>
-  <string name="screen_color_vivid">Sống động</string>
-  <string name="screen_color_custom">Tùy chỉnh</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Tối ưu hóa màn hình dựa trên điều kiện môi trường và thời gian trong ngày để cải thiện khả năng đọc và giảm mỏi mắt</string>
   <string name="live_display_mode">Chế độ hiển thị</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index f0fec8b..62eb4a3 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -569,11 +569,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">屏幕颜色</string>
-  <string name="screencolor_summary">调整屏幕色调、饱和度、对比度或亮度</string>
-  <string name="custom_screencolor">自定义屏幕颜色</string>
-  <string name="screencolor_save">保存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">查看默认图片</string>
   <string name="selectnewfile_menu">从图库查看新图片</string>
   <string name="selectfile_menu">从图库查看图片</string>
@@ -582,9 +577,6 @@
   <string name="saturation_str">饱和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">对比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">强度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">标准</string>
-  <string name="screen_color_vivid">鲜艳</string>
-  <string name="screen_color_custom">自定义</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基于时间和环境条件来优化您的屏幕以改善可读性和减少眼睛疲劳</string>
   <string name="live_display_mode">显示模式</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 05aafab..f191cdf 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -474,11 +474,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">螢幕顏色</string>
-  <string name="screencolor_summary">調整螢幕色調、 飽和度、 對比度或強度</string>
-  <string name="custom_screencolor">自訂螢幕顏色</string>
-  <string name="screencolor_save">儲存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">檢視預設圖片</string>
   <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
   <string name="selectfile_menu">從圖片庫查看圖片</string>
@@ -487,9 +482,6 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">強度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">標準</string>
-  <string name="screen_color_vivid">鮮明</string>
-  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">您可根據每日時間和環境條件來優化螢幕顯示，以提升可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 80b5fe9..33e61bb 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -553,11 +553,6 @@
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
   <!-- Display settings.  Screen color. -->
-  <string name="screencolor">螢幕顏色</string>
-  <string name="screencolor_summary">調整螢幕色調、 飽和度、 對比度或強度</string>
-  <string name="custom_screencolor">自訂螢幕顏色</string>
-  <string name="screencolor_save">儲存</string>
-  <string name="screencolor_cancel">取消</string>
   <string name="restore_preview">檢視預設相片</string>
   <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
   <string name="selectfile_menu">從圖片庫查看圖片</string>
@@ -566,9 +561,6 @@
   <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
   <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
   <string name="intensity_str">亮度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-  <string name="screen_color_standard">標準</string>
-  <string name="screen_color_vivid">鮮豔</string>
-  <string name="screen_color_custom">自訂</string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基於日夜和環境條件調整您的螢幕色溫，以改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 6901fae..35b2bf7 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -360,13 +360,6 @@
         <item>silent</item>
     </string-array>
 
-    <!-- Values for screen color  -->
-    <string-array name="screen_color_setting" translatable="false">
-        <item>@string/screen_color_standard</item>
-        <item>@string/screen_color_vivid</item>
-        <item>@string/screen_color_custom</item>
-    </string-array>
-
     <!-- Stylus Gestures -->
     <string-array name="gestures_entries" translatable="false">
         <item>@string/gestures_action_empty</item>
diff --git a/res/values/cm_colors.xml b/res/values/cm_colors.xml
index 8e0a0f1..3492078 100644
--- a/res/values/cm_colors.xml
+++ b/res/values/cm_colors.xml
@@ -18,7 +18,6 @@ limitations under the License.
     <color name="floating_action_button_touch_tint">#80ffffff</color>
     <color name="theme_accent">#ff009688</color>
 
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
 
     <drawable name="expanded_item_bg_activated">#ffEEEEEE</drawable>
@@ -63,7 +62,6 @@ limitations under the License.
 
     <!-- Personal Dictionary Add Icon -->
     <drawable name="ic_menu_add_word">@drawable/ic_menu_add_dark</drawable>
-    <color name="screencolor_background">#50000000</color>
     <drawable name="transparent_background">#00000000</drawable>
     <!-- NFC hard colors -->
     <color name="nfc_how_it_works_main_background">#FF80CBC4</color>
@@ -120,12 +118,10 @@ limitations under the License.
 
     <color name="storage_wizard_button_text_color">@color/text_color_white</color>
     <color name="storage_wizard_red_button_text_color">@color/text_color_white</color>
-    <color name="screen_color_button_text_color">@color/text_color_white</color>
     <color name="privacy_guard_error_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_status_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_lock_pattern_text_color">@color/text_color_white</color>
     <color name="crypt_keeper_emergency_button_text_color">@color/text_color_white</color>
-    <color name="custom_screencolor_buttons_text_color">@color/text_color_white</color>
 
     <color name="weather_settings_icon_tint">#B4B9BA</color>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 3e8c02a..d05ce40 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -656,25 +656,6 @@
     <string name="display_rotation_180_title">180 degrees</string>
     <string name="display_rotation_270_title">270 degrees</string>
 
-    <!-- Display settings.  Screen color. -->
-    <string name="screencolor">Screen color</string>
-    <string name="screencolor_summary">Tune screen hue, saturation, contrast or intensity</string>
-    <string name="custom_screencolor">Custom screen color</string>
-    <string name="screencolor_save">Save</string>
-    <string name="screencolor_cancel">Cancel</string>
-    <string name="restore_preview">View default picture</string>
-    <string name="selectnewfile_menu">View new picture from Gallery</string>
-    <string name="selectfile_menu">View picture from Gallery</string>
-    <string name="restore_default_str">Reset</string>
-    <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string>
-    <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-    <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-    <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
-
-    <string name="screen_color_standard">Standard</string>
-    <string name="screen_color_vivid">Vivid</string>
-    <string name="screen_color_custom">Custom</string>
-
     <!-- LiveDisplay -->
     <string name="live_display_title" translatable="false">LiveDisplay</string>
     <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
diff --git a/res/values/config.xml b/res/values/config.xml
index a2ad7d0..69707e3 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -50,42 +50,6 @@
     <!-- Config to enable duplicate APN checking. When true, disallows adding new duplicate APNs -->
     <bool name="config_enable_duplicate_apn_checking">false</bool>
 
-    <!-- This used to define screen color's Hue progress bar minimum value -->
-    <integer name="minimum_hue_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's Hue progress bar maximum value-->
-    <integer name="maximum_hue_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's Hue progress bar default value-->
-    <integer name="default_hue_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's saturation progress bar minimum value-->
-    <integer name="minimum_saturation_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's saturation progress bar maximum value-->
-    <integer name="maximum_saturation_value" translatable="false">360</integer>
-
-    <!-- This is used to define screen color's saturation progress bar default value-->
-    <integer name="default_saturation_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's intensity progress bar minimum value-->
-    <integer name="minimum_intensity_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's intensity progress bar maximum value-->
-    <integer name="maximum_intensity_value" translatable="false">400</integer>
-
-    <!-- This is used to define screen color's intensity progress bar default value-->
-    <integer name="default_intensity_value" translatable="false">200</integer>
-
-    <!-- This is used to define screen color's contrast progress bar minimum value-->
-    <integer name="minimum_contrast_value" translatable="false">0</integer>
-
-    <!-- This is used to define screen color's contrast progress bar default value-->
-    <integer name="default_contrast_value" translatable="false">180</integer>
-
-    <!-- This is used to define screen color's contrast progress bar maximum value-->
-    <integer name="maximum_contrast_value" translatable="false">360</integer>
-
     <!-- Metrics server endpoints -->
     <string name="stats_cm_url">https://stats.cyanogenmod.org/submit</string>
     <string name="stats_cyanogen_url">https://shopvac.cyngn.com/community/heartbeat</string>
diff --git a/src/com/android/display/IPPService.aidl b/src/com/android/display/IPPService.aidl
deleted file mode 100644
index c934efe..0000000
--- a/src/com/android/display/IPPService.aidl
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.android.display;
-interface IPPService {
-    boolean startPP();
-    boolean stopPP();
-    boolean updateHSIC(int h, int s, int i, int c);
-    boolean getPPStatus();
-}
diff --git a/src/com/android/settings/CustomScreenColor.java b/src/com/android/settings/CustomScreenColor.java
deleted file mode 100644
index 2d6c7c2..0000000
--- a/src/com/android/settings/CustomScreenColor.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-
-public class CustomScreenColor extends Activity implements SeekBar.OnSeekBarChangeListener,
-        View.OnClickListener {
-    private final static String TAG = "CustomScreenColor";
-
-    private static final int RESTORE_DEFAULT_PREVIEW = 0;
-    private static final int SELECT_NEW_FILE_ITEM = 1;
-    private static final int SELECT_FILE_ITEM = 2;
-    private static final int RESET = 3;
-    private static final int SELECT_FILE_GROUP1 = 0;
-    private static final int SELECT_FILE_GROUP2 = 1;
-    private static final int SELECT_FILE_ORDER = 0;
-    private static final int REQUEST_SELECT_FILE = 100;
-    private static final String IMAGE_UNSPECIFIED = "image/*";
-    private static final String PREVIEW_STRING_KEY = "screencolor_preview_key";
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-    private static final String COLOR_HUE = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY = "intensity";
-    private static final String COLOR_CONTRAST = "contrast";
-
-    private static final String KEY_ASPECT_X = "aspectX";
-    private static final String KEY_ASPECT_Y = "aspectY";
-    private static final String KEY_SPOTLIGHT_X = "spotlightX";
-    private static final String KEY_SPOTLIGHT_Y = "spotlightY";
-    private static final String KEY_FROME_SCREENCOLOR = "fromScreenColor";
-
-    private ImageView mImageView;
-    private RelativeLayout mRLayout;
-    private LinearLayout mScreenColorLayout;
-    private SeekBar mHBar, mSBar, mCBar, mIBar;
-    private TextView mHTv, mSTv, mCTv, mITv;
-    private ImageView mReduceH, mIncreaseH, mReduceS, mIncreaseS, mReduceC, mIncreaseC, mReduceI,
-            mIncreaseI, mUpdown, mMore;
-    private Button mCancelBtn, mSaveBtn, mPreviousBtn, mNewBtn;
-    private boolean canRestorePreview;
-    private int mHueValue = 0;
-    private int mSaturationValue = 0;
-    private int mIntensityValue = 0;
-    private int mContrastValue = 0;
-
-    private int mMinHueValue = 0;
-    private int mMaxHueValue = 0;
-    private int mDefaultHueValue = 0;
-    private int mMinSaturationValue = 0;
-    private int mMaxSaturationValue = 0;
-    private int mDefaultSaturationValue = 0;
-    private int mMinIntensityValue = 0;
-    private int mMaxIntensityValue = 0;
-    private int mDefaultIntensityValue = 0;
-    private int mMinContrastValue = 0;
-    private int mMaxContrastValue = 0;
-    private int mDefaultContrastValue = 0;
-
-    /**
-     *  It is used to update the screen's hue, saturation, contrast, and intensity.
-     */
-    IPPService mPPService = null;
-    PPServiceConnection mPPServiceConn = null;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.custom_screencolor);
-        initView();
-        restoreSavedHSCI(true);
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-    }
-
-    @Override
-    protected void onPause() {
-        super.onPause();
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void initView() {
-        ActionBar actionBar = getActionBar();
-        actionBar.setDisplayHomeAsUpEnabled(true);
-
-        mMinHueValue = getResources().getInteger(R.integer.minimum_hue_value);
-        mMaxHueValue = getResources().getInteger(R.integer.maximum_hue_value);
-        mDefaultHueValue = getResources().getInteger(R.integer.default_hue_value);
-        mMinSaturationValue = getResources().getInteger(R.integer.minimum_saturation_value);
-        mMaxSaturationValue = getResources().getInteger(R.integer.maximum_saturation_value);
-        mDefaultSaturationValue = getResources().getInteger(R.integer.default_saturation_value);
-        mMinIntensityValue = getResources().getInteger(R.integer.minimum_intensity_value);
-        mMaxIntensityValue = getResources().getInteger(R.integer.maximum_intensity_value);
-        mDefaultIntensityValue = getResources().getInteger(R.integer.default_intensity_value);
-        mMinContrastValue = getResources().getInteger(R.integer.minimum_contrast_value);
-        mMaxContrastValue = getResources().getInteger(R.integer.maximum_contrast_value);
-        mDefaultContrastValue = getResources().getInteger(R.integer.default_contrast_value);
-
-        mRLayout = (RelativeLayout) findViewById(R.id.background_preview);
-        String previewContent = getScreenColorPreviewKey();
-        if ("".equals(previewContent)) {
-            resotreBackgroundByDefault();
-        } else {
-            Uri previewUri = Uri.parse(previewContent);
-            setBackgroundByUri(previewUri);
-        }
-
-        mScreenColorLayout = (LinearLayout) findViewById(R.id.screencolor_control);
-        mScreenColorLayout.setBackgroundColor(R.color.screencolor_background);
-        mScreenColorLayout.setOnClickListener(this);
-
-        mHBar = (SeekBar) findViewById(R.id.hcontrol);
-        mHBar.setMax(mMaxHueValue);
-        mHBar.setOnSeekBarChangeListener(this);
-        mSBar = (SeekBar) findViewById(R.id.scontrol);
-        mSBar.setMax(mMaxSaturationValue);
-        mSBar.setOnSeekBarChangeListener(this);
-        mIBar = (SeekBar) findViewById(R.id.icontrol);
-        mIBar.setMax(mMaxIntensityValue);
-        mIBar.setOnSeekBarChangeListener(this);
-        mCBar = (SeekBar) findViewById(R.id.ccontrol);
-        mCBar.setMax(mMaxContrastValue);
-        mCBar.setOnSeekBarChangeListener(this);
-
-        mHTv = (TextView) findViewById(R.id.hue);
-        mHTv.setText(getString(R.string.hue_str, mHBar.getProgress()));
-        mSTv = (TextView) findViewById(R.id.saturation);
-        mSTv.setText(getString(R.string.saturation_str, mSBar.getProgress()));
-        mITv = (TextView) findViewById(R.id.intensity);
-        mITv.setText(getString(R.string.intensity_str, mIBar.getProgress()));
-        mCTv = (TextView) findViewById(R.id.contrast);
-        mCTv.setText(getString(R.string.contrast_str, mCBar.getProgress()));
-
-        mReduceH = (ImageView) findViewById(R.id.reduce_hue);
-        mReduceH.setOnClickListener(this);
-        mIncreaseH = (ImageView) findViewById(R.id.increase_hue);
-        mIncreaseH.setOnClickListener(this);
-        mReduceS = (ImageView) findViewById(R.id.reduce_saturation);
-        mReduceS.setOnClickListener(this);
-        mIncreaseS = (ImageView) findViewById(R.id.increase_saturation);
-        mIncreaseS.setOnClickListener(this);
-        mReduceI = (ImageView) findViewById(R.id.reduce_intensity);
-        mReduceI.setOnClickListener(this);
-        mIncreaseI = (ImageView) findViewById(R.id.increase_intensity);
-        mIncreaseI.setOnClickListener(this);
-        mReduceC = (ImageView) findViewById(R.id.reduce_contrast);
-        mReduceC.setOnClickListener(this);
-        mIncreaseC = (ImageView) findViewById(R.id.increase_contrast);
-        mIncreaseC.setOnClickListener(this);
-
-        mUpdown = (ImageView) findViewById(R.id.up_down);
-        mUpdown.setOnClickListener(this);
-        mMore = (ImageView) findViewById(R.id.more);
-        mMore.setOnClickListener(this);
-
-        mPreviousBtn = (Button) findViewById(R.id.previous_btn);
-        mPreviousBtn.setOnClickListener(this);
-        mNewBtn = (Button) findViewById(R.id.new_btn);
-        mNewBtn.setOnClickListener(this);
-        mCancelBtn = (Button) findViewById(R.id.cancel);
-        mCancelBtn.setOnClickListener(this);
-        mSaveBtn = (Button) findViewById(R.id.save);
-        mSaveBtn.setOnClickListener(this);
-
-        initBtnsStatus();
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        boolean ret = bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    restoreSavedHSCI(true);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                // end thread
-                try {
-                    Log.d(TAG, "stopPP");
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (resultCode != RESULT_OK) {
-            Log.i(TAG, "bail due to resultCode=" + resultCode);
-            return;
-        }
-        switch (requestCode) {
-            case REQUEST_SELECT_FILE:
-                changePreviewByData(data);
-                break;
-            default:
-                break;
-        }
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        menu.add(SELECT_FILE_GROUP1, SELECT_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectfile_menu);
-        menu.add(SELECT_FILE_GROUP1, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        menu.add(SELECT_FILE_GROUP2, RESTORE_DEFAULT_PREVIEW, SELECT_FILE_ORDER,
-                R.string.restore_preview);
-        menu.add(SELECT_FILE_GROUP2, SELECT_NEW_FILE_ITEM, SELECT_FILE_ORDER,
-                R.string.selectnewfile_menu);
-        menu.add(SELECT_FILE_GROUP2, RESET, SELECT_FILE_ORDER, R.string.restore_default_str);
-        return true;
-    }
-
-    @Override
-    public boolean onPrepareOptionsMenu(Menu menu) {
-        if (canRestorePreview) {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, false);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, true);
-        } else {
-            menu.setGroupVisible(SELECT_FILE_GROUP1, true);
-            menu.setGroupVisible(SELECT_FILE_GROUP2, false);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                break;
-            case SELECT_NEW_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case SELECT_FILE_ITEM:
-                selectPicFromGallery2();
-                break;
-            case RESTORE_DEFAULT_PREVIEW:
-                resotreBackgroundByDefault();
-                break;
-            case RESET:
-                restoreDefaultHSCI();
-                break;
-            default:
-                return true;
-        }
-        return false;
-    }
-
-    public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
-        setNewBtnHighlight();
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mHueValue = progress;
-                //The screen hue display value varies from -180 to 180.
-                mHTv.setText(getString(R.string.hue_str, progress - 180));
-                break;
-            case R.id.scontrol:
-                mSaturationValue = progress;
-                //Change the saturation display value varies from (-180, 180) to (-1.0, 1.0).
-                mSTv.setText(getString(R.string.saturation_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.ccontrol:
-                mContrastValue = progress;
-                //Change the contrast display value varies from (-180, 180) to (-1.0, 1.0).
-                mCTv.setText(getString(R.string.contrast_str,
-                        ((int) (((progress - 180) * 100) / 180.0)) / 100.0));
-                break;
-            case R.id.icontrol:
-                mIntensityValue = progress;
-                //The screen intensity display value varies from -200 to 200.
-                mITv.setText(getString(R.string.intensity_str, progress - 200));
-                break;
-            default:
-                break;
-
-        }
-        Log.i(TAG, "onProgressChanged mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mNewContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                                     mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    public void onStartTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, true);
-    }
-
-    public void onStopTrackingTouch(SeekBar seekBar) {
-        setActivated(seekBar, false);
-    }
-
-    private void setActivated(SeekBar seekBar, boolean isActivated) {
-        int id = seekBar.getId();
-        switch (id) {
-            case R.id.hcontrol:
-                mReduceH.setActivated(isActivated);
-                mIncreaseH.setActivated(isActivated);
-                break;
-            case R.id.scontrol:
-                mReduceS.setActivated(isActivated);
-                mIncreaseS.setActivated(isActivated);
-                break;
-            case R.id.icontrol:
-                mReduceI.setActivated(isActivated);
-                mIncreaseI.setActivated(isActivated);
-                break;
-            case R.id.ccontrol:
-                mReduceC.setActivated(isActivated);
-                mIncreaseC.setActivated(isActivated);
-                break;
-            default:
-                break;
-        }
-
-    }
-
-    public void onClick(View v) {
-        int id = v.getId();
-
-        switch (id) {
-            case R.id.cancel:
-                restoreSavedHSCI(false);
-                finish();
-                break;
-            case R.id.save:
-                saveHSCI();
-                break;
-            case R.id.previous_btn:
-                previousOrNewHSCI(true);
-                break;
-            case R.id.new_btn:
-                previousOrNewHSCI(false);
-                break;
-            case R.id.up_down:
-                upDownHSCISettingLayout();
-                break;
-            case R.id.more:
-                showMoreMenus();
-                break;
-            case R.id.reduce_hue:
-                mHBar.setProgress((mHueValue - 1 > mMinHueValue) ? (mHueValue - 1) : mMinHueValue);
-                break;
-            case R.id.increase_hue:
-                mHBar.setProgress((mHueValue + 1 < mMaxHueValue) ? (mHueValue + 1) : mMaxHueValue);
-                break;
-            case R.id.reduce_saturation:
-                mSBar.setProgress((mSaturationValue - 1 > mMinSaturationValue) ?
-                    (mSaturationValue - 1) : mMinSaturationValue);
-                break;
-            case R.id.increase_saturation:
-                mSBar.setProgress((mSaturationValue + 1 < mMaxSaturationValue) ?
-                    (mSaturationValue + 1) : mMaxSaturationValue);
-                break;
-            case R.id.reduce_intensity:
-                mIBar.setProgress((mIntensityValue - 1 > mMinIntensityValue) ?
-                    (mIntensityValue - 1) : mMinIntensityValue);
-                break;
-            case R.id.increase_intensity:
-                mIBar.setProgress((mIntensityValue + 1 < mMaxIntensityValue) ?
-                    (mIntensityValue + 1) : mMaxIntensityValue);
-                break;
-            case R.id.reduce_contrast:
-                mCBar.setProgress((mContrastValue - 1 > mMinContrastValue) ?
-                    (mContrastValue - 1) : mMinContrastValue);
-                break;
-            case R.id.increase_contrast:
-                mCBar.setProgress((mContrastValue + 1 < mMaxContrastValue) ?
-                    (mContrastValue + 1) : mMaxContrastValue);
-                break;
-            default:
-                break;
-        }
-    }
-
-    private void selectPicFromGallery2() {
-        Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.setType("image/*");
-        startActivityForResult(intent, REQUEST_SELECT_FILE);
-    }
-
-    private void restoreDefaultHSCI() {
-        mHBar.setProgress(mDefaultHueValue);
-        mSBar.setProgress(mDefaultSaturationValue);
-        mIBar.setProgress(mDefaultIntensityValue);
-        mCBar.setProgress(mDefaultContrastValue);
-        setNewBtnHighlight();
-    }
-
-    private void restoreSavedHSCI(boolean setProgress) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE);
-        int hueValue = share.getInt(COLOR_HUE, mDefaultHueValue);
-        int saturationValue = share.getInt(COLOR_SATURATION, mDefaultSaturationValue);
-        int intensityValue = share.getInt(COLOR_INTENSITY, mDefaultIntensityValue);
-        int contrastValue = share.getInt(COLOR_CONTRAST, mDefaultContrastValue);
-        if (setProgress) {
-            mHBar.setProgress(hueValue);
-            mSBar.setProgress(saturationValue);
-            mIBar.setProgress(intensityValue);
-            mCBar.setProgress(contrastValue);
-        }
-        Log.i(TAG, "restoreSavedHSCI hueValue=" + hueValue + " saturationValue=" + saturationValue
-                + " contrastValue=" + contrastValue + " intensityValue=" + intensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hueValue, saturationValue, intensityValue, contrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void previewNewHSIC() {
-        mHBar.setProgress(mHueValue);
-        mSBar.setProgress(mSaturationValue);
-        mIBar.setProgress(mIntensityValue);
-        mCBar.setProgress(mContrastValue);
-        Log.i(TAG, "previewNewHSIC mHueValue=" + mHueValue + " mSaturationValue="
-                + mSaturationValue + " mContrastValue=" + mContrastValue + " mIntensityValue="
-                + mIntensityValue);
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(mHueValue, mSaturationValue, mIntensityValue,
-                        mContrastValue);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    private void setNewBtnHighlight() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-        mPreviousBtn.setEnabled(true);
-        mNewBtn.setEnabled(true);
-        mSaveBtn.setEnabled(true);
-
-    }
-
-    private void initBtnsStatus() {
-        mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_dis);
-        mNewBtn.setBackgroundResource(R.drawable.ic_new_dis);
-        mPreviousBtn.setEnabled(false);
-        mNewBtn.setEnabled(false);
-        mSaveBtn.setEnabled(false);
-    }
-
-    private void previousOrNewHSCI(boolean isPrevious) {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        }
-        if (isPrevious) {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_glow);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_default);
-            mUpdown.setVisibility(View.GONE);
-            mMore.setVisibility(View.GONE);
-            restoreSavedHSCI(false);
-        } else {
-            mPreviousBtn.setBackgroundResource(R.drawable.ic_previous_default);
-            mNewBtn.setBackgroundResource(R.drawable.ic_new_glow);
-            mUpdown.setVisibility(View.VISIBLE);
-            mMore.setVisibility(View.VISIBLE);
-            previewNewHSIC();
-        }
-    }
-
-    private void saveHSCI() {
-        // TODO save HSCI values.
-        saveHSICPreference(mHueValue, mSaturationValue, mIntensityValue, mContrastValue);
-        finish();
-    }
-
-    private void changePreviewByData(Intent data) {
-        if (data != null) {
-            Uri uri = data.getData();
-            setBackgroundByUri(uri);
-            savePreviewKey(uri.toString());
-        }
-    }
-
-    private void setBackgroundByUri(Uri uri) {
-        InputStream is = null;
-        try {
-            is = getContentResolver().openInputStream(uri);
-            BitmapFactory.Options opts = new BitmapFactory.Options();
-            opts.inJustDecodeBounds = true;
-            BitmapFactory.decodeStream(is, null, opts);
-            is.close();
-            is = getContentResolver().openInputStream(uri);
-            opts.inJustDecodeBounds = false;
-            opts.inSampleSize = calculateInSampleSize(opts,
-                    mRLayout.getWidth(), mRLayout.getHeight());
-            Bitmap bm = BitmapFactory.decodeStream(is, null, opts);
-            BitmapDrawable bd = new BitmapDrawable(bm);
-            mRLayout.setBackgroundDrawable(bd);
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            if (is != null) {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        canRestorePreview = true;
-    }
-
-    public static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth, int reqHeight) {
-        // Raw height and width of image
-        final int height = options.outHeight;
-        final int width = options.outWidth;
-        int inSampleSize = 1;
-
-        if (height > reqHeight || width > reqWidth) {
-
-            final int halfHeight = height / 2;
-            final int halfWidth = width / 2;
-
-            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-            // height and width larger than the requested height and width.
-            while ((halfHeight / inSampleSize) > reqHeight
-                    && (halfWidth / inSampleSize) > reqWidth) {
-                inSampleSize *= 2;
-            }
-        }
-
-        return inSampleSize;
-    }
-
-    private void resotreBackgroundByDefault() {
-        mRLayout.setBackgroundResource(R.drawable.default_screencolor_setting);
-        savePreviewKey("");
-        canRestorePreview = false;
-    }
-
-    // use sharepreference to save preview image.
-    private void savePreviewKey(String value) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putString(PREVIEW_STRING_KEY, value);
-        editor.commit();
-    }
-
-    private void saveHSICPreference(int h, int s, int i, int c) {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        Editor editor = share.edit();
-        editor.putInt(COLOR_HUE, h);
-        editor.putInt(COLOR_SATURATION, s);
-        editor.putInt(COLOR_INTENSITY, i);
-        editor.putInt(COLOR_CONTRAST, c);
-        editor.commit();
-    }
-
-    private String getScreenColorPreviewKey() {
-        SharedPreferences share = getSharedPreferences(PREVIEW_STRING_NAME,
-                Context.MODE_WORLD_WRITEABLE | Context.MODE_WORLD_READABLE);
-        return share.getString(PREVIEW_STRING_KEY, "");
-    }
-
-    private void upDownHSCISettingLayout() {
-        if (View.GONE != mScreenColorLayout.getVisibility()) {
-            mScreenColorLayout.setVisibility(View.GONE);
-            mUpdown.setBackgroundResource(R.drawable.up_button);
-        } else {
-            mScreenColorLayout.setVisibility(View.VISIBLE);
-            mUpdown.setBackgroundResource(R.drawable.down_button);
-        }
-    }
-
-    private void showMoreMenus() {
-        PopupMenu popup = new PopupMenu(CustomScreenColor.this, mMore);
-        Menu menu = popup.getMenu();
-        popup.getMenuInflater().inflate(R.menu.screencolor_more, menu);
-
-        if (canRestorePreview) {
-            menu.removeItem(R.id.selectfile_menu);
-        } else {
-            menu.removeItem(R.id.restore_preview);
-            menu.removeItem(R.id.selectnewfile_menu);
-        }
-
-        popup.setOnMenuItemClickListener(new MyMenuItemclick());
-        popup.show();
-    }
-
-    private class MyMenuItemclick implements OnMenuItemClickListener {
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.restore_preview:
-                    resotreBackgroundByDefault();
-                    return true;
-                case R.id.selectnewfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.selectfile_menu:
-                    selectPicFromGallery2();
-                    return true;
-                case R.id.restore_default_str:
-                    restoreDefaultHSCI();
-                    return true;
-            }
-            return true;
-        }
-    }
-}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index ef7f9c3..f01f1e8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -52,8 +52,6 @@ import android.app.UiModeManager;
 import android.app.admin.DevicePolicyManager;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.hardware.Sensor;
diff --git a/src/com/android/settings/ScreenColorSettings.java b/src/com/android/settings/ScreenColorSettings.java
deleted file mode 100644
index 4d4caaa..0000000
--- a/src/com/android/settings/ScreenColorSettings.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/*
-   Copyright (c) 2014, The Linux Foundation. All Rights Reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
-    * Neither the name of The Linux Foundation nor the names of its
-      contributors may be used to endorse or promote products derived
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-package com.android.settings;
-
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-
-import android.app.ActionBar;
-import android.app.Activity;
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.SharedPreferences;
-import android.content.SharedPreferences.Editor;
-import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
-import android.graphics.drawable.BitmapDrawable;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.os.RemoteException;
-import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.Button;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
-import android.widget.PopupMenu;
-import android.widget.RadioButton;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RadioGroup;
-import android.widget.RelativeLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-import android.widget.PopupWindow;
-
-import com.android.display.IPPService;
-
-public class ScreenColorSettings extends Activity {
-    private final static String TAG = "ScreenColorSettings";
-    private final static boolean DEBUG = false;
-
-    private final static int MODE_STANDARD = 0;
-    private final static int MODE_VIVID    = 1;
-    private final static int MODE_CUSTOM   = 2;
-
-    private static final String COLOR_MODE       = "mode";
-    private static final String COLOR_HUE        = "hue";
-    private static final String COLOR_SATURATION = "saturation";
-    private static final String COLOR_INTENSITY  = "intensity";
-    private static final String COLOR_CONTRAST   = "contrast";
-
-    private static final String PREVIEW_STRING_NAME = "screencolor_preview_name";
-
-    private int mMode = 0;
-    private IPPService mPPService = null;
-    private PPServiceConnection mPPServiceConn = null;
-    private SharedPreferences mSharedPreference;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        initPPService();
-        getWindow().requestFeature(Window.FEATURE_ACTION_BAR);
-        setContentView(R.layout.screencolor_settings);
-
-        ListView listView = (ListView)findViewById(R.id.mode_list);
-        listView.setBackgroundColor(R.color.screencolor_background);
-        mSharedPreference = getSharedPreferences(PREVIEW_STRING_NAME, Context.MODE_PRIVATE);
-        mMode = mSharedPreference.getInt(COLOR_MODE, 0);
-        setScreenColorMode(mMode);
-        String[] list = getResources().getStringArray(R.array.screen_color_setting);
-        ColorModeAdaper adapter = new ColorModeAdaper(this,
-                R.layout.screen_color_item, list);
-        listView.setAdapter(adapter);
-    }
-
-    private class ColorModeAdaper extends ArrayAdapter<String> {
-        private int mResource;
-        private RelativeLayout mItemView;
-
-        public ColorModeAdaper(Context context, int resource, String[] list) {
-            super(context, resource, list);
-            this.mResource = resource;
-        }
-
-        @Override
-        public View getView(int position, View convertView, ViewGroup parent) {
-            String name = getItem(position);
-            if(convertView == null) {
-                mItemView = new RelativeLayout(getContext());
-                LayoutInflater vi = (LayoutInflater)getContext()
-                        .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-                vi.inflate(mResource, mItemView, true);
-            } else {
-                mItemView = (RelativeLayout) convertView;
-            }
-            ((TextView) mItemView.findViewById(android.R.id.title)).setText(name);
-
-            RadioButton radioButton = (RadioButton) mItemView.findViewById(android.R.id.button1);
-            ImageView setting = (ImageView) mItemView.findViewById(android.R.id.button2);
-            if (mMode == position) {
-                radioButton.setChecked(true);
-                setting.setEnabled(true);
-            } else {
-                radioButton.setChecked(false);
-                setting.setEnabled(false);
-            }
-
-            if (position != getCount()-1) {
-                ((ImageView) mItemView.findViewById(R.id.divider)).setVisibility(View.INVISIBLE);
-                setting.setVisibility(View.INVISIBLE);
-            } else {
-                setting.setOnClickListener(new OnClickListener () {
-                    @Override
-                    public void onClick(View v) {
-                        Intent intent = new Intent();
-                        intent.setClass(ScreenColorSettings.this, CustomScreenColor.class);
-                        startActivity(intent);
-                    }});
-            }
-
-            View v = mItemView.findViewById(R.id.widget_frame);
-            v.setTag(position);
-            v.setOnClickListener(new OnClickListener () {
-                @Override
-                public void onClick(View v) {
-                    int mode = (Integer)(v.getTag());
-                    setScreenColorMode(mode);
-                    notifyDataSetChanged();
-                }});
-            return mItemView;
-        }
-    }
-
-    private void initPPService() {
-        mPPServiceConn = new PPServiceConnection();
-        String packetname = "com.qualcomm.display";
-        String service = "com.qualcomm.display.PPService";
-        Intent i = new Intent(IPPService.class.getName());
-
-        ComponentName component = new ComponentName(packetname, service);
-        i.setComponent(component);
-
-        bindService(i, mPPServiceConn, Context.BIND_AUTO_CREATE);
-    }
-
-    private class PPServiceConnection implements ServiceConnection {
-
-        @Override
-        public void onServiceConnected(ComponentName name, IBinder service) {
-            mPPService = IPPService.Stub.asInterface((IBinder) service);
-            if (DEBUG) Log.d(TAG, "onServiceConnected, service=" + mPPService);
-            try {
-                if (null != mPPService) {
-                    mPPService.startPP();
-                    setScreenColorMode(mMode);
-                }
-            } catch (RemoteException e) {
-                Log.e(TAG, "startPP exception");
-            }
-        }
-
-        @Override
-        public void onServiceDisconnected(ComponentName name) {
-            if (null != mPPService) {
-                try {
-                    mPPService.stopPP();
-                } catch (RemoteException e) {
-                    Log.e(TAG, "stopPP exception");
-                }
-            }
-            mPPService = null;
-        }
-
-    }
-
-    private void setScreenColorMode(int mode) {
-        if (DEBUG) Log.i(TAG, "setScreenColorMode mode = " + mode);
-        int hue = 0;
-        int saturation = 0;
-        int intensity = 0;
-        int contrast = 0;
-        switch (mode) {
-            case MODE_STANDARD:
-                hue = 180;
-                saturation = 180;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_VIVID:
-                hue = 180;
-                saturation = 210;
-                intensity = 255;
-                contrast = 180;
-                break;
-            case MODE_CUSTOM:
-                hue = mSharedPreference.getInt(COLOR_HUE, 180);
-                saturation = mSharedPreference.getInt(COLOR_SATURATION, 180);
-                intensity = mSharedPreference.getInt(COLOR_INTENSITY, 255);
-                contrast = mSharedPreference.getInt(COLOR_CONTRAST, 180);
-                break;
-            default:
-                break;
-        }
-        saveModeValue(mode);
-        updateHSCIValue(hue, saturation, intensity, contrast);
-    }
-
-    private void updateHSCIValue(int hue, int saturation, int intensity, int contrast) {
-        try {
-            if (null != mPPService && mPPService.getPPStatus()) {
-                mPPService.updateHSIC(hue, saturation, intensity, contrast);
-            }
-        } catch (RemoteException e) {
-            Log.e(TAG, "updateHSIC exception");
-        }
-    }
-
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        unbindService(mPPServiceConn);
-    }
-
-    private void saveModeValue(int mode) {
-        mMode = mode;
-        Editor editor = mSharedPreference.edit();
-        editor.putInt(COLOR_MODE, mode);
-        editor.commit();
-    }
-}
-- 
cgit v1.1


From e6a33946a6684b0ab8e7540c6276cca5486c3c0d Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 7 Aug 2016 19:27:42 -0700
Subject: Automatic translation import

Change-Id: I9b865e55bc5b3b50b7a41567eb8099719d66d2e3
Ticket: -
---
 res/values-cs/cm_strings.xml     |  2 ++
 res/values-hr/cm_strings.xml     |  4 ++--
 res/values-it/cm_strings.xml     |  2 ++
 res/values-nb/cm_strings.xml     | 12 +++++++-----
 res/values-pl/cm_strings.xml     |  1 -
 res/values-zh-rCN/cm_strings.xml |  3 +++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 12dbaec..603102a 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -550,6 +550,7 @@
   <string name="volume_adjust_sounds_title">Zvuk při změně hlasitosti</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzita vibrací</string>
+  <string name="vibrator_warning">Nedoporučuje se použít hodnoty větší než %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Barevná kalibrace</string>
   <string name="color_calibration_summary">Kalibrovat barvy obrazovky</string>
@@ -1068,4 +1069,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">levá strana</string>
   <string name="security_settings_fingerprint_sensor_location_right">pravá strana</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Hlas: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 759ffd0..ff8263c 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -687,7 +687,7 @@
   <string name="status_bar_title">Statusna traka</string>
   <string name="status_bar_toggle_brightness">Kontrola svjetline</string>
   <string name="status_bar_toggle_brightness_summary">Prilagodite svjetlinu klizanjem po statusnoj traci</string>
-  <string name="status_bar_notif_count_title">Pokaži broj obavijesti</string>
+  <string name="status_bar_notif_count_title">Prikaži broj obavijesti</string>
   <string name="status_bar_notif_count_summary">Prikaži broj neriješenih obavijesti</string>
   <string name="status_bar_quick_qs_pulldown_title">Brzo potezanje</string>
   <string name="status_bar_quick_qs_pulldown_summary">%1$s rub trake stanja povlači dolje Brze postavke</string>
@@ -702,7 +702,7 @@
   <string name="status_bar_clock_style_left">Lijevi</string>
   <string name="status_bar_clock_style_center">Centar</string>
   <string name="status_bar_clock_style_hidden">Skriveno</string>
-  <string name="status_bar_am_pm_title">AM/PM stil</string>
+  <string name="status_bar_am_pm_title">Stil AM/PM-a</string>
   <string name="status_bar_am_pm_info">24-satni oblik je omogućen</string>
   <string name="status_bar_am_pm_normal">Normalno</string>
   <string name="status_bar_am_pm_small">Malen</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 7657949..b3043e5 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Suono regolazione volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensità vibrazione</string>
+  <string name="vibrator_warning">I valori superiori a %1$d%% non sono consigliati</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Calibrazione colore</string>
   <string name="color_calibration_summary">Calibra i colori dello schermo</string>
@@ -1070,4 +1071,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">sinistra</string>
   <string name="security_settings_fingerprint_sensor_location_right">destra</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voce: <xliff:g id="voice_status">%1$s</xliff:g> / Dati: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index cd404e8..30ba450 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -220,7 +220,7 @@
   <!-- Navigation Bar -->
   <string name="navigation_bar_category">Navigasjonsfelt</string>
   <string name="navigation_bar_left_title">Venstrehendt modus</string>
-  <string name="navigation_bar_left_summary">Plass navigasjonsfeltet til venstre på skjermen i liggende modus</string>
+  <string name="navigation_bar_left_summary">Plasser navigasjonsfeltet til venstre på skjermen i liggende modus</string>
   <string name="navigation_bar_title">Knapper og oppsett</string>
   <string name="navigation_bar_help_text">For å komme i gang trykk redigeringsikonet for å låse navigasjonsfeltet for endring.\n\nDu kan trykke på et ikon for å endre dens snarvei eller langt trykk på et ikon for å re-arrangere layout.\n\nTrykk lagre for å lagre endringene, eller gjenopprette for å tilbakestille oppsettet til standardinnstillingene.</string>
   <string name="navigation_restore_button_text">Gjenopprette\nstandard</string>
@@ -358,7 +358,7 @@
   <string name="app_ops_summaries_write_external_storage">skriv til ekstern lagring</string>
   <string name="app_ops_summaries_turn_screen_on">slå skjermen på</string>
   <string name="app_ops_summaries_get_accounts">få kontoer</string>
-  <string name="app_ops_summaries_toggle_wifi">aktivere/deaktivere Wifi</string>
+  <string name="app_ops_summaries_toggle_wifi">slå av/på WiFi</string>
   <string name="app_ops_summaries_toggle_bluetooth">veksle bluetooth</string>
   <string name="app_ops_summaries_start_at_boot">start ved oppstart</string>
   <string name="app_ops_summaries_toggle_nfc">veksle NFC</string>
@@ -428,7 +428,7 @@
   <string name="app_ops_labels_write_external_storage">Skriv til ekstern lagring</string>
   <string name="app_ops_labels_turn_screen_on">Slå skjermen på</string>
   <string name="app_ops_labels_get_accounts">Få kontoer</string>
-  <string name="app_ops_labels_toggle_wifi">Aktivere/deaktivere Wifi</string>
+  <string name="app_ops_labels_toggle_wifi">Slå av/på WiFi</string>
   <string name="app_ops_labels_toggle_bluetooth">Veksle bluetooth</string>
   <string name="app_ops_labels_start_at_boot">Start ved oppstart</string>
   <string name="app_ops_labels_toggle_nfc">NFC av/på</string>
@@ -489,7 +489,7 @@
   <string name="power_end_call_title">Avslutt samtale</string>
   <string name="power_end_call_summary">Ved å trykke på strømknappen så vil samtalen avsluttes</string>
   <string name="swap_volume_buttons_title">Reorientere</string>
-  <string name="swap_volume_buttons_summary">Bytte volumknappene når skjermen er rotert</string>
+  <string name="swap_volume_buttons_summary">Tilpass volumknappene ettersom skjermen er rotert</string>
   <string name="button_wake_title">Vekke enheten</string>
   <string name="home_answer_call_title">Besvar anrop</string>
   <string name="home_answer_call_summary">Trykk på Hjem-knappen vil svare innkommende anrop</string>
@@ -549,6 +549,7 @@
   <string name="volume_adjust_sounds_title">Volum justeringslyd</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensitet</string>
+  <string name="vibrator_warning">Verdier høyere enn %1$d%% er ikke anbefalt</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Fargekalibrering</string>
   <string name="color_calibration_summary">Kalibrere skjermens farger</string>
@@ -685,7 +686,7 @@
   <!-- Status bar -->
   <string name="status_bar_title">Statuslinjen</string>
   <string name="status_bar_toggle_brightness">Lysstyrkekontroll</string>
-  <string name="status_bar_toggle_brightness_summary">Justere lysstyrken ved å skyve over på statuslinjen</string>
+  <string name="status_bar_toggle_brightness_summary">Juster lysstyrken ved å sveipe over statuslinjen</string>
   <string name="status_bar_notif_count_title">Vis antall varsler</string>
   <string name="status_bar_notif_count_summary">Vise antall ventende notifikasjoner</string>
   <string name="status_bar_quick_qs_pulldown_title">Rask rullegardinmeny</string>
@@ -1068,4 +1069,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">venstre siden</string>
   <string name="security_settings_fingerprint_sensor_location_right">høyre siden</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Stemme: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index fbd8f65..9fd9bf5 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -1030,7 +1030,6 @@
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">Pokaż pogodę</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Pokaż na ekranie blokady</string>
   <string name="app_notification_show_on_keyguard_summary">Pokaż powiadomienia z tej aplikacji na ekranie blokady</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 62eb4a3..fddadb4 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -17,6 +17,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <plurals name="show_dev_countdown_cm">
+    <item quantity="other">还需 <xliff:g id="step_count">%1$d</xliff:g> 步就可以启用开发者选项。</item>
+  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">您已经启用了开发者选项！</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-- 
cgit v1.1


From d47d2e4ff6972e262139f368a108ce8ac0b6577d Mon Sep 17 00:00:00 2001
From: Luis Vidal <lvidal@cyngn.com>
Date: Fri, 5 Aug 2016 12:54:12 -0700
Subject: Settings: Animate pin/pattern fragment only if available

To prevent NPE, check if the PIN/Pattern/Password confirmation
fragment is available before performing animation

Change-Id: I4ae78569f953daa6696e96c8318a0c059aaf3502
TICKET: HAM-1397
---
 .../android/settings/ConfirmDeviceCredentialBaseActivity.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
index d9af800..2d78de2 100644
--- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
+++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
@@ -92,11 +92,17 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
     }
 
     public void prepareEnterAnimation() {
-        getFragment().prepareEnterAnimation();
+        final ConfirmDeviceCredentialBaseFragment f = getFragment();
+        if (f != null) {
+            f.prepareEnterAnimation();
+        }
     }
 
     public void startEnterAnimation() {
-        getFragment().startEnterAnimation();
+        final ConfirmDeviceCredentialBaseFragment f = getFragment();
+        if (f != null) {
+            f.startEnterAnimation();
+        }
     }
 
     /**
-- 
cgit v1.1


From 830a8464a067c022227344c95738bfe9e53fc526 Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Fri, 5 Aug 2016 09:11:44 +0200
Subject: Settings: Root appops access in developer settings

 * Allow users to directly access the root app settings,
    as the feature is mostly unknown and often a reason
    for users to try using alternatives to CM root

 * Use the appops extra intent to link the su tab,
    introduced in I79d963ecbadc624dc45a398387a348691318b6be

Change-Id: Ia5bc9d56fb11700b19d73336fad13c0a936091ff
Signed-off-by: Adrian DC <radian.dc@gmail.com>
---
 res/values/cm_strings.xml                         |  4 ++++
 res/xml/development_prefs.xml                     |  5 +++++
 src/com/android/settings/DevelopmentSettings.java | 21 +++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index d05ce40..7f7b290 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -41,6 +41,10 @@
     <string name="root_access_adb">ADB only</string>
     <string name="root_access_all">Apps and ADB</string>
 
+    <!-- Preference link for root appops -->
+    <string name="root_appops_title">Manage root accesses</string>
+    <string name="root_appops_summary">View and control the root rules</string>
+
     <!-- NFC PreferenceCategory title -->
     <string name="nfc_title_category">NFC</string>
 
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index a332ee5..c95cfb8 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -84,6 +84,11 @@
         android:title="@string/root_access"
         android:persistent="false" />
 
+    <Preference
+        android:key="root_appops"
+        android:title="@string/root_appops_title"
+        android:summary="@string/root_appops_summary" />
+
     <SwitchPreference
         android:key="update_recovery"
         android:title="@string/update_recovery_title"
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5ae3b1b..3666212 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -79,6 +79,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.android.internal.logging.MetricsLogger;
+import com.android.settings.Settings.AppOpsSummaryActivity;
 import com.android.settings.fuelgauge.InactiveApps;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
@@ -178,6 +179,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private static final String ROOT_ACCESS_KEY = "root_access";
     private static final String ROOT_ACCESS_PROPERTY = "persist.sys.root_access";
 
+    private static final String ROOT_APPOPS_KEY = "root_appops";
+
     private static final String UPDATE_RECOVERY_KEY = "update_recovery";
     private static final String UPDATE_RECOVERY_PROPERTY = "persist.sys.recovery_update";
 
@@ -292,6 +295,8 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
     private PreferenceScreen mDevelopmentTools;
     private ColorModePreference mColorModePreference;
 
+    private Preference mRootAppops;
+
     private SwitchPreference mAdvancedReboot;
 
     private SwitchPreference mUpdateRecovery;
@@ -477,6 +482,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
 
         mRootAccess = (ListPreference) findPreference(ROOT_ACCESS_KEY);
         mRootAccess.setOnPreferenceChangeListener(this);
+
+        mRootAppops = (Preference) findPreference(ROOT_APPOPS_KEY);
+        mRootAppops.setOnPreferenceClickListener(this);
+
         if (!removeRootOptionsIfRequired()) {
             if (isRootForAppsAvailable()) {
                 mRootAccess.setEntries(R.array.root_access_entries);
@@ -486,6 +495,7 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 mRootAccess.setEntryValues(R.array.root_access_values_adb);
             }
             mAllPrefs.add(mRootAccess);
+            mAllPrefs.add(mRootAppops);
         }
 
         mDevelopmentTools = (PreferenceScreen) findPreference(DEVELOPMENT_TOOLS);
@@ -841,6 +851,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         mRootAccess.setValue(value);
         mRootAccess.setSummary(getResources()
                 .getStringArray(R.array.root_access_entries)[Integer.valueOf(value)]);
+
+        if (mRootAppops != null) {
+            mRootAppops.setEnabled(isRootForAppsEnabled());
+        }
     }
 
     private boolean isRootForAppsAvailable() {
@@ -1910,6 +1924,13 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
                 preference == mTransitionAnimationScale ||
                 preference == mAnimatorDurationScale) {
             ((AnimationScalePreference) preference).click();
+        } else if (preference == mRootAppops) {
+            Activity mActivity = getActivity();
+            Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.putExtra("appops_tab", getString(R.string.app_ops_categories_su));
+            intent.setClass(mActivity, AppOpsSummaryActivity.class);
+            mActivity.startActivity(intent);
+            return true;
         }
         return false;
     }
-- 
cgit v1.1


From 3afcbcf7153e554f09657845aaa2f8164d13d7e7 Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Sat, 6 Aug 2016 00:18:09 +0200
Subject: Settings: Show only one tab on PrivacyGuard direct access

 * Allow an intent request to a specific tab to be isolated,
    giving access only to the expected settings

 * "Apps started on boot" opens only Bootup
 * "Manage root accesses" opens only Root Access

 * Related to the following commits
    Ia5bc9d56fb11700b19d73336fad13c0a936091ff
    I79d963ecbadc624dc45a398387a348691318b6be

Change-Id: I5a720fe2a8abe5fdf1a1b91c054d8b3a57d6cc5d
Signed-off-by: Adrian DC <radian.dc@gmail.com>
---
 .../android/settings/applications/AppOpsSummary.java   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 31641e2..faefb65 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -65,6 +65,7 @@ public class AppOpsSummary extends InstrumentedFragment {
     CharSequence[] mPageNames;
 
     int mCurPos;
+    int mPositionOffset;
 
     @Override
     protected int getMetricsCategory() {
@@ -81,12 +82,12 @@ public class AppOpsSummary extends InstrumentedFragment {
 
         @Override
         public Fragment getItem(int position) {
-            return new AppOpsCategory(mPageTemplates[position]);
+            return new AppOpsCategory(mPageTemplates[mPositionOffset + position]);
         }
 
         @Override
         public int getCount() {
-            return mPageTemplates.length;
+            return mPageNames.length;
         }
 
         @Override
@@ -135,19 +136,22 @@ public class AppOpsSummary extends InstrumentedFragment {
 
         mPageNames = getResources().getTextArray(R.array.app_ops_categories_cm);
 
-        int defaultTab = -1;
+        mPositionOffset = 0;
+
+        int specificTab = -1;
         Bundle bundle = getArguments();
         if (bundle != null) {
-            defaultTab = Arrays.asList(mPageNames).indexOf(bundle.getString("appops_tab", ""));
+            specificTab = Arrays.asList(mPageNames).indexOf(bundle.getString("appops_tab", ""));
+            if (specificTab >= 0) {
+                mPageNames = Arrays.copyOfRange(mPageNames, specificTab, specificTab + 1);
+                mPositionOffset = specificTab;
+            }
         }
 
         mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
         mAdapter = new MyPagerAdapter(getChildFragmentManager(),
                 filterTemplates(AppOpsState.ALL_TEMPLATES));
         mViewPager.setAdapter(mAdapter);
-        if (defaultTab >= 0) {
-            mViewPager.setCurrentItem(defaultTab);
-        }
         mViewPager.setOnPageChangeListener(mAdapter);
         PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
 
-- 
cgit v1.1


From 6817e26de1630c8385e1cb601fd75ec64888355a Mon Sep 17 00:00:00 2001
From: Scott Mertz <scott@cyngn.com>
Date: Thu, 11 Aug 2016 10:37:45 -0700
Subject: Settings: remove wifi hotspot timeout when hotspot settings are
 removed

Change-Id: Id69c58ab5227286922518fe11243bc2134d7f300
---
 src/com/android/settings/TetherSettings.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 92ad580..594dc68 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -170,6 +170,7 @@ public class TetherSettings extends SettingsPreferenceFragment
         } else {
             getPreferenceScreen().removePreference(mEnableWifiAp);
             getPreferenceScreen().removePreference(wifiApSettings);
+            getPreferenceScreen().removePreference(mHotspotInactivityTimeout);
         }
 
         if (!bluetoothAvailable) {
-- 
cgit v1.1


From b4bac9841a13c1ad747da3bc981993f0d6d67fd0 Mon Sep 17 00:00:00 2001
From: xiaognol <xiaognol@gmail.com>
Date: Tue, 14 Jun 2016 01:39:30 +0800
Subject: Settings:Fix mImsi null cause ApnSettings crash

mImsi may be "null" in some case,if we use "" instead may
 cause crash in ApnSettings&com.android.phone. so fix it
to use old way to set Apn in that "null"  case.

Change-Id: I0119e9a3f58c688e0e271ae62f50484ad8a29da9
---
 src/com/android/settings/ApnSettings.java | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 0459a13..4bb836a 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -164,9 +164,6 @@ public class ApnSettings extends SettingsPreferenceFragment implements
                 SubscriptionManager.INVALID_SUBSCRIPTION_ID);
 
         mImsi = activity.getIntent().getStringExtra(EXTRA_IMSI);
-        if (mImsi == null) {
-            mImsi = "";
-        }
 
         mUm = (UserManager) getSystemService(Context.USER_SERVICE);
 
@@ -419,7 +416,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
 
         ContentValues values = new ContentValues();
         values.put(APN_ID, mSelectedKey);
-        if (TelephonyManager.getDefault().getPhoneCount() > 1) {
+        if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null) {
             Uri qUri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI,
                     String.valueOf(mSubscriptionInfo.getSubscriptionId()));
             qUri = Uri.withAppendedPath(qUri, mImsi);
@@ -433,7 +430,7 @@ public class ApnSettings extends SettingsPreferenceFragment implements
         String key = null;
 
         Uri uri;
-        if (TelephonyManager.getDefault().getPhoneCount() > 1) {
+        if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null)  {
             uri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI,
                     String.valueOf(mSubscriptionInfo.getSubscriptionId()));
             uri = Uri.withAppendedPath(uri, mImsi);
-- 
cgit v1.1


From a0c695b831df29c47fa0fd32c232490c3d51ba2c Mon Sep 17 00:00:00 2001
From: Roman Birg <roman@cyngn.com>
Date: Wed, 10 Aug 2016 12:42:07 -0700
Subject: Settings: move high touch sensitivity setting to Display

For devices that support this feature, it makes sense to place this
under display settings as most people wouldn't look under language.

Ticket: CYNGNOS-3250
Change-Id: Ib99f5e8c5f0f2bdae7b5b5f788a364a1d63aa146
Signed-off-by: Roman Birg <roman@cyngn.com>
---
 res/xml/display.xml                                |  6 ++++
 res/xml/language_settings.xml                      |  6 ----
 src/com/android/settings/DisplaySettings.java      | 42 ++++++++++++++++++++++
 .../android/settings/cyanogenmod/BootReceiver.java |  2 ++
 .../InputMethodAndLanguageSettings.java            | 25 -------------
 5 files changed, 50 insertions(+), 31 deletions(-)

diff --git a/res/xml/display.xml b/res/xml/display.xml
index 0d1f965..14b44ea 100644
--- a/res/xml/display.xml
+++ b/res/xml/display.xml
@@ -80,6 +80,12 @@
                 android:defaultValue="true" />
 
         <SwitchPreference
+                android:key="high_touch_sensitivity"
+                android:title="@string/high_touch_sensitivity_title"
+                android:summary="@string/high_touch_sensitivity_summary"
+                android:defaultValue="false" />
+
+        <SwitchPreference
                 android:key="camera_gesture"
                 android:title="@string/camera_gesture_title"
                 android:summary="@string/camera_gesture_desc"
diff --git a/res/xml/language_settings.xml b/res/xml/language_settings.xml
index 2b35f2b..f6bcb60 100644
--- a/res/xml/language_settings.xml
+++ b/res/xml/language_settings.xml
@@ -133,12 +133,6 @@
                 android:persistent="false" />
 
         <SwitchPreference
-                android:key="high_touch_sensitivity"
-                android:title="@string/high_touch_sensitivity_title"
-                android:summary="@string/high_touch_sensitivity_summary"
-                android:defaultValue="false" />
-
-        <SwitchPreference
                 android:key="touchscreen_hovering"
                 android:title="@string/touchscreen_hovering_title"
                 android:summary="@string/touchscreen_hovering_summary"
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index f01f1e8..a434e97 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -20,6 +20,7 @@ import com.android.internal.logging.MetricsLogger;
 
 import android.app.AlertDialog;
 import android.content.DialogInterface;
+import android.content.SharedPreferences;
 import android.preference.CheckBoxPreference;
 
 import android.os.UserHandle;
@@ -83,6 +84,7 @@ import java.util.List;
 import com.android.settings.Utils;
 import com.android.settings.cyanogenmod.DisplayRotation;
 
+import cyanogenmod.hardware.CMHardwareManager;
 import cyanogenmod.hardware.LiveDisplayManager;
 import cyanogenmod.providers.CMSettings;
 
@@ -113,6 +115,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private static final String KEY_NOTIFICATION_LIGHT = "notification_light";
     private static final String KEY_BATTERY_LIGHT = "battery_light";
     private static final String KEY_LIVEDISPLAY = "live_display";
+    private static final String KEY_HIGH_TOUCH_SENSITIVITY = "high_touch_sensitivity";
 
     private static final int DLG_GLOBAL_CHANGE_WARNING = 1;
 
@@ -130,10 +133,13 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
     private SwitchPreference mLiftToWakePreference;
     private SwitchPreference mDozePreference;
     private SwitchPreference mTapToWakePreference;
+    private SwitchPreference mHighTouchSensitivity;
     private SwitchPreference mProximityCheckOnWakePreference;
     private SwitchPreference mAutoBrightnessPreference;
     private SwitchPreference mWakeWhenPluggedOrUnplugged;
 
+    private CMHardwareManager mHardware;
+
     private ContentObserver mAccelerometerRotationObserver =
             new ContentObserver(new Handler()) {
         @Override
@@ -164,6 +170,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         final ContentResolver resolver = activity.getContentResolver();
         addPreferencesFromResource(R.xml.display);
 
+        mHardware = CMHardwareManager.getInstance(activity);
+
         PreferenceCategory displayPrefs = (PreferenceCategory)
                 findPreference(KEY_CATEGORY_DISPLAY);
         PreferenceCategory interfacePrefs = (PreferenceCategory)
@@ -294,6 +302,16 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
             }
         }
 
+        mHighTouchSensitivity = (SwitchPreference) findPreference(KEY_HIGH_TOUCH_SENSITIVITY);
+        if (!mHardware.isSupported(
+                CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
+            displayPrefs.removePreference(mHighTouchSensitivity);
+            mHighTouchSensitivity = null;
+        } else {
+            mHighTouchSensitivity.setChecked(
+                    mHardware.get(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY));
+        }
+
         mProximityCheckOnWakePreference = (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE);
         boolean proximityCheckOnWake = getResources().getBoolean(
                 org.cyanogenmod.platform.internal.R.bool.config_proximityCheckOnWake);
@@ -677,6 +695,12 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
         } else if (preference == mAccelerometer) {
             RotationPolicy.setRotationLockForAccessibility(getActivity(),
                     !mAccelerometer.isChecked());
+        } else if (preference == mHighTouchSensitivity) {
+            boolean mHighTouchSensitivityEnable = mHighTouchSensitivity.isChecked();
+            CMSettings.System.putInt(getActivity().getContentResolver(),
+                    CMSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE,
+                    mHighTouchSensitivityEnable ? 1 : 0);
+            return true;
         }
 
         return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -796,6 +820,8 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
+                    final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
+
                     ArrayList<String> result = new ArrayList<String>();
                     if (!context.getResources().getBoolean(
                             com.android.internal.R.bool.config_dreamsSupported)) {
@@ -828,7 +854,23 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
                     }
+                    if (hardware.isSupported(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
+                        result.add(KEY_HIGH_TOUCH_SENSITIVITY);
+                    }
                     return result;
                 }
             };
+
+    public static void restore(Context context) {
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
+        final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
+        if (hardware.isSupported(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
+            final boolean enabled = prefs.getBoolean(KEY_HIGH_TOUCH_SENSITIVITY,
+                    hardware.get(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY));
+            CMSettings.System.putInt(context.getContentResolver(),
+                    CMSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE,
+                    enabled ? 1 : 0);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java
index 7bee75c..20190e6 100644
--- a/src/com/android/settings/cyanogenmod/BootReceiver.java
+++ b/src/com/android/settings/cyanogenmod/BootReceiver.java
@@ -23,6 +23,7 @@ import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
 import com.android.settings.ButtonSettings;
+import com.android.settings.DisplaySettings;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.contributors.ContributorsCloudFragment;
@@ -43,6 +44,7 @@ public class BootReceiver extends BroadcastReceiver {
             ButtonSettings.restoreKeyDisabler(ctx);
             VibratorIntensity.restore(ctx);
             InputMethodAndLanguageSettings.restore(ctx);
+            DisplaySettings.restore(ctx);
             setRestoredTunable(ctx);
         }
 
diff --git a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
index 1e7b35c..7c531da 100644
--- a/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
+++ b/src/com/android/settings/inputmethod/InputMethodAndLanguageSettings.java
@@ -93,7 +93,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
     private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";
     private static final String KEY_POINTER_SETTINGS_CATEGORY = "pointer_settings_category";
     private static final String KEY_PREVIOUSLY_ENABLED_SUBTYPES = "previously_enabled_subtypes";
-    private static final String KEY_HIGH_TOUCH_SENSITIVITY = "high_touch_sensitivity";
     private static final String KEY_TOUCHSCREEN_HOVERING = "touchscreen_hovering";
     private static final String KEY_TRACKPAD_SETTINGS = "gesture_pad_settings";
     private static final String KEY_STYLUS_GESTURES = "stylus_gestures";
@@ -115,7 +114,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
     private int mDefaultInputMethodSelectorVisibility = 0;
     private ListPreference mShowInputMethodSelectorPref;
     private SwitchPreference mStylusIconEnabled;
-    private SwitchPreference mHighTouchSensitivity;
     private SwitchPreference mTouchscreenHovering;
     private PreferenceCategory mKeyboardSettingsCategory;
     private PreferenceCategory mHardKeyboardCategory;
@@ -203,7 +201,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
 
         mStylusGestures = (PreferenceScreen) findPreference(KEY_STYLUS_GESTURES);
         mStylusIconEnabled = (SwitchPreference) findPreference(KEY_STYLUS_ICON_ENABLED);
-        mHighTouchSensitivity = (SwitchPreference) findPreference(KEY_HIGH_TOUCH_SENSITIVITY);
 
         mTouchscreenHovering = (SwitchPreference) findPreference(KEY_TOUCHSCREEN_HOVERING);
 
@@ -213,15 +210,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
                 pointerSettingsCategory.removePreference(mStylusIconEnabled);
             }
 
-            if (!mHardware.isSupported(
-                    CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
-                pointerSettingsCategory.removePreference(mHighTouchSensitivity);
-                mHighTouchSensitivity = null;
-            } else {
-                mHighTouchSensitivity.setChecked(
-                        mHardware.get(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY));
-            }
-
             if (!mHardware.isSupported(CMHardwareManager.FEATURE_TOUCH_HOVERING)) {
                 pointerSettingsCategory.removePreference(mTouchscreenHovering);
                 mTouchscreenHovering = null;
@@ -433,12 +421,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
         if (preference == mStylusIconEnabled) {
             Settings.System.putInt(getActivity().getContentResolver(),
                     Settings.System.STYLUS_ICON_ENABLED, mStylusIconEnabled.isChecked() ? 1 : 0);
-        } else if (preference == mHighTouchSensitivity) {
-            boolean mHighTouchSensitivityEnable = mHighTouchSensitivity.isChecked();
-            CMSettings.System.putInt(getActivity().getContentResolver(),
-                    CMSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE,
-                    mHighTouchSensitivityEnable ? 1 : 0);
-            return true;
         } else if (preference == mTouchscreenHovering) {
             boolean touchHoveringEnable = mTouchscreenHovering.isChecked();
             CMSettings.Secure.putInt(getActivity().getContentResolver(),
@@ -785,13 +767,6 @@ public class InputMethodAndLanguageSettings extends SettingsPreferenceFragment
     public static void restore(Context context) {
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         final CMHardwareManager hardware = CMHardwareManager.getInstance(context);
-        if (hardware.isSupported(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
-            final boolean enabled = prefs.getBoolean(KEY_HIGH_TOUCH_SENSITIVITY,
-                    hardware.get(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY));
-            CMSettings.System.putInt(context.getContentResolver(),
-                    CMSettings.System.HIGH_TOUCH_SENSITIVITY_ENABLE,
-                    enabled ? 1 : 0);
-        }
         if (hardware.isSupported(CMHardwareManager.FEATURE_TOUCH_HOVERING)) {
             final boolean enabled = prefs.getBoolean(KEY_TOUCHSCREEN_HOVERING,
                     hardware.get(CMHardwareManager.FEATURE_TOUCH_HOVERING));
-- 
cgit v1.1


From 29493037e28264a4284a8e4911084239d3721381 Mon Sep 17 00:00:00 2001
From: "blinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 13 Aug 2016 13:33:25 -0700
Subject: Automatic translation import

Change-Id: I4e7d6adaf0c00d032921fe688b3e9f742437c017
Ticket: -
---
 res/values-af/cm_strings.xml      | 13 ++++---------
 res/values-am/cm_strings.xml      |  3 ++-
 res/values-ar/cm_strings.xml      | 13 ++++---------
 res/values-as-rIN/cm_strings.xml  | 13 ++++---------
 res/values-ast-rES/cm_strings.xml | 13 ++++---------
 res/values-az-rAZ/cm_strings.xml  | 12 +++---------
 res/values-be/cm_strings.xml      | 13 ++++---------
 res/values-bg/cm_strings.xml      | 21 +++++++++++----------
 res/values-bn-rBD/cm_strings.xml  | 11 ++---------
 res/values-br-rFR/cm_strings.xml  |  3 ++-
 res/values-ca/cm_strings.xml      | 17 ++++++++---------
 res/values-cs/cm_strings.xml      | 13 ++++---------
 res/values-csb-rPL/cm_strings.xml |  3 ++-
 res/values-cy/cm_strings.xml      |  3 ++-
 res/values-da/cm_strings.xml      | 13 ++++---------
 res/values-de/cm_strings.xml      | 24 ++++++++++++------------
 res/values-el/cm_strings.xml      | 13 ++++---------
 res/values-en-rAU/cm_strings.xml  | 13 ++++---------
 res/values-en-rGB/cm_strings.xml  |  3 ++-
 res/values-en-rIN/cm_strings.xml  | 13 ++++---------
 res/values-en-rPT/cm_strings.xml  |  3 ++-
 res/values-eo/cm_strings.xml      | 13 ++++---------
 res/values-es-rMX/cm_strings.xml  |  3 ++-
 res/values-es-rUS/cm_strings.xml  | 13 ++++---------
 res/values-es/cm_strings.xml      | 13 ++++---------
 res/values-et-rEE/cm_strings.xml  | 22 +++++++++++++---------
 res/values-eu-rES/cm_strings.xml  | 29 +++++++++++++++--------------
 res/values-fa/cm_strings.xml      | 13 ++++---------
 res/values-fi/cm_strings.xml      | 21 ++++++++++++---------
 res/values-fil-rPH/cm_strings.xml |  3 ++-
 res/values-fr-rCA/cm_strings.xml  |  3 ++-
 res/values-fr/cm_strings.xml      | 13 ++++---------
 res/values-frp-rIT/cm_strings.xml |  3 ++-
 res/values-fy-rNL/cm_strings.xml  |  3 ++-
 res/values-gd-rGB/cm_strings.xml  |  3 ++-
 res/values-gl-rES/cm_strings.xml  |  3 ++-
 res/values-gu-rIN/cm_strings.xml  | 13 ++++---------
 res/values-hi/cm_strings.xml      | 13 ++++---------
 res/values-hr/cm_strings.xml      | 21 +++++++++++----------
 res/values-hu/cm_strings.xml      | 13 ++++---------
 res/values-hy-rAM/cm_strings.xml  |  3 ++-
 res/values-in/cm_strings.xml      | 17 ++++++-----------
 res/values-is-rIS/cm_strings.xml  |  3 ++-
 res/values-it/cm_strings.xml      | 19 ++++++++++---------
 res/values-iw/cm_strings.xml      | 13 ++++---------
 res/values-ja/cm_strings.xml      | 13 ++++---------
 res/values-ka-rGE/cm_strings.xml  |  3 ++-
 res/values-kk-rKZ/cm_strings.xml  |  3 ++-
 res/values-km-rKH/cm_strings.xml  |  3 ++-
 res/values-kn-rIN/cm_strings.xml  | 13 ++++---------
 res/values-ko/cm_strings.xml      | 13 ++++---------
 res/values-ku/cm_strings.xml      | 13 ++++---------
 res/values-ky-rKG/cm_strings.xml  |  3 ++-
 res/values-lb/cm_strings.xml      | 13 ++++---------
 res/values-lo-rLA/cm_strings.xml  |  3 ++-
 res/values-lt/cm_strings.xml      | 13 ++++---------
 res/values-lv/cm_strings.xml      | 11 ++---------
 res/values-mk-rMK/cm_strings.xml  |  3 ++-
 res/values-ml-rIN/cm_strings.xml  | 13 ++++---------
 res/values-mn-rMN/cm_strings.xml  |  3 ++-
 res/values-mr-rIN/cm_strings.xml  | 13 ++++---------
 res/values-ms-rMY/cm_strings.xml  |  3 ++-
 res/values-my-rMM/cm_strings.xml  |  3 ++-
 res/values-nb/cm_strings.xml      | 17 ++++++++---------
 res/values-ne-rNP/cm_strings.xml  |  3 ++-
 res/values-nl/cm_strings.xml      | 17 ++++++++---------
 res/values-oc-rFR/cm_strings.xml  |  3 ++-
 res/values-or-rIN/cm_strings.xml  | 13 ++++---------
 res/values-pa-rIN/cm_strings.xml  |  3 ++-
 res/values-pl/cm_strings.xml      | 13 ++++---------
 res/values-pt-rBR/cm_strings.xml  | 17 ++++++++---------
 res/values-pt-rPT/cm_strings.xml  | 13 ++++---------
 res/values-rm/cm_strings.xml      |  3 ++-
 res/values-ro/cm_strings.xml      | 13 ++++---------
 res/values-ru/cm_strings.xml      | 13 ++++---------
 res/values-si-rLK/cm_strings.xml  | 11 ++---------
 res/values-sk/cm_strings.xml      | 13 ++++---------
 res/values-sl/cm_strings.xml      | 24 +++++++++++++++---------
 res/values-sq-rAL/cm_strings.xml  |  3 ++-
 res/values-sr/cm_strings.xml      | 13 ++++---------
 res/values-sv/cm_strings.xml      | 13 ++++---------
 res/values-sw/cm_strings.xml      |  3 ++-
 res/values-ta-rIN/cm_strings.xml  | 13 ++++---------
 res/values-te-rIN/cm_strings.xml  | 13 ++++---------
 res/values-th/cm_strings.xml      | 13 ++++---------
 res/values-tr/cm_strings.xml      | 13 ++++---------
 res/values-ug/cm_strings.xml      | 13 ++++---------
 res/values-ug/strings.xml         |  1 +
 res/values-uk/cm_strings.xml      | 13 ++++---------
 res/values-ur-rPK/cm_strings.xml  |  3 ++-
 res/values-uz-rUZ/cm_strings.xml  |  3 ++-
 res/values-vi/cm_strings.xml      | 13 ++++---------
 res/values-zh-rCN/cm_strings.xml  | 13 ++++---------
 res/values-zh-rHK/cm_strings.xml  | 13 ++++---------
 res/values-zh-rTW/cm_strings.xml  | 13 ++++---------
 res/values-zu/cm_strings.xml      |  3 ++-
 96 files changed, 393 insertions(+), 603 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 459e101..6854f03 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Slegs programme</string>
   <string name="root_access_adb">Slegs ADB</string>
   <string name="root_access_all">Programme en ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -569,15 +570,6 @@
   <string name="display_rotation_90_title">90 grade</string>
   <string name="display_rotation_180_title">180 grade</string>
   <string name="display_rotation_270_title">270 grade</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vertoon standaard foto</string>
-  <string name="selectnewfile_menu">Vertoon nuwe foto van Galery</string>
-  <string name="selectfile_menu">Vertoon foto vanuit Galery</string>
-  <string name="restore_default_str">Stel terug</string>
-  <string name="hue_str">Tint: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Versadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimaliseer jou skerm gebaseer op die tyd van die dag en die omringende omstandighede om leesbaarheid te verbeter en verminder oogspanning</string>
   <string name="live_display_mode">Skerm modus</string>
@@ -607,6 +599,9 @@
   <string name="live_display_color_profile_photography_summary">Perfekte kleur voortplanting vir foto\'s</string>
   <string name="live_display_color_profile_basic_title">Basies</string>
   <string name="live_display_color_profile_basic_summary">Gebruik die skerm ongekalibreerd</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Versadigingspunt</string>
+  <string name="adj_contrast_title">Kontras</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selektor ikoon</string>
   <string name="ime_switcher_notify_summary">Wys invoer metode selektor ikoon</string>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 2e9b70a..5353763 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -42,6 +42,7 @@
   <string name="root_access_apps">للتطبيقات فقط</string>
   <string name="root_access_adb">لـADB فقط</string>
   <string name="root_access_all">التطبيقات وADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">الاتصال بالحقل القريب</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -575,15 +576,6 @@
   <string name="display_rotation_90_title">90 درجة</string>
   <string name="display_rotation_180_title">180 درجة</string>
   <string name="display_rotation_270_title">270 درجة</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">عرض الصورة المبدئيّة</string>
-  <string name="selectnewfile_menu">عرض صورة جديدة من معرض الصور</string>
-  <string name="selectfile_menu">عرض صورة من معرض الصور</string>
-  <string name="restore_default_str">إعادة تعيين</string>
-  <string name="hue_str">تدرج اللون: <xliff:g id="hue_value">%1$s </xliff:g></string>
-  <string name="saturation_str">التشبع: <xliff:g id="saturation_value">%1$s </xliff:g></string>
-  <string name="contrast_str">التباين: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">الكثافة: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">تحسين الشاشة بحسب الوقت من اليوم والظروف المحيطة لتسهيل القراءة وتقليل إجهاد العين</string>
   <string name="live_display_mode">نمط العرض</string>
@@ -613,6 +605,9 @@
   <string name="live_display_color_profile_photography_summary">إعادة إنتاج لون متطابق للصور</string>
   <string name="live_display_color_profile_basic_title">أساسي</string>
   <string name="live_display_color_profile_basic_summary">استخدام العرض غير المعاير</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">التشبع</string>
+  <string name="adj_contrast_title">التباين</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">رمز التحديد</string>
   <string name="ime_switcher_notify_summary">عرض رمز تحديد طريقة الإدخال </string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index bcef602..811c6b1 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">কেৱল এপ্প্‌চ</string>
   <string name="root_access_adb">কেৱল ADB</string>
   <string name="root_access_all">এপ্প্‌চ আৰু ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 ডিগ্ৰী</string>
   <string name="display_rotation_180_title">180 ডিগ্ৰী</string>
   <string name="display_rotation_270_title">270 ডিগ্ৰী</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ডিফ\'ল্ট ছবি চাওক</string>
-  <string name="selectnewfile_menu">গেলাৰীৰ পৰা নতুন ছবি চাওক</string>
-  <string name="selectfile_menu">গেলাৰীৰ পৰা ছবি চাওক</string>
-  <string name="restore_default_str">ৰিছেট</string>
-  <string name="hue_str">হিউ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">ৰঙৰ গাঢ়তা: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">বিষমতা: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">তীব্ৰতা: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">পঠনযোগ্যতা আৰু চকুৰ ওপৰত চাপ হ্ৰাস কৰিবলৈ দিনৰ সময়ৰ আধাৰত আপোনাৰ স্ক্ৰীণ আৰু পাৰিপাৰ্শ্বিক অৱস্থা অপ্টিমাইজ কৰক</string>
   <string name="live_display_mode">প্রদর্শন মোড</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">ফটোৰ বাবে নিৰ্ভুল ৰং উৎপাদন</string>
   <string name="live_display_color_profile_basic_title">প্ৰাথমিক</string>
   <string name="live_display_color_profile_basic_summary">কেলিব্ৰেট নকৰাকৈ প্রদর্শন ব্যৱহাৰ কৰক</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">পৰিপূৰ্ণ কৰা</string>
+  <string name="adj_contrast_title">কনট্ৰাষ্ট</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">নিৰ্বাচক আইকন</string>
   <string name="ime_switcher_notify_summary">নিৰ্বাচক আইকনৰ ইনপুট পদ্ধতি প্ৰদৰ্শন কৰক</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 61c53b8..c873fb1 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Namái aplicaciones</string>
   <string name="root_access_adb">Namái ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">Versión CyanogenMod</string>
@@ -566,15 +567,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="display_rotation_90_title">90 graos</string>
   <string name="display_rotation_180_title">180 graos</string>
   <string name="display_rotation_270_title">270 graos</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Ver imaxe por defeutu</string>
-  <string name="selectnewfile_menu">Ver imaxe nueva dende la Galería</string>
-  <string name="selectfile_menu">Ver imaxe dende la Galería</string>
-  <string name="restore_default_str">Restablecer</string>
-  <string name="hue_str">Color: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensidá: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiza la to pantalla basándose na hora\'l día y les condiciones ambientales p\'ameyorar la llexibilidá y amenorgar el cansanciu de güeyos</string>
   <string name="live_display_color_temperature_title">Temperatura de color</string>
@@ -594,6 +586,9 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfeuta pa semeyes</string>
   <string name="live_display_color_profile_basic_title">Básicu</string>
   <string name="live_display_color_profile_basic_summary">Usa la pantalla ensin calibrar</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seleutor d\'iconu</string>
   <string name="ime_switcher_notify_summary">Amosar l\'iconu de seleición del métodu d\'entrada</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index a009f8b..e99d6a5 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">Yalnız tətbiqetmələr</string>
   <string name="root_access_adb">Yalnız ADB</string>
   <string name="root_access_all">Tətbiqetmələr və ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod versiyası</string>
@@ -469,18 +470,11 @@
   <string name="display_rotation_90_title">90 dərəcə</string>
   <string name="display_rotation_180_title">180 dərəcə</string>
   <string name="display_rotation_270_title">270 dərəcə</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">İlkin şəklə bax</string>
-  <string name="selectnewfile_menu">Qalereyadan yeni şəklə bax</string>
-  <string name="selectfile_menu">Qalereyadan şəklə bax</string>
-  <string name="restore_default_str">Sıfırla</string>
-  <string name="hue_str">Çalar: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Doydurma: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Təzad: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Gərginlik: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_day">Gündüz</string>
   <string name="live_display_night">Gecə</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Doydurma</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seçici nişanı</string>
   <string name="ime_switcher_notify_summary">Giriş üsulu seçici nişanını görüntülə</string>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 200c969..ec1247d 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Толькі для дадаткаў</string>
   <string name="root_access_adb">Толькі для ADB</string>
   <string name="root_access_all">Для дадаткаў і ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -569,15 +570,6 @@
   <string name="display_rotation_90_title">90 градусаў</string>
   <string name="display_rotation_180_title">180 градусаў</string>
   <string name="display_rotation_270_title">270 градусаў</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Стандартны значок</string>
-  <string name="selectnewfile_menu">Абраць новую выяву з \"Галерэі\"</string>
-  <string name="selectfile_menu">Абраць з \"Галерэі\"</string>
-  <string name="restore_default_str">Скід</string>
-  <string name="hue_str">Адценне: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Насычанасць: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Кантраснасць: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Інтэнсіўнасць: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Падладжваць экран на аснове часу сутак і асвятлення, каб палепшыць чытальнасць і зменшыць стомленасць вачэй</string>
   <string name="live_display_mode">Рэжым экрана</string>
@@ -607,6 +599,9 @@
   <string name="live_display_color_profile_photography_summary">Ідэальная колераперадача для фота</string>
   <string name="live_display_color_profile_basic_title">Асноўны</string>
   <string name="live_display_color_profile_basic_summary">Скарыстаць неадкалібраваны дысплей</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Насычанасць</string>
+  <string name="adj_contrast_title">Кантраснасць</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Значок выбару метаду ўводу</string>
   <string name="ime_switcher_notify_summary">Адлюстроўваць пераключальнік метаду ўводу пры адкрыцці тэкставых палёў</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index fe656ec..d75ffe3 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -38,6 +38,9 @@
   <string name="root_access_apps">Само за приложения</string>
   <string name="root_access_adb">Само за ADB</string>
   <string name="root_access_all">За приложения и ADB</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Управление на администраторски достъп</string>
+  <string name="root_appops_summary">Преглед и управление на правилата за администраторски достъп</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -426,7 +429,7 @@
   <string name="app_ops_labels_mock_location">Неистинско местоположение</string>
   <string name="app_ops_labels_read_external_storage">прочети външната памет</string>
   <string name="app_ops_labels_write_external_storage">пишете на външната памет</string>
-  <string name="app_ops_labels_turn_screen_on">включване на екрана</string>
+  <string name="app_ops_labels_turn_screen_on">Включване на екрана</string>
   <string name="app_ops_labels_get_accounts">Вземи акаунти</string>
   <string name="app_ops_labels_toggle_wifi">активирай/деактивирай Wi-Fi</string>
   <string name="app_ops_labels_toggle_bluetooth">Превключване на Bluetooth</string>
@@ -572,15 +575,6 @@
   <string name="display_rotation_90_title">90 градуса</string>
   <string name="display_rotation_180_title">180 градуса</string>
   <string name="display_rotation_270_title">270 градуса</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Изглед на картините по подразбиране</string>
-  <string name="selectnewfile_menu">Виж нова снимка от галерията</string>
-  <string name="selectfile_menu">Виж снимка от галерията</string>
-  <string name="restore_default_str">Нулиране</string>
-  <string name="hue_str">Отенък: <xliff:g id="hue_value">%1$s </xliff:g></string>
-  <string name="saturation_str">Наситеност: <xliff:g id="saturation_value">%1$s </xliff:g></string>
-  <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s </xliff:g></string>
-  <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизира настройките на екрана, въз основа на времето от деня и условията на околната среда за да се подобри четливостта и да намали умората на очите</string>
   <string name="live_display_mode">Режим на екрана</string>
@@ -612,6 +606,13 @@
   <string name="live_display_color_profile_basic_summary">Използвате дисплея не калибриран</string>
   <string name="live_display_color_profile_adaptive_title">Адаптивно</string>
   <string name="live_display_color_profile_adaptive_summary">Цветовете се адаптират към условията на околната среда</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Настройка на изображението</string>
+  <string name="picture_adjustment_summary">Настройте нюанс, насищане, интензивност и контраст</string>
+  <string name="adj_hue_title">Отенък</string>
+  <string name="adj_saturation_title">Насищане</string>
+  <string name="adj_intensity_title">Интензивност</string>
+  <string name="adj_contrast_title">Контраст</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Селектор на икона</string>
   <string name="ime_switcher_notify_summary">Покажи метода на въвеждане на селектирана икона</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 40f1258..69e9583 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -30,6 +30,7 @@
   <string name="root_access_apps">শুধু মাত্র অ্যাপস</string>
   <string name="root_access_adb">শুধু মাত্র এডিবি</string>
   <string name="root_access_all">অ্যাপস এবং এডিবি</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">সায়ানোজেনমড সংস্করণ</string>
@@ -377,16 +378,8 @@
   <string name="display_rotation_90_title">৯০ ডিগ্রী</string>
   <string name="display_rotation_180_title">১৮০ ডিগ্রী</string>
   <string name="display_rotation_270_title">২৭০ ডিগ্রী</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">পূর্ব-নির্ধারিত চিত্র প্রদর্শন</string>
-  <string name="selectnewfile_menu">গ্যালারী থেকে নতুন চিত্র প্রদর্শন</string>
-  <string name="selectfile_menu">গ্যালারী থেকে চিত্র প্রদর্শন</string>
-  <string name="restore_default_str">পুনরায় ধার্য করুন</string>
-  <string name="hue_str">হিউঃ <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">সম্পৃক্তিঃ <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">বৈপরীত্যঃ <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">তীব্রতাঃ <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index a8bca0c..4fc2378 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Només aplicacions</string>
   <string name="root_access_adb">Només ADB</string>
   <string name="root_access_all">Aplicacions i ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 graus</string>
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Mostra la imatge per defecte</string>
-  <string name="selectnewfile_menu">Mostra una nova imatge des de la galeria</string>
-  <string name="selectfile_menu">Mostra una imatge des de la galeria</string>
-  <string name="restore_default_str">Reinicia</string>
-  <string name="hue_str">Matís: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturació: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitat: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimitza la teva pantalla basant-se en l\'hora del dia i les condicions ambientals per millorar la llegibilitat i reduir la fatiga ocular</string>
   <string name="live_display_mode">Mode de pantalla</string>
@@ -612,6 +604,13 @@
   <string name="live_display_color_profile_basic_summary">Utilitza la pantalla sense calibrar</string>
   <string name="live_display_color_profile_adaptive_title">Adaptativa</string>
   <string name="live_display_color_profile_adaptive_summary">Els colors s\'adapten a les condicions ambientals</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajustament d\'image</string>
+  <string name="picture_adjustment_summary">Ajusta la tonalitat, intensitat, i contrast</string>
+  <string name="adj_hue_title">Tonalitat</string>
+  <string name="adj_saturation_title">Saturació</string>
+  <string name="adj_intensity_title">Intensitat</string>
+  <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selector d\'icona</string>
   <string name="ime_switcher_notify_summary">Mostra la icona del selector de mètode d\'entrada</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 603102a..6381195 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Pouze aplikace</string>
   <string name="root_access_adb">Pouze ADB</string>
   <string name="root_access_all">Aplikace a ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -573,15 +574,6 @@
   <string name="display_rotation_90_title">90 stupňů</string>
   <string name="display_rotation_180_title">180 stupňů</string>
   <string name="display_rotation_270_title">270 stupňů</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Zobrazit výchozí obrázek</string>
-  <string name="selectnewfile_menu">Zobrazit nový obrázek z Galerie</string>
-  <string name="selectfile_menu">Zobrazit obrázek z Galerie</string>
-  <string name="restore_default_str">Obnovit</string>
-  <string name="hue_str">Barva: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Sytost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovat obrazovku podle denní doby a okolních podmínek pro lepší čitelnost a snížení namáhání očí</string>
   <string name="live_display_mode">Režim zobrazení</string>
@@ -613,6 +605,9 @@
   <string name="live_display_color_profile_basic_summary">Použít nezkalibrovaný displej</string>
   <string name="live_display_color_profile_adaptive_title">Adaptivní</string>
   <string name="live_display_color_profile_adaptive_summary">Přizpůsobit barvy okolním podmínkám</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Sytost</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona pro volbu</string>
   <string name="ime_switcher_notify_summary">Zobrazit ikonu volby vstupní metody</string>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 803d1a0..76914e5 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Kun apps</string>
   <string name="root_access_adb">Kun ADB</string>
   <string name="root_access_all">Apps og ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -565,15 +566,6 @@
   <string name="display_rotation_90_title">90 grader</string>
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vis standardbillede</string>
-  <string name="selectnewfile_menu">Vis nyt billede fra Galleri</string>
-  <string name="selectfile_menu">Vis billede fra Galleri</string>
-  <string name="restore_default_str">Nulstil</string>
-  <string name="hue_str">Farvetone: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Farvemætning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimér din skærm baseret på tidspunktet på dagen, samt omgivelserne, for at forbedre læsbarheden og nedsætte anstrengelsen af øjnene</string>
   <string name="live_display_mode">Visningstilstand</string>
@@ -603,6 +595,9 @@
   <string name="live_display_color_profile_photography_summary">Perfekt farvegengivelse for fotos</string>
   <string name="live_display_color_profile_basic_title">Grundlæggende</string>
   <string name="live_display_color_profile_basic_summary">Brug skærmen ukalibreret</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Farvemætning</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikon for valg</string>
   <string name="ime_switcher_notify_summary">Vis ikon til valg af input-metode</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 22c8e05..a6bf40b 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="root_access_apps">Nur Apps</string>
   <string name="root_access_adb">Nur ADB</string>
   <string name="root_access_all">Apps und ADB</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Root-Zugriffe verwalten</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -343,7 +345,7 @@
   <string name="app_ops_summaries_toast_window">Pop-ups anzeigen</string>
   <string name="app_ops_summaries_project_media">Medien projizieren</string>
   <string name="app_ops_summaries_activate_vpn">VPN aktivieren</string>
-  <string name="app_ops_summaries_write_wallpaper">Hintergrund schreiben</string>
+  <string name="app_ops_summaries_write_wallpaper">Hintergrundbild schreiben</string>
   <string name="app_ops_summaries_assist_structure">Strukturassistent</string>
   <string name="app_ops_summaries_assist_screenshot">Screenshotassistent</string>
   <string name="app_ops_summaries_read_phone_state">Telefonstatus lesen</string>
@@ -413,7 +415,7 @@
   <string name="app_ops_labels_toast_window">Pop-ups anzeigen</string>
   <string name="app_ops_labels_project_media">Medien projizieren</string>
   <string name="app_ops_labels_activate_vpn">VPN aktivieren</string>
-  <string name="app_ops_labels_write_wallpaper">Hintergrund schreiben</string>
+  <string name="app_ops_labels_write_wallpaper">Hintergrundbild schreiben</string>
   <string name="app_ops_labels_assist_structure">Strukturassistent</string>
   <string name="app_ops_labels_assist_screenshot">Screenshotassistent</string>
   <string name="app_ops_labels_read_phone_state">Telefonstatus lesen</string>
@@ -549,6 +551,7 @@
   <string name="volume_adjust_sounds_title">Ton bei Lautstärkeänderung</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrationsstärke</string>
+  <string name="vibrator_warning">Höhere Werte als %1$d%% werden nicht empfohlen</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Farbkalibrierung</string>
   <string name="color_calibration_summary">Displayfarben kalibrieren</string>
@@ -571,15 +574,6 @@
   <string name="display_rotation_90_title">90 Grad</string>
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Standardbild anzeigen</string>
-  <string name="selectnewfile_menu">Neues Bild aus Galerie anzeigen</string>
-  <string name="selectfile_menu">Bild aus Galerie anzeigen</string>
-  <string name="restore_default_str">Zurücksetzen</string>
-  <string name="hue_str">Farbton: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Sättigung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensität: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiert Ihren Bildschirm basierend auf der Tageszeit und den Umgebungsbedingungen, um die Lesbarkeit zu verbessern und die Ermüdung der Augen zu mildern</string>
   <string name="live_display_mode">Bildschirmmodus</string>
@@ -611,6 +605,11 @@
   <string name="live_display_color_profile_basic_summary">Display unkalibriert verwenden</string>
   <string name="live_display_color_profile_adaptive_title">Adaptiv</string>
   <string name="live_display_color_profile_adaptive_summary">Farben an Umgebungsbedingungen anpassen</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Bildanpassung</string>
+  <string name="adj_hue_title">Farbton</string>
+  <string name="adj_saturation_title">Sättigung</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Auswahlsymbol</string>
   <string name="ime_switcher_notify_summary">Symbol für Eingabemethodenauswahl anzeigen</string>
@@ -1058,7 +1057,7 @@
   <string name="cm_radio_info_diag_log_on_label">Diagnoseprotokoll ausschalten</string>
   <string name="cm_radio_info_diag_log_off_label">Diagnoseprotokoll einschalten</string>
   <!-- Lock screen wallpaper -->
-  <string name="lockscreen_wallpaper_title">Hintergrund</string>
+  <string name="lockscreen_wallpaper_title">Hintergrundbild</string>
   <string name="not_available_with_app">Nicht verfügbar für %1$s</string>
   <!-- Format string for fingerprint location message -->
   <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Suchen Sie den Fingerabdrucksensor auf der <xliff:g id="sensor_location">%1$s</xliff:g> des Gerätes.</string>
@@ -1068,4 +1067,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">linken Seite</string>
   <string name="security_settings_fingerprint_sensor_location_right">rechten Seite</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Anrufe: <xliff:g id="voice_state">%1$s</xliff:g> / Daten: <xliff:g id="data_state">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 8da8728..d55bd33 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Μόνο εφαρμογές</string>
   <string name="root_access_adb">Μόνο ADB</string>
   <string name="root_access_all">Εφαρμογές και ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -571,15 +572,6 @@
   <string name="display_rotation_90_title">90 μοίρες</string>
   <string name="display_rotation_180_title">180 μοίρες</string>
   <string name="display_rotation_270_title">270 μοίρες</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Προβολή προεπιλεγμένης εικόνας</string>
-  <string name="selectnewfile_menu">Προβολή νέας εικόνας από τη Συλλογή</string>
-  <string name="selectfile_menu">Προβολή εικόνας από τη Συλλογή</string>
-  <string name="restore_default_str">Επαναφορά</string>
-  <string name="hue_str">Απόχρωση: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Κορεσμός: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Αντίθεση: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Ένταση: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Βελτιστοποίηση της οθόνης σας με βάση την ώρα της ημέρας και τις συνθήκες περιβάλλοντος για βελτίωση της αναγνωσιμότητας και μείωση της καταπόνησης των ματιών</string>
   <string name="live_display_mode">Λειτουργία οθόνης</string>
@@ -611,6 +603,9 @@
   <string name="live_display_color_profile_basic_summary">Χρήση της οθόνης χωρίς ρύθμιση</string>
   <string name="live_display_color_profile_adaptive_title">Προσαρμοστική</string>
   <string name="live_display_color_profile_adaptive_summary">Τα χρώματα προσαρμόζονται στις συνθήκες περιβάλλοντος</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Κορεσμός</string>
+  <string name="adj_contrast_title">Αντίθεση</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Εικονίδιο επιλογέα</string>
   <string name="ime_switcher_notify_summary">Εμφάνιση εικονιδίου για τον επιλογέα μεθόδου εισαγωγής</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index 5782ae7..f414205 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Apps only</string>
   <string name="root_access_adb">ADB only</string>
   <string name="root_access_all">Apps and ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod version</string>
@@ -470,15 +471,6 @@
   <string name="display_rotation_90_title">90 degrees</string>
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">View default picture</string>
-  <string name="selectnewfile_menu">View new picture from Gallery</string>
-  <string name="selectfile_menu">View picture from Gallery</string>
-  <string name="restore_default_str">Reset</string>
-  <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
@@ -493,6 +485,9 @@
   <string name="live_display_low_power_summary">Adjust display for lowest power consumption without degradation</string>
   <string name="live_display_enhance_color_title">Enhance colors</string>
   <string name="live_display_enhance_color_summary">Improve color vibrance of flesh tones, scenery, and other images</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturation</string>
+  <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selector icon</string>
   <string name="ime_switcher_notify_summary">Display input method selector icon</string>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 5daeda0..f1e1725 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -95,9 +96,9 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimise your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index de59be9..44c35be 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Apps only</string>
   <string name="root_access_adb">ADB only</string>
   <string name="root_access_all">Apps and ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -512,15 +513,6 @@
   <string name="display_rotation_90_title">90 degrees</string>
   <string name="display_rotation_180_title">180 degrees</string>
   <string name="display_rotation_270_title">270 degrees</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">View default picture</string>
-  <string name="selectnewfile_menu">View new picture from Gallery</string>
-  <string name="selectfile_menu">View picture from Gallery</string>
-  <string name="restore_default_str">Reset</string>
-  <string name="hue_str">Hue: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturation: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensity: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimize your screen based on time of day and ambient conditions to improve readability and reduce eyestrain</string>
   <string name="live_display_mode">Display mode</string>
@@ -550,6 +542,9 @@
   <string name="live_display_color_profile_photography_summary">Perfect color reproduction for photos</string>
   <string name="live_display_color_profile_basic_title">Basic</string>
   <string name="live_display_color_profile_basic_summary">Use the display uncalibrated</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturation</string>
+  <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selector icon</string>
   <string name="ime_switcher_notify_summary">Display input method selector icon</string>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 1154fe6..3500497 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Nur aplikaĵoj</string>
   <string name="root_access_adb">Nur ADB</string>
   <string name="root_access_all">Aplikaĵoj kaj ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">Versio de CyanogenMod</string>
@@ -495,15 +496,6 @@
   <string name="display_rotation_90_title">90 gradoj</string>
   <string name="display_rotation_180_title">180 gradoj</string>
   <string name="display_rotation_270_title">270 gradoj</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vidi defaŭltan bildon</string>
-  <string name="selectnewfile_menu">Vidi defaŭltan bildon el la Galerio</string>
-  <string name="selectfile_menu">Vidi bildon el la Galerio</string>
-  <string name="restore_default_str">Restarigo</string>
-  <string name="hue_str">Kolortono: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Satureco: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intenseco: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimumigi vian ekranon laŭ la horo kaj la ĉirkaŭaĵa etoso por plibonigi la legebecon kaj malhelpi okulan malkomforton</string>
   <string name="live_display_mode">Vidiga reĝimo</string>
@@ -518,6 +510,9 @@
   <string name="live_display_low_power_summary">Agordas ekranon por la lej malgranda energia uzado sen malplibonigi</string>
   <string name="live_display_enhance_color_title">Plibonigi kolorojn</string>
   <string name="live_display_enhance_color_summary">Plibonigi koloran intensecon de karnaj tonoj, pejzaĝoj, kaj aliaj bildoj</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Intenseco</string>
+  <string name="adj_contrast_title">Kontrasto</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Piktogramo de la elektilo</string>
   <string name="ime_switcher_notify_summary">Montri piktogramon de elektilo de eniga metodo</string>
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index bcfc992..b51bf2f 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -155,13 +156,13 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
   <string name="live_display_color_profile_cinema_summary">Reproducción perfecta de color para video</string>
   <string name="live_display_color_profile_photography_title">Fotografía</string>
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Utilizar pantalla sin calibrar</string>
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 9f1c3ba..7a978cd 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Solo aplicaciones</string>
   <string name="root_access_adb">Solo ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -571,15 +572,6 @@
   <string name="display_rotation_90_title">90 grados</string>
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Ver imagen predeterminada</string>
-  <string name="selectnewfile_menu">Ver nueva imagen desde la galería</string>
-  <string name="selectfile_menu">Ver imagen desde la galería</string>
-  <string name="restore_default_str">Restablecer</string>
-  <string name="hue_str">Color: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
@@ -609,6 +601,9 @@
   <string name="live_display_color_profile_photography_summary">Reproducción de color perfecta para fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Utilizar pantalla sin calibrar</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icono de selección</string>
   <string name="ime_switcher_notify_summary">Mostrar el icono de selección del método de entrada</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index eb6d50f..f0e0a79 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Solo aplicaciones</string>
   <string name="root_access_adb">Solo ADB</string>
   <string name="root_access_all">Aplicaciones y ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -571,15 +572,6 @@
   <string name="display_rotation_90_title">90 grados</string>
   <string name="display_rotation_180_title">180 grados</string>
   <string name="display_rotation_270_title">270 grados</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Mostrar imagen por defecto</string>
-  <string name="selectnewfile_menu">Mostrar nueva imagen desde Galería</string>
-  <string name="selectfile_menu">Mostrar imagen desde Galería</string>
-  <string name="restore_default_str">Restablecer</string>
-  <string name="hue_str">Matiz: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturación: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensidad: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizar la pantalla según la hora del día y las condiciones ambientales para mejorar la legibilidad y reducir la fatiga visual</string>
   <string name="live_display_mode">Modo de visualización</string>
@@ -611,6 +603,9 @@
   <string name="live_display_color_profile_basic_summary">Usar pantalla sin calibrar</string>
   <string name="live_display_color_profile_adaptive_title">Adaptable</string>
   <string name="live_display_color_profile_adaptive_summary">Los colores se adaptan a las condiciones ambientales</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icono de selección</string>
   <string name="ime_switcher_notify_summary">Mostrar el icono de selección del método de entrada</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index e3c872f..904e42b 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -38,7 +38,9 @@
   <string name="root_access_apps">Ainult rakendused</string>
   <string name="root_access_adb">Ainult ADB</string>
   <string name="root_access_all">Rakendused ja ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod versioon</string>
   <string name="mod_version_default">Teadmata</string>
@@ -262,6 +264,7 @@
   <string name="notification_light_missed_call_title">vastamata kõne</string>
   <string name="notification_light_voicemail_title">Kõnepost</string>
   <string name="notification_light_screen_on">Tuled koos ekraaniga</string>
+  <string name="notification_light_use_multiple_leds">Mitu LEDi</string>
   <string name="keywords_lights_brightness_level">hämarda ledide heledust</string>
   <!-- Lights settings, LED notification -->
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
@@ -503,15 +506,6 @@
   <string name="display_rotation_90_title">90 kraadi</string>
   <string name="display_rotation_180_title">180 kraadi</string>
   <string name="display_rotation_270_title">270 kraadi</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Kuva vaikepilt</string>
-  <string name="selectnewfile_menu">Kuva uus pilti Galeriist</string>
-  <string name="selectfile_menu">Kuva pilt Galeriist</string>
-  <string name="restore_default_str">Lähtesta</string>
-  <string name="hue_str">Värvus: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Küllastus: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensiivsus: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiseeri oma ekraan vastavalt päeva ajale ja ümbritsevatele tingimustele, et parandada loetavust ning vähendada silmade pinget</string>
   <string name="live_display_mode">Ekraani režiim</string>
@@ -536,6 +530,9 @@
   <string name="live_display_color_profile_cinema_title">Kino</string>
   <string name="live_display_color_profile_astronomy_title">Astronoomia</string>
   <string name="live_display_color_profile_astronomy_summary">Sügav punane öise nägemise säilitamiseks</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Küllastus</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Valiku ikoon</string>
   <string name="ime_switcher_notify_summary">Kuva sisestamismeetodi valiku ikoon</string>
@@ -590,6 +587,9 @@
   <string name="lto_download_data_wifi_only">GPS assisteeritud andmete allalaadimine</string>
   <string name="lto_download_data_wifi_only_on">Üle kõigi võrkude</string>
   <string name="lto_download_data_wifi_only_off">Ainult üle Wi\u2011Fi võrkude</string>
+  <string name="volume_keys_control_ring_stream_title">Muuda helina tooni tugevust</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Helitugevusnupud reguleerivad helina tooni tugevust</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Helitugevusnupud reguleerivad meedia helitugevust</string>
   <string name="category_calibration">Kalibreerimine</string>
   <string name="display_and_lights">Ekraan &amp; valgustus</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -662,14 +662,18 @@
   <string name="privacy_guard_help_text">Sellel ekraanil saate puudutusega valida milliste rakenduste jaoks aktiveeritakse Privaatsuse Kaitse. Valitud rakendustele ei võimaldata ligipääsu isiklikele andmetele, nagu näiteks kontaktid, sõnumid või kõnelogi. Pikk vajutus rakendusel avab detailide kuva.\n\nSisseehitatud rakendused ei ole vaikimisi kuvatud, kuid on võimalik nähtavaks teha vastavas menüü valikus.</string>
   <string name="privacy_guard_manager_show_system_apps">Kuva sisse-ehitatud rakendused</string>
   <string name="privacy_guard_advanced_settings_title">Edasijõudnute valikud</string>
+  <string name="privacy_guard_notification_title">Kuva teavitus</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
   <string name="lockpattern_settings_enable_error_path_title">Näita mustrit tõrget</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
   <string name="lockpattern_settings_enable_dots_title">Näita mustri punkte</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Näita otse paroolisisestust</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Näita otse mustrit</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Näita otse PIN koodi sisestust</string>
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Näita muusika visualiseerijat</string>
   <!-- lock screen disabled by QS tile warning -->
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 928ba1f..54d5c22 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -38,6 +38,9 @@
   <string name="root_access_apps">Aplikazioak bakarrik</string>
   <string name="root_access_adb">ADB bakarrik</string>
   <string name="root_access_all">ADB eta aplikazioak</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Kudeatu root sarbideak</string>
+  <string name="root_appops_summary">Ikusi eta kontrolatu root arauak</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -261,12 +264,12 @@
   <string name="notification_light_general_title">Orokorra</string>
   <string name="notification_light_applist_title">Aplikazioak</string>
   <string name="notification_light_phonelist_title">Telefonoa</string>
-  <string name="notification_light_use_custom">Balio pertsonalizatuak erabili</string>
+  <string name="notification_light_use_custom">Erabili balio pertsonalizatuak</string>
   <string name="notification_light_default_value">Lehenetsia</string>
   <string name="notification_light_missed_call_title">Dei galdua</string>
   <string name="notification_light_voicemail_title">Ahots postontzia</string>
   <string name="notification_light_screen_on">Argitu pantaila piztean</string>
-  <string name="notification_light_zen_mode">Argiak ez eten moduan</string>
+  <string name="notification_light_zen_mode">Argiak ez molestatu moduan</string>
   <string name="notification_light_use_multiple_leds">Hainbat LED</string>
   <string name="keywords_lights_brightness_level">ilundu LEDaren argitasuna</string>
   <string name="notification_light_automagic">Hautatu koloreak automatikoki</string>
@@ -572,15 +575,6 @@
   <string name="display_rotation_90_title">90 gradu</string>
   <string name="display_rotation_180_title">180 gradu</string>
   <string name="display_rotation_270_title">270 gradu</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Ikusi lehenetsitako irudia</string>
-  <string name="selectnewfile_menu">Ikusi irudi berria galeriatik</string>
-  <string name="selectfile_menu">Ikusi irudia galeriatik</string>
-  <string name="restore_default_str">Leheneratu</string>
-  <string name="hue_str">Ñabardura:<xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturazioa:<xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrastea:<xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intentsitatea:<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizatu zure pantaila eguneko orduaren eta inguruneko baldintzen arabera irakurgarritasuna hobetzeko eta begien nekea gutxiagotzeko</string>
   <string name="live_display_mode">Pantaila modua</string>
@@ -612,6 +606,13 @@
   <string name="live_display_color_profile_basic_summary">Erabili pantaila kalibratu gabe</string>
   <string name="live_display_color_profile_adaptive_title">Moldakorra</string>
   <string name="live_display_color_profile_adaptive_summary">Koloreak inguruko baldintzetara moldatzen dira</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Irudiaren doikuntza</string>
+  <string name="picture_adjustment_summary">Doitu ñabardura, saturazioa, intentsitatea eta kontrastea</string>
+  <string name="adj_hue_title">Ñabardura</string>
+  <string name="adj_saturation_title">Saturazioa</string>
+  <string name="adj_intensity_title">Intentsitatea</string>
+  <string name="adj_contrast_title">Kontrastea</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Hautaketa ikonoa</string>
   <string name="ime_switcher_notify_summary">Bistaratu sarrera metodoa hautatzeko ikonoa</string>
@@ -778,7 +779,7 @@
   <string name="advanced_reboot_summary">Desblokeatuta dagoenean, erakutsi itzaltze menuan berreskuratze-irudira edo abiarazlera berrabiatzeko edo berrabiatze leuna burutzeko aukerak</string>
   <string name="category_interface">Interfazea</string>
   <!-- Expanded desktop -->
-  <string name="power_menu_expanded_desktop">Mahaigaina hedatu</string>
+  <string name="power_menu_expanded_desktop">Mahaigain hedatua</string>
   <string name="expanded_hide_nothing">Ez ezkutatu ezer</string>
   <string name="expanded_hide_status">Ezkutatu egoera barra</string>
   <string name="expanded_hide_navigation">Ezkutatu nabigazio-barra</string>
@@ -793,7 +794,7 @@
   <string name="kill_app_longpress_back_summary">Hil aurrealdeko aplikazioa atzera botoia luze sakatuz</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">Erakutsi bilaketa barra azkenak menuan</string>
-  <string name="keywords_recents_show_searchbar">oraintsukoa oraintsukoak ezgaitu gaitu erakutsi ezkutatu bilatu barra bilaketa-barra</string>
+  <string name="keywords_recents_show_searchbar">azkena azkenak desgaitu gaitu erakutsi ezkutatu bilatu barra bilaketa-barra</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">Esnatu ahotsaren bidez</string>
   <string name="voice_wakeup_retrain_title">Ahotsa entrenatu</string>
@@ -970,7 +971,7 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Beste bat</string>
   <!-- Wi-Fi tethering inactivity timeout -->
-  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi gunearen denbora muga agortu da</string>
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi gunearen denbora-muga</string>
   <string name="hotstpot_inactivity_timeout_never">Inoiz ez</string>
   <string name="hotstpot_inactivity_timeout_1_minute">minutu bat</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minutu</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 1938b5c..be56a28 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">فقط برنامه‌ها</string>
   <string name="root_access_adb">فقط ای‌دی‌بی</string>
   <string name="root_access_all">برنامه‌ها و ای‌دی‌بی</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">ان‌اف‌سی</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -505,15 +506,6 @@
   <string name="display_rotation_90_title">۹۰ درجه</string>
   <string name="display_rotation_180_title">۱۸۰ درجه</string>
   <string name="display_rotation_270_title">۲۷۰ درجه</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">مشاهده تصویر پیش‌فرض</string>
-  <string name="selectnewfile_menu">مشاهده تصویر جدید از گالری</string>
-  <string name="selectfile_menu">مشاهده تصویر از گالری</string>
-  <string name="restore_default_str">تنظیم مجدد</string>
-  <string name="hue_str">ته‌رنگ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">اشباع: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">کنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">شدت رنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">بهینه کردن صفحه بر اساس ساعات روز و شرایط محیطی برای افزایش خوانایی و کاهش خستگی چشم</string>
   <string name="live_display_mode">حالت نمایش</string>
@@ -538,6 +530,9 @@
   <string name="live_display_color_profile_cinema_title">سینما</string>
   <string name="live_display_color_profile_astronomy_title">نجوم</string>
   <string name="live_display_color_profile_astronomy_summary">قرمز پررنگ برای مراقبت از بینایی در شب</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">اشباع</string>
+  <string name="adj_contrast_title">کنتراست</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">آیکون انتخابگر</string>
   <string name="ime_switcher_notify_summary">نمایش آیکون انتخابگر روش ورودی</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 3da6cf9..1c0ddfb 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -38,6 +38,9 @@
   <string name="root_access_apps">Vain sovellukset</string>
   <string name="root_access_adb">Vain ADB</string>
   <string name="root_access_all">Sovellukset ja ADB</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Hallitse root-oikeuksia</string>
+  <string name="root_appops_summary">Tarkastele ja hallinnoi root-sääntöjä</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -549,6 +552,7 @@
   <string name="volume_adjust_sounds_title">Äänenvoimakkuuden säädön merkkiääni</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Värinän voimakkuus</string>
+  <string name="vibrator_warning">Korkeampia arvoja kuin %1$d%% ei suositella</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Värien kalibrointi</string>
   <string name="color_calibration_summary">Kalibroi näytön värit</string>
@@ -571,15 +575,6 @@
   <string name="display_rotation_90_title">90 astetta</string>
   <string name="display_rotation_180_title">180 astetta</string>
   <string name="display_rotation_270_title">270 astetta</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Näytä oletuskuva</string>
-  <string name="selectnewfile_menu">Näytä uusi kuva Galleriasta</string>
-  <string name="selectfile_menu">Katso kuva Galleriasta</string>
-  <string name="restore_default_str">Palauta</string>
-  <string name="hue_str">Sävy: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Kylläisyys: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrasti: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensiteetti: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimoi näyttösi kellonajan ja ympäristöolosuhteiden perusteella parantaaksesi luettavuutta ja vähentääksesi silmien rasitusta</string>
   <string name="live_display_mode">Näyttötila</string>
@@ -611,6 +606,13 @@
   <string name="live_display_color_profile_basic_summary">Käytä näyttöä kalibroimatta</string>
   <string name="live_display_color_profile_adaptive_title">Mukautuva</string>
   <string name="live_display_color_profile_adaptive_summary">Värit sopeutuu ympäristön mukaan</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Kuvan säätö</string>
+  <string name="picture_adjustment_summary">Säädä värisävyä, kylläisyyttä, intensiteettiä ja kontrastia</string>
+  <string name="adj_hue_title">Värisävy</string>
+  <string name="adj_saturation_title">Kylläisyys</string>
+  <string name="adj_intensity_title">Intensiteetti</string>
+  <string name="adj_contrast_title">Kontrasti</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Syöttötavan valinnan kuvake</string>
   <string name="ime_switcher_notify_summary">Näytä syöttötavan valinnan kuvake</string>
@@ -1068,4 +1070,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">vasemmasta reunasta</string>
   <string name="security_settings_fingerprint_sensor_location_right">oikeasta reunasta</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Puhelut: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 5f49680..da55149 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -39,6 +39,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="root_access_apps">Applications uniquement</string>
   <string name="root_access_adb">ADB uniquement</string>
   <string name="root_access_all">Applications et ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="display_rotation_90_title">90 degrés</string>
   <string name="display_rotation_180_title">180 degrés</string>
   <string name="display_rotation_270_title">270 degrés</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Afficher l\'image par défaut</string>
-  <string name="selectnewfile_menu">Afficher la nouvelle image depuis la galerie</string>
-  <string name="selectfile_menu">Afficher l\'image depuis la galerie</string>
-  <string name="restore_default_str">Réinitialiser</string>
-  <string name="hue_str">Teinte : <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturation : <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste : <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensité : <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiser votre écran en fonction de l\'heure et des conditions ambiantes pour améliorer la lisibilité et réduire la fatigue oculaire</string>
   <string name="live_display_mode">Mode d\'affichage</string>
@@ -610,6 +602,9 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="live_display_color_profile_photography_summary">Reproduction parfaite des couleurs pour les photos</string>
   <string name="live_display_color_profile_basic_title">Basique</string>
   <string name="live_display_color_profile_basic_summary">Utiliser l\'écran sans étalonnage</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturation</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icône du sélecteur</string>
   <string name="ime_switcher_notify_summary">Afficher l\'icône du sélecteur de mode de saisie</string>
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index 89e6c6e..c908423 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -96,8 +97,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index ad17123..d6efc97 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -36,6 +36,7 @@
   <string name="root_access_apps">Só aplicacións</string>
   <string name="root_access_adb">Só ADB</string>
   <string name="root_access_all">Aplicacións e ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -298,13 +299,13 @@
   <string name="display_rotation_90_title">90 graos</string>
   <string name="display_rotation_180_title">180 graos</string>
   <string name="display_rotation_270_title">270 graos</string>
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
   <string name="live_display_color_profile_cinema_summary">Reprodución perfecta da cor para os vídeos</string>
   <string name="live_display_color_profile_photography_title">Fotografía</string>
   <string name="live_display_color_profile_photography_summary">Reprodución da cor perfecta para as fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Empregar a pantalla sen calibrar</string>
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 650c191..ea6e3d2 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">ફકત એપ્લિકેશન્સ</string>
   <string name="root_access_adb">ફક્ત ADB</string>
   <string name="root_access_all">એપ્લિકેશન્સ અને ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -569,15 +570,6 @@
   <string name="display_rotation_90_title">90 અંશ</string>
   <string name="display_rotation_180_title">180 અંશ</string>
   <string name="display_rotation_270_title">270 અંશ</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ડિફૉલ્ટ ચિત્ર જુઓ</string>
-  <string name="selectnewfile_menu">ગૅલરીમાંથી નવું ચિત્ર જુઓ</string>
-  <string name="selectfile_menu">ગૅલરીમાંથી ચિત્ર જુઓ</string>
-  <string name="restore_default_str">ફરીથી સેટ કરો</string>
-  <string name="hue_str">રંગ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">સંતૃપ્તિ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">કૉન્ટ્રાસ્ટ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">ઉત્કટતા: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">વાંચન ક્ષમતામાં સુધારો લાવવા અને આંખો પરનો તાણ ઘટાડવા દિવસનો સમય અને વ્યાપક હવામાનનાં આધારે તમારા સ્ક્રીનને અનુકૂળ બનાવો</string>
   <string name="live_display_mode">પ્રદર્શન મોડ</string>
@@ -607,6 +599,9 @@
   <string name="live_display_color_profile_photography_summary">ફોટા માટે સચોટ રંગ પુન:નિર્મિતી</string>
   <string name="live_display_color_profile_basic_title">બેઝિક</string>
   <string name="live_display_color_profile_basic_summary">અનુમાપન કર્યા વિના પ્રદર્શનનો ઉપયોગ કરો</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">સંતૃપ્તિ</string>
+  <string name="adj_contrast_title">વિપરીત</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">પસંદકર્તા આઇકૉન</string>
   <string name="ime_switcher_notify_summary">ઇનપુટ પદ્ધતિ પસંદકર્તા આઇકૉન દર્શાવો</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index c7d5258..c562cde 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">केवल ऐप</string>
   <string name="root_access_adb">केवल एडीबी</string>
   <string name="root_access_all">ऐप और एडीबी</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">सियानोजेनमोड संस्करण</string>
@@ -501,15 +502,6 @@
   <string name="display_rotation_90_title">90 डिग्री</string>
   <string name="display_rotation_180_title">180 डिग्री</string>
   <string name="display_rotation_270_title">270 डिग्री</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">डिफ़ॉल्ट चित्र देखें</string>
-  <string name="selectnewfile_menu">गैलरी से नया चित्र देखें</string>
-  <string name="selectfile_menu">गैलरी से चित्र देखें</string>
-  <string name="restore_default_str">रीसेट करें</string>
-  <string name="hue_str">रंग: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">संतृप्ति: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">कोंट्रास्ट: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">दिन के समय और परिवेशी स्थितियों के अनुसार स्क्रीन को इष्टतमीकृत करें ताकि पठनीयता बढ़ें और आँखों पर कम दबाव पड़े</string>
   <string name="live_display_mode">डिस्प्ले मोड</string>
@@ -524,6 +516,9 @@
   <string name="live_display_low_power_summary">बिना गुणवत्ता घटाएँ डिस्प्ले को न्यूनतम पावर खपत के लिए समायोजित करें</string>
   <string name="live_display_enhance_color_title">रंगों को बढ़ाएँ</string>
   <string name="live_display_enhance_color_summary">मनुष्यों के चित्रों, कुदरती दृश्यों और अन्य छवियों में रंगों की जीवंतता सुधारें</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">संतृप्ति</string>
+  <string name="adj_contrast_title">कोंट्रास्ट</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">चयनकर्ता आइकन</string>
   <string name="ime_switcher_notify_summary">इन्पुट विधि चयनकर्ता आइकन को दिखाएँ</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index ff8263c..06ba6ad 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Samo aplikacije</string>
   <string name="root_access_adb">Samo ADB</string>
   <string name="root_access_all">Aplikacije i ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -550,6 +551,7 @@
   <string name="volume_adjust_sounds_title">Zvuk podešavanja glasnoće</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intenzitet vibracije</string>
+  <string name="vibrator_warning">Vrijednosti više od %1$d%% nisu preporučene</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibracija boja</string>
   <string name="color_calibration_summary">Kalibriraj boje zaslona</string>
@@ -572,15 +574,6 @@
   <string name="display_rotation_90_title">90 stupnjeva</string>
   <string name="display_rotation_180_title">180 stupnjeva</string>
   <string name="display_rotation_270_title">270 stupnjeva</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vidi zadanu sliku</string>
-  <string name="selectnewfile_menu">Pogledaj novu sliku iz galerije</string>
-  <string name="selectfile_menu">Prikaz slike iz galerije</string>
-  <string name="restore_default_str">Ponovno postavi</string>
-  <string name="hue_str">Nijansa: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Zasićenost: <xliff:g id="saturation_value">%1$s </xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s </xliff:g></string>
-  <string name="intensity_str">Intenzitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Prilagođuje zaslon prema vremenu dana i okolini za poboljšanje čitljivosti i smanjenje naprezanja očiju.</string>
   <string name="live_display_mode">Način prikaza</string>
@@ -612,6 +605,13 @@
   <string name="live_display_color_profile_basic_summary">Koristite ne kalibriran zaslon</string>
   <string name="live_display_color_profile_adaptive_title">Prilagodljiv</string>
   <string name="live_display_color_profile_adaptive_summary">Boje se prilagođavaju ambijentnim uslovima</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Podešavanje slike</string>
+  <string name="picture_adjustment_summary">PrilagodI nijansu, zasićenost, intenzitet i kontrast</string>
+  <string name="adj_hue_title">Nijansa</string>
+  <string name="adj_saturation_title">Zasićenje</string>
+  <string name="adj_intensity_title">Intenzitet</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selektor obavijesti</string>
   <string name="ime_switcher_notify_summary">Prikaz načina unosa za odabir ikona</string>
@@ -809,7 +809,7 @@
   <string name="blacklist_prefs">Postavke</string>
   <string name="blacklist_button_delete">Obriši</string>
   <string name="blacklist_empty_text">Nemate blokiranih brojeva. Dodajte unos dodirom na gumb Dodaj (+).</string>
-  <string name="blacklist_disabled_empty_text">Da biste spriječili telefonske brojeve da vas zove ili da vam šalju poruke, omogućite popis blokiranih pozivatelja.</string>
+  <string name="blacklist_disabled_empty_text">Da biste spriječili telefonske brojeve da vas zovu ili da vam šalju poruke, omogućite popis blokiranih pozivatelja.</string>
   <string name="blacklist_summary_disabled">Onemogućeno</string>
   <string name="blacklist_summary">Nećete primati dolazne pozive ili poruke od telefonskih brojeva na popisu blokiranih pozivatelja</string>
   <string name="blacklist_notify">Prikaži obavijest</string>
@@ -1069,4 +1069,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">lijevoj strani</string>
   <string name="security_settings_fingerprint_sensor_location_right">desnoj strani</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Glas: <xliff:g id="voice_status">%1$s</xliff:g> / Podaci: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 8fd4e5b..b2ee3a2 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Csak alkalmazások</string>
   <string name="root_access_adb">Csak ADB</string>
   <string name="root_access_all">Alkalmazások és ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -569,15 +570,6 @@
   <string name="display_rotation_90_title">90 fok</string>
   <string name="display_rotation_180_title">180 fok</string>
   <string name="display_rotation_270_title">270 fok</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Alapértelmezett kép megtekintése</string>
-  <string name="selectnewfile_menu">Új kép megtekintése a galériából</string>
-  <string name="selectfile_menu">Kép megtekintése a galériából</string>
-  <string name="restore_default_str">Visszaállítás</string>
-  <string name="hue_str">Színárnyalat: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Telítettség: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontraszt: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intenzitás: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizálja a képernyőt a napszaknak és a fényviszonyoknak megfelelően, javítva az olvashatóságot és csökkentve a szemek terhelését</string>
   <string name="live_display_mode">Képernyő mód</string>
@@ -607,6 +599,9 @@
   <string name="live_display_color_profile_photography_summary">Tökéletes színreprodukció fotókhoz</string>
   <string name="live_display_color_profile_basic_title">Alap</string>
   <string name="live_display_color_profile_basic_summary">Kijelző használata kalibrálatlanul</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Telítettség</string>
+  <string name="adj_contrast_title">Kontraszt</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Választó ikon</string>
   <string name="ime_switcher_notify_summary">Beviteli mód választó ikon megjelenítése</string>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index b6a48c7..3d7acdc 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">Aplikasi saja</string>
   <string name="root_access_adb">ADB saja</string>
   <string name="root_access_all">Aplikasi dan ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">Komunikasi jarak dekat</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -359,7 +360,7 @@
   <string name="app_ops_summaries_get_accounts">mendapatkan laporan</string>
   <string name="app_ops_summaries_toggle_wifi">beralih ke Wi-Fi</string>
   <string name="app_ops_summaries_toggle_bluetooth">beralih ke bluetooth</string>
-  <string name="app_ops_summaries_start_at_boot">mulai saat boot</string>
+  <string name="app_ops_summaries_start_at_boot">mulai saat but</string>
   <string name="app_ops_summaries_toggle_nfc">beralih ke NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">mengalihkan data seluler</string>
   <string name="app_ops_summaries_superuser">akses punca (root)</string>
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90 derajat</string>
   <string name="display_rotation_180_title">180 derajat</string>
   <string name="display_rotation_270_title">270 derajat</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Lihat gambar semula</string>
-  <string name="selectnewfile_menu">Lihat gambar baru dari Galeri</string>
-  <string name="selectfile_menu">Lihat gambar dari Galeri</string>
-  <string name="restore_default_str">Atur kembali</string>
-  <string name="hue_str">Rona: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturasi: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontras: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalkan layar berdasarkan waktu dan kondisi ruangan untuk meningkatkan keterbacaan dan mengurangi kelelahan mata</string>
   <string name="live_display_mode">Modus tampilan</string>
@@ -608,6 +600,9 @@
   <string name="live_display_color_profile_photography_summary">Reproduksi warna yang sempurna untuk foto</string>
   <string name="live_display_color_profile_basic_title">Dasar</string>
   <string name="live_display_color_profile_basic_summary">Gunakan tampilan yang belum disesuaikan</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturasi</string>
+  <string name="adj_contrast_title">Kontras</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikon pemilih</string>
   <string name="ime_switcher_notify_summary">Tampilkan ikon metode pemilih masukan</string>
@@ -771,7 +766,7 @@
   <string name="notification_ringtone_title_cm">Nada pemberitahuan</string>
   <!-- Advanced reboot options -->
   <string name="advanced_reboot_title">But ulang lanjutan</string>
-  <string name="advanced_reboot_summary">Ketika dibuka, sertakan opsi dalam menu daya untuk but ulang ke pemulihan, pengelola but, atau melakukan but ulang tanpa mati daya</string>
+  <string name="advanced_reboot_summary">Ketika tidak terkunci, sertakan opsi dalam menu Daya untuk but ulang ke pemulihan, bootloader, atau melakukan but ulang cepat</string>
   <string name="category_interface">Antarmuka</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Destop yang diperluas</string>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index b3043e5..3a63038 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -38,6 +38,9 @@
   <string name="root_access_apps">Solo app</string>
   <string name="root_access_adb">Solo ADB</string>
   <string name="root_access_all">App e ADB</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gestione accesso root</string>
+  <string name="root_appops_summary">Visualizza e controlla l\'utilizzo dei permessi root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +575,6 @@
   <string name="display_rotation_90_title">90 gradi</string>
   <string name="display_rotation_180_title">180 gradi</string>
   <string name="display_rotation_270_title">270 gradi</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Visualizza immagine predefinita</string>
-  <string name="selectnewfile_menu">Visualizza nuova immagine dalla Galleria</string>
-  <string name="selectfile_menu">Visualizza immagine dalla Galleria</string>
-  <string name="restore_default_str">Reimposta</string>
-  <string name="hue_str">Tonalità: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturazione: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrasto: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensità: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Ottimizza lo schermo in base all\'ora del giorno e alle condizioni ambientali per migliorare la leggibilità e ridurre l\'affaticamento degli occhi</string>
   <string name="live_display_mode">Modalità display</string>
@@ -612,6 +606,13 @@
   <string name="live_display_color_profile_basic_summary">Usa il display non calibrato</string>
   <string name="live_display_color_profile_adaptive_title">Adattivo</string>
   <string name="live_display_color_profile_adaptive_summary">I colori si adattano alle condizioni ambientali</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Regolazione immagine</string>
+  <string name="picture_adjustment_summary">Regola tonalità, saturazione, intensità e contrasto</string>
+  <string name="adj_hue_title">Tonalità</string>
+  <string name="adj_saturation_title">Saturazione</string>
+  <string name="adj_intensity_title">Intensità</string>
+  <string name="adj_contrast_title">Contrasto</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icona selettore</string>
   <string name="ime_switcher_notify_summary">Mostra l\'icona del selettore metodo di immissione</string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index b6d3003..3f10d08 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -40,6 +40,7 @@
   <string name="root_access_apps">יישומים בלבד</string>
   <string name="root_access_adb">ADB בלבד</string>
   <string name="root_access_all">יישומים ו-ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -574,15 +575,6 @@
   <string name="display_rotation_90_title">90 מעלות</string>
   <string name="display_rotation_180_title">180 מעלות</string>
   <string name="display_rotation_270_title">270 מעלות</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">צפה בתמונת ברירת מחדל</string>
-  <string name="selectnewfile_menu">בחר תמונה חדשה מגלריה</string>
-  <string name="selectfile_menu">בחר תמונה מגלריה</string>
-  <string name="restore_default_str">איפוס</string>
-  <string name="hue_str">גוון: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">רוויה: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ניגודיות: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">עוצמה: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">התאם את מסך מכשירך בהתאם לשעה ולתנאי הסביבה על מנת לשפר את נוחות הקריאה ולהפחית את עייפות העין</string>
   <string name="live_display_mode">מצב תצוגה</string>
@@ -613,6 +605,9 @@
   <string name="live_display_color_profile_basic_title">בסיסי</string>
   <string name="live_display_color_profile_basic_summary">השתמש בתצוגה ללא כיול</string>
   <string name="live_display_color_profile_adaptive_title">מסתגל</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">רוויה</string>
+  <string name="adj_contrast_title">ניגודיות</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">סמל בורר</string>
   <string name="ime_switcher_notify_summary">הצג סמל בחירת קלט כתיבה</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 5b3a9e9..667c072 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">アプリのみ</string>
   <string name="root_access_adb">ADBのみ</string>
   <string name="root_access_all">アプリとADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90度</string>
   <string name="display_rotation_180_title">180度</string>
   <string name="display_rotation_270_title">270度</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">デフォルトの写真を表示</string>
-  <string name="selectnewfile_menu">ギャラリーから新しい写真を表示</string>
-  <string name="selectfile_menu">ギャラリーから写真を表示</string>
-  <string name="restore_default_str">リセット</string>
-  <string name="hue_str">色相: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">彩度: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">コントラスト: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">強度: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">画面を見やすく、目の疲れを軽減するために、時間と周囲の環境に合わせて画面を最適化する</string>
   <string name="live_display_mode">ディスプレイのモード</string>
@@ -608,6 +600,9 @@
   <string name="live_display_color_profile_photography_summary">写真の完全な色再現</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">無調整のディスプレイを使用する</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">彩度</string>
+  <string name="adj_contrast_title">コントラスト</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">入力方法の選択のアイコン</string>
   <string name="ime_switcher_notify_summary">入力方法の選択のアイコンを表示する</string>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 6079a57..9a76f56 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">ಆಪ್ಸ್ ಮಾತ್ರ</string>
   <string name="root_access_adb">ಎಡಿಬಿ ಮಾತ್ರ</string>
   <string name="root_access_all">ಆಪ್ಸ್ ಮತ್ತು ಎಡಿಬಿ</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">ಎನ್ಎಫ್‍ಸಿ</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 ಡಿಗ್ರಿ</string>
   <string name="display_rotation_180_title">180 ಡಿಗ್ರಿ</string>
   <string name="display_rotation_270_title">270 ಡಿಗ್ರಿ</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ಡೀಫಾಲ್ಟ್ ಫೋಟೋ ವೀಕ್ಷಿಸಿ</string>
-  <string name="selectnewfile_menu">ಹೊಸ ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
-  <string name="selectfile_menu">ಫೋಟೋವನ್ನು ಗ್ಯಾಲರಿಯಿಂದ ವೀಕ್ಷಿಸಿ</string>
-  <string name="restore_default_str">ಮರುಹೊಂದಿಸು</string>
-  <string name="hue_str">ವರ್ಣ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">ಸ್ಯಾಚುರೇಶನ್: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ಕಾಂಟ್ರಾಸ್ಟ್: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">ತೀವ್ರತೆ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ದಿನದ ಸಮಯ ಮತ್ತು ಆಂಬಿಯೆಂಟ್ ಪರಿಸ್ಥಿತಿಯನ್ನು ಆಧಾರಿಸಿ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡುವುದರ ಮೂಲಕ ವಾಚನೀಯತೆಯನ್ನು ಉತ್ತಮಗೊಳಿಸುವುದರೊಂದಿಗೆ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
   <string name="live_display_mode">ಪ್ರದರ್ಶನ ಮೋಡ್</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">ಫೊಟೋಗಳಿಗೆ ಪರಿಪೂರ್ಣ ಬಣ್ಣದ ಪುನರುತ್ಪಾದನೆ</string>
   <string name="live_display_color_profile_basic_title">ಮೂಲಭೂತ</string>
   <string name="live_display_color_profile_basic_summary">ಪ್ರದರ್ಶನವು ಅನ್ ಕ್ಯಾಲಿಬರೇಟೆಡ್ ಅನ್ನು ಉಪಯೋಗಿಸಿ</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">ಸ್ಯಾಚುರೇಶನ್</string>
+  <string name="adj_contrast_title">ಕಾಂಟ್ರಾಸ್ಟ್</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">ಆಯ್ಕೆಮಾಡುವ ಐಕಾನ್</string>
   <string name="ime_switcher_notify_summary">ಇನ್ಪುಟ್ ವಿಧಾನ ಆಯ್ಕೆಮಾಡುವ ಐಕಾನ್ ಪ್ರದರ್ಶಿಸು</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 92fe4ac..5c63a78 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">애플리케이션만</string>
   <string name="root_access_adb">ADB만</string>
   <string name="root_access_all">애플리케이션과 ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90도</string>
   <string name="display_rotation_180_title">180도</string>
   <string name="display_rotation_270_title">270도</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">기본 사진 보기</string>
-  <string name="selectnewfile_menu">갤러리에서 새 사진 보기</string>
-  <string name="selectfile_menu">갤러리에서 사진 보기</string>
-  <string name="restore_default_str">초기화</string>
-  <string name="hue_str">색조: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">채도: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">대비: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">강도: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">가독성을 향상시키고 눈의 피로를 줄이기 위해 주변 환경과 시간에 따라 화면을 최적화</string>
   <string name="live_display_mode">디스플레이 모드</string>
@@ -608,6 +600,9 @@
   <string name="live_display_color_profile_photography_summary">사진을 위한 완벽한 색 재현력</string>
   <string name="live_display_color_profile_basic_title">기본</string>
   <string name="live_display_color_profile_basic_summary">디스플레이를 보정하지 않은 상태로 사용</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">채도</string>
+  <string name="adj_contrast_title">명암비</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">입력기 전환 알림</string>
   <string name="ime_switcher_notify_summary">입력기 전환키 표시</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 6a29850..59f829a 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -34,6 +34,7 @@
   <string name="root_access_apps">بەرنامەکان تەنها</string>
   <string name="root_access_adb">تەنها ADB</string>
   <string name="root_access_all">بەرنامەکان و ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">وەشانی کوردی</string>
@@ -470,15 +471,6 @@
   <string name="display_rotation_90_title">90 پلە</string>
   <string name="display_rotation_180_title">180 پلە</string>
   <string name="display_rotation_270_title">270 پلە</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">بینینی وێنەی بنەڕەتی</string>
-  <string name="selectnewfile_menu">بینینی وێنەی نوێ لە پێشانگەوە</string>
-  <string name="selectfile_menu">بینینی وێنە لە پێشانگەوە</string>
-  <string name="restore_default_str">ڕێکخستنەوە</string>
-  <string name="hue_str">ڕەنگ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">تێریی ڕەنگ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">کۆنتراست: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">توندێتیی ڕەنگ: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">پاشینەسازی لەسەر شاشەکەت  بەندە بە کاتی ڕۆژ وە مەرجی چاکسازی بۆ خوێندنەوەی و کەمکردنەوەی چاوسوین</string>
   <string name="live_display_mode">پیشاندانی بار</string>
@@ -492,6 +484,9 @@
   <string name="live_display_low_power_title">کەمکردنەوەی هێزی بەکارهێنان</string>
   <string name="live_display_low_power_summary">ڕێکخستنی پیشاندان بۆ هێزی کەم بەکارهێنان بەبێ پلەدابەزاندن</string>
   <string name="live_display_enhance_color_title">ڕەنگی زیادەکات</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">تێرایی</string>
+  <string name="adj_contrast_title">جیاوازی</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">هەڵبژاردەی وێنۆچکە</string>
   <string name="ime_switcher_notify_summary">پیشاندانی ڕێگەی هەڵبژاردەی وێنۆچکە</string>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 862b713..684487f 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Just Appen</string>
   <string name="root_access_adb">Just ADB</string>
   <string name="root_access_all">Appen an ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -548,15 +549,6 @@
   <string name="display_rotation_90_title">90 Grad</string>
   <string name="display_rotation_180_title">180 Grad</string>
   <string name="display_rotation_270_title">270 Grad</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Standard-Bild uweisen</string>
-  <string name="selectnewfile_menu">Neit Bild aus der Galerie uweisen</string>
-  <string name="selectfile_menu">Bild aus der Galerie uweisen</string>
-  <string name="restore_default_str">Zrécksetzen</string>
-  <string name="hue_str">Faarftoun: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Sättegung: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitéit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optiméiert däi Schierm andeem s e sech op der Dageszäit an den Ëmgéigendskonditioune baséiert, fir d\'Liesbarkeet ze verbesseren an d\'Ermiddung vun den Aen ze reduzéieren</string>
   <string name="live_display_mode">Schiermmodus</string>
@@ -582,6 +574,9 @@
   <string name="live_display_color_profile_astronomy_title">Astronomie</string>
   <string name="live_display_color_profile_astronomy_summary">Déif Routtéin fir d\'Nuetsvisioun ze halen</string>
   <string name="live_display_color_profile_basic_title">Einfach</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Faarfsättegung</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Auswielsymbol</string>
   <string name="ime_switcher_notify_summary">Symbol fir de Wiessel vun der Agabmethod uweisen</string>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index dfafc8b..b052428 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Tik programos</string>
   <string name="root_access_adb">Tik „Android“ derinimas</string>
   <string name="root_access_all">Programos ir „Android“ derinimas</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -506,15 +507,6 @@
   <string name="display_rotation_90_title">90 laipsnių</string>
   <string name="display_rotation_180_title">180 laipsnių</string>
   <string name="display_rotation_270_title">270 laipsnių</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Žiūrėti numatytąjį vaizdą</string>
-  <string name="selectnewfile_menu">Žiūrėti naują vaizdą iš galerijos</string>
-  <string name="selectfile_menu">Žiūrėti vaizdą iš galerijos</string>
-  <string name="restore_default_str">Atstatyti</string>
-  <string name="hue_str">Atspalvis: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturacija: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrastas: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensyvumas: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimizuoti ekraną remiantis paros metu ir aplinkos sąlygomis, siekiant pagerinti įskaitomumą ir sumažinti akių įtampą</string>
   <string name="live_display_mode">Rodymo režimas</string>
@@ -539,6 +531,9 @@
   <string name="live_display_color_profile_cinema_title">Kinas</string>
   <string name="live_display_color_profile_astronomy_title">Astronomija</string>
   <string name="live_display_color_profile_astronomy_summary">Tamsiai raudonos spalvos, saugoti naktinį matymą</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturacija</string>
+  <string name="adj_contrast_title">Kontrastas</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Pasirinkimo piktograma</string>
   <string name="ime_switcher_notify_summary">Rodyti įvesties metodo pasirinkimo piktogramą</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 10b71f3..b25abcd 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -30,6 +30,7 @@
   <string name="root_access_apps">Tikai lietotnēm</string>
   <string name="root_access_adb">Tikai ADB</string>
   <string name="root_access_all">Lietotnēm un ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod versija</string>
@@ -369,16 +370,8 @@
   <string name="display_rotation_90_title">90 grādi</string>
   <string name="display_rotation_180_title">180 grādi</string>
   <string name="display_rotation_270_title">270 grādi</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Skatīt noklusēto attēlu</string>
-  <string name="selectnewfile_menu">Skatīt jaunu attēlu no galerijas</string>
-  <string name="selectfile_menu">Skatīt attēlu no galerijas</string>
-  <string name="restore_default_str">Atstatīt</string>
-  <string name="hue_str">Tonis: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Piesātinājums: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrasts: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Spilgtums: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index c3cfce2..e1e9591 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">ആപ്ലിക്കേഷനുകള്‍ മാത്രം</string>
   <string name="root_access_adb">ADB മാത്രം</string>
   <string name="root_access_all">അപ്ലിക്കേഷനുകളും ADB യും</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 ഡിഗ്രി</string>
   <string name="display_rotation_180_title">180 ഡിഗ്രി</string>
   <string name="display_rotation_270_title">270 ഡിഗ്രി</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ഡിഫോള്‍ട്ട് ചിത്രം കാണുക</string>
-  <string name="selectnewfile_menu">ഗാലറിയിൽ നിന്നും പുതിയ ചിത്രം കാണുക</string>
-  <string name="selectfile_menu">ഗാലറിയിൽ നിന്നും ചിത്രം കാണുക</string>
-  <string name="restore_default_str">പുനഃസജ്ജമാക്കുക</string>
-  <string name="hue_str">ഹ്യൂ <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">സാച്ചുറേഷൻ: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ദൃശ്യതീവ്രത: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">തീവ്രത: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">വായനാക്ഷമത മെച്ചപ്പെടുത്തുന്നതിനും കണ്ണുകളുടെ സമ്മര്‍ദ്ദം കുറയ്ക്കാനും സമയത്തിന്‍റെയും ചുറ്റുപാടിന്റെ സാഹചര്യത്തിന്റെയും അടിസ്ഥാനത്തില്‍ നിങ്ങളുടെ സ്ക്രീന്‍ ഒപ്റ്റിമൈസ് ചെയ്യുക.</string>
   <string name="live_display_mode">ഡിസ്പ്ലേ മോഡ്</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">ഫോട്ടോകൾക്കായി സമ്പൂര്‍ണ്ണ കളര്‍ റീപ്രൊഡക്ഷന്‍</string>
   <string name="live_display_color_profile_basic_title">ബേസിക്</string>
   <string name="live_display_color_profile_basic_summary">ഡിസ്പ്ലേ അണ്‍കാലിബറേറ്റഡ് ഉപയോഗിക്കുക</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">സാച്ചുറേഷൻ</string>
+  <string name="adj_contrast_title">ദൃശ്യതീവ്രത</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">ഐക്കൺ സെലക്ടർ</string>
   <string name="ime_switcher_notify_summary">ഇൻപുട്ട് മെത്തേഡ് സെലക്ടർ ഐക്കൺ ദൃശ്യമാക്കുക</string>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 110df02..365ab22 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">केवळ अनुप्रयोग</string>
   <string name="root_access_adb">केवळ ADB</string>
   <string name="root_access_all">अनुप्रयोग आणि ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 अंश</string>
   <string name="display_rotation_180_title">180 अंश</string>
   <string name="display_rotation_270_title">270 अंश</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">डिफॉल्ट चित्र पाहा</string>
-  <string name="selectnewfile_menu">गॅलरीतून नवीन चित्र पाहा</string>
-  <string name="selectfile_menu">गॅलरीतून चित्र पाहा</string>
-  <string name="restore_default_str">रीसेट करा</string>
-  <string name="hue_str">रंगछटा: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">संपृक्तता: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">वैधर्म्य: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">तीव्रता: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">वाचनीयता सुधारण्यासाठी आणि डोळ्यांवरील ताण कमी करण्यासाठी दिवसाची वेळ आणि आसपासची स्थिती यानुसार तुमचा स्क्रीन अनुकूल करा</string>
   <string name="live_display_mode">प्रदर्शन मोड</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">फोटोंसाठी अचूर रंग पुनरुत्पादन</string>
   <string name="live_display_color_profile_basic_title">मुलभूत</string>
   <string name="live_display_color_profile_basic_summary">कॅलिब्रेट न केलेले प्रदर्शन वापरा</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">संपृक्तता</string>
+  <string name="adj_contrast_title">तीव्रता</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">निवडणारे प्रतीक</string>
   <string name="ime_switcher_notify_summary">इनपुट पध्दत निवडणारे प्रतीक प्रदर्शित करा</string>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 30ba450..1154e41 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Kun apper</string>
   <string name="root_access_adb">Kun ADB</string>
   <string name="root_access_all">Apps og ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 grader</string>
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vis standardbilde</string>
-  <string name="selectnewfile_menu">Vis nytt bilde fra galleriet</string>
-  <string name="selectfile_menu">Vis bilde fra galleriet</string>
-  <string name="restore_default_str">Tilbakestille</string>
-  <string name="hue_str">Fargetone: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Metning: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalisere skjermen basert på tidspunkt på dagen og omgivelsesforhold å forbedre lesbarhet og redusere belastningen på øynene</string>
   <string name="live_display_mode">Visningsmodus</string>
@@ -612,6 +604,13 @@
   <string name="live_display_color_profile_basic_summary">Bruk skjermen ukalibrert</string>
   <string name="live_display_color_profile_adaptive_title">Tilpassende</string>
   <string name="live_display_color_profile_adaptive_summary">Farger tilpasser seg til omgivelsene</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Bildejustering</string>
+  <string name="picture_adjustment_summary">Juster fargetone, metning, intensitet og kontrast</string>
+  <string name="adj_hue_title">Fargetone</string>
+  <string name="adj_saturation_title">Metning</string>
+  <string name="adj_intensity_title">Intensitet</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Valgikon</string>
   <string name="ime_switcher_notify_summary">Viser inndatametode snarvei</string>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index cf14d07..74abd36 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Alleen apps</string>
   <string name="root_access_adb">Alleen ADB</string>
   <string name="root_access_all">Apps en ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90 graden</string>
   <string name="display_rotation_180_title">180 graden</string>
   <string name="display_rotation_270_title">270 graden</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Standaardfoto bekijken</string>
-  <string name="selectnewfile_menu">Nieuwe foto uit Galerij bekijken</string>
-  <string name="selectfile_menu">Foto uit Galerij bekijken</string>
-  <string name="restore_default_str">Opnieuw instellen</string>
-  <string name="hue_str">Tint: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Verzadiging: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensiteit: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Uw scherm optimaliseren aan de hand van tijdstip op de dag en lichtomstandigheden om de leesbaarheid te verbeteren en oogvermoeidheid te verminderen</string>
   <string name="live_display_mode">Weergavemodus</string>
@@ -608,6 +600,12 @@
   <string name="live_display_color_profile_photography_summary">Perfecte kleurweergave voor foto\'s</string>
   <string name="live_display_color_profile_basic_title">Basis</string>
   <string name="live_display_color_profile_basic_summary">Scherm ongekalibreerd gebruiken</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_summary">Tint, verzadiging, intensiteit en contrast aanpassen</string>
+  <string name="adj_hue_title">Tint</string>
+  <string name="adj_saturation_title">Verzadiging</string>
+  <string name="adj_intensity_title">Intensiteit</string>
+  <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Melding invoermethode</string>
   <string name="ime_switcher_notify_summary">Invoermethodepictogram weergeven</string>
@@ -1018,6 +1016,7 @@
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Achtergrond</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
   <!-- SIM status format string -->
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index a135040..6f1ce99 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">କେବଳ ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ</string>
   <string name="root_access_adb">କେବଳ ADB</string>
   <string name="root_access_all">ଆପ୍ଲିକେସନ୍‍ଗୁଡିକ ଓ ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 ଡିଗ୍ରୀ</string>
   <string name="display_rotation_180_title">180 ଡିଗ୍ରୀ</string>
   <string name="display_rotation_270_title">270 ଡିଗ୍ରୀ</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ଡିଫଲ୍ଟ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
-  <string name="selectnewfile_menu">ଗ୍ୟାଲେରୀରୁ ନୂଆ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
-  <string name="selectfile_menu">ଗ୍ୟାଲେରୀରୁ ଚିତ୍ର ଦେଖାନ୍ତୁ</string>
-  <string name="restore_default_str">ପୁନଃସେଟ୍</string>
-  <string name="hue_str">ହ୍ୟୁ: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">ସାଚୁରେସନ୍‍: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">କଣ୍ଟ୍ରାଷ୍ଟ: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">ତୀବ୍ରତା: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ରିଡେବିଲିଟି ବୃଦ୍ଧି କରିବା ପାଇଁ ଓ ୱ୍ୱିଷ୍ଟ୍ରେନ୍‍ ହ୍ରାସ କରିବା ପାଇଁ ଆପଣଙ୍କ ସ୍କ୍ରିନ୍‍ ଦିନର ସମୟ ଓ ଆମ୍ବିଏଣ୍ଟ ସର୍ତ୍ତାବଳି ଉପରେ ନିଭର କରି ଅପ୍ଟିମାଇଜ୍‍ କରନ୍ତୁ</string>
   <string name="live_display_mode">ଡିସ୍‍ପ୍ଲେ ମୋଡ୍‍</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">ଫଟୋଗୁଡିକ ପାଇଁ ସଠିକ୍‍ ରଙ୍ଗ ପୁନଃପ୍ରସ୍ତୁତି</string>
   <string name="live_display_color_profile_basic_title">ସାଧାରଣ</string>
   <string name="live_display_color_profile_basic_summary">ଡିସ୍‍ପ୍ଲେ ଅନ୍‍କାଲିବ୍ରେଟ୍‍ କରି ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">ସମ୍ପୃକ୍ତି</string>
+  <string name="adj_contrast_title">କଣ୍ଟ୍ରାଷ୍ଟ</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">ଆଇକନ୍‍ ଚୟନ</string>
   <string name="ime_switcher_notify_summary">ଇନ୍‍ପୁଟ୍‍ ପଧତି ସିଲେକ୍ଟର ଆଇକନ୍‍ ଡିସ୍‍ପ୍ଲେ କରନ୍ତୁ</string>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 9fd9bf5..e6fe116 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -34,6 +34,7 @@
   <string name="root_access_apps">Tylko aplikacje</string>
   <string name="root_access_adb">Tylko ADB</string>
   <string name="root_access_all">Aplikacje i ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -566,15 +567,6 @@
   <string name="display_rotation_90_title">90 stopni</string>
   <string name="display_rotation_180_title">180 stopni</string>
   <string name="display_rotation_270_title">270 stopni</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Pokaż domyślny obraz</string>
-  <string name="selectnewfile_menu">Zobacz nowy obraz w Galerii</string>
-  <string name="selectfile_menu">Zobacz zdjęcie z Galerii</string>
-  <string name="restore_default_str">Resetuj</string>
-  <string name="hue_str">Odcień: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Nasycenie: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensywność: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optymalizuj swój ekran bazując na porze dnia i warunkach panujących w otoczeniu, aby zwiększyć czytelność i zmniejszyć uczucie zmęczenia oczu</string>
   <string name="live_display_mode">Tryb wyświetlania</string>
@@ -604,6 +596,9 @@
   <string name="live_display_color_profile_photography_summary">Najlepsza reprodukcja kolorów na zdjęciach</string>
   <string name="live_display_color_profile_basic_title">Podstawowe</string>
   <string name="live_display_color_profile_basic_summary">Używaj nieskalibrowanego wyświetlacza</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Nasycenie</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona selektora</string>
   <string name="ime_switcher_notify_summary">Wyświetl ikonę selektora metody wprowadzania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index c5e0b52..7258eb3 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Somente aplicativos</string>
   <string name="root_access_adb">Somente ADB</string>
   <string name="root_access_all">Aplicativos e ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 graus</string>
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Visualizar imagem padrão</string>
-  <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
-  <string name="selectfile_menu">Visualizar imagem da Galeria</string>
-  <string name="restore_default_str">Redefinir</string>
-  <string name="hue_str">Tonalidade: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza sua tela com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir o cansaço visual</string>
   <string name="live_display_mode">Modo da tela</string>
@@ -612,6 +604,13 @@
   <string name="live_display_color_profile_basic_summary">Use o visor não calibrado</string>
   <string name="live_display_color_profile_adaptive_title">Adaptável</string>
   <string name="live_display_color_profile_adaptive_summary">As cores adaptam-se às condições do ambiente</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajuste da imagem</string>
+  <string name="picture_adjustment_summary">Ajustar o matiz, saturação, contraste e intensidade</string>
+  <string name="adj_hue_title">Matiz</string>
+  <string name="adj_saturation_title">Saturação</string>
+  <string name="adj_intensity_title">Intensidade</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ícone de seleção</string>
   <string name="ime_switcher_notify_summary">Mostrar ícone de seleção de método de entrada</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index ef12bdb..7f728ae 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Só aplicações</string>
   <string name="root_access_adb">Só ADB</string>
   <string name="root_access_all">Aplicações e ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 graus</string>
   <string name="display_rotation_180_title">180 graus</string>
   <string name="display_rotation_270_title">270 graus</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Visualizar imagem predefinida</string>
-  <string name="selectnewfile_menu">Visualizar nova imagem da Galeria</string>
-  <string name="selectfile_menu">Visualizar imagem da Galeria</string>
-  <string name="restore_default_str">Repor</string>
-  <string name="hue_str">Tonalidade: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturação: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contraste: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensidade: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Otimiza o ecrã com base na hora do dia e condições do ambiente para melhorar a legibilidade e reduzir a fadiga ocular</string>
   <string name="live_display_mode">Modo de exibição</string>
@@ -612,6 +604,9 @@
   <string name="live_display_color_profile_basic_summary">Utilizar o ecrã não calibrado</string>
   <string name="live_display_color_profile_adaptive_title">Adaptável</string>
   <string name="live_display_color_profile_adaptive_summary">As cores adaptam-se às condições ambientais</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturação</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ícone de seleção</string>
   <string name="ime_switcher_notify_summary">Mostrar ícone de seleção de método de entrada</string>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index 1f0e8c7..bcaaba2 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Doar aplicații</string>
   <string name="root_access_adb">Doar ADB</string>
   <string name="root_access_all">Aplicații și ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -540,15 +541,6 @@
   <string name="display_rotation_90_title">90 de grade</string>
   <string name="display_rotation_180_title">180 de grade</string>
   <string name="display_rotation_270_title">270 de grade</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Vezi imaginea implicită</string>
-  <string name="selectnewfile_menu">Vezi noua imagine din Galerie</string>
-  <string name="selectfile_menu">Vezi imaginea din Galerie</string>
-  <string name="restore_default_str">Resetare</string>
-  <string name="hue_str">Nuanța: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Saturația: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Contrastul: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitatea: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_mode">Mod de afișare</string>
   <string name="live_display_color_temperature_title">Temperatura culorii</string>
@@ -569,6 +561,9 @@
   <string name="live_display_color_profile_astronomy_title">Astronomie</string>
   <string name="live_display_color_profile_photography_title">Fotografie</string>
   <string name="live_display_color_profile_basic_summary">Utilizează ecranul necalibrat</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Saturație</string>
+  <string name="adj_contrast_title">Contrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selectorul pictogramă</string>
   <string name="ime_switcher_notify_summary">Afișează pictograma selectorului metodei de introducere</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 6e5b38c..2ecb17a 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Только для приложений</string>
   <string name="root_access_adb">Только для ADB</string>
   <string name="root_access_all">Для приложений и ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 градусов</string>
   <string name="display_rotation_180_title">180 градусов</string>
   <string name="display_rotation_270_title">270 градусов</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Стандартный значок</string>
-  <string name="selectnewfile_menu">Выбрать новое изображение из «Галереи»</string>
-  <string name="selectfile_menu">Выбрать из «Галереи»</string>
-  <string name="restore_default_str">Сброс</string>
-  <string name="hue_str">Оттенок: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Насыщенность: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Контрастность: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Интенсивность: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Подстраивать экран на основе времени суток и освещения, чтобы повысить удобочитаемость и снизить нагрузку на глаза</string>
   <string name="live_display_mode">Режим экрана</string>
@@ -612,6 +604,9 @@
   <string name="live_display_color_profile_basic_summary">Использовать неоткалиброванный дисплей</string>
   <string name="live_display_color_profile_adaptive_title">Адаптивный</string>
   <string name="live_display_color_profile_adaptive_summary">Цвета адаптируются к условиям окружающей среды</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Насыщенность</string>
+  <string name="adj_contrast_title">Контрастность</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Значок выбора метода ввода</string>
   <string name="ime_switcher_notify_summary">Отображать переключатель метода ввода при открытии текстовых полей</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index beb668e..b8c12d8 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -30,6 +30,7 @@
   <string name="root_access_apps">යෙදුම් පමණි</string>
   <string name="root_access_adb">ADB පමණි</string>
   <string name="root_access_all">යෙදුම් සහ ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod අනුවාදය</string>
@@ -377,16 +378,8 @@
   <string name="display_rotation_90_title">අංශක 90</string>
   <string name="display_rotation_180_title">අංශක 180</string>
   <string name="display_rotation_270_title">අංශක 270</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">පෙරනිමි පින්තූරය බලන්න</string>
-  <string name="selectnewfile_menu">ගැලරියෙන් නව පින්තූරයක් බලන්න</string>
-  <string name="selectfile_menu">ගැලරියෙන් පින්තූරය බලන්න</string>
-  <string name="restore_default_str">යලි පිහිටුවන්න</string>
-  <string name="hue_str">කෑගැසීම: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">සන්තෘප්තිය: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ප්‍රභේදනය: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">තීව්‍රතාව: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 1424557..280e30a 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Iba aplikácie</string>
   <string name="root_access_adb">Iba ADB</string>
   <string name="root_access_all">Aplikácie a ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -506,15 +507,6 @@
   <string name="display_rotation_90_title">90 stupňov</string>
   <string name="display_rotation_180_title">180 stupňov</string>
   <string name="display_rotation_270_title">270 stupňov</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Zobraziť predvolený obrázok</string>
-  <string name="selectnewfile_menu">Zobraziť nový obrázok z Galérie</string>
-  <string name="selectfile_menu">Zobraziť obrázok z Galérie</string>
-  <string name="restore_default_str">Obnoviť</string>
-  <string name="hue_str">Odtieň: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Sýtosť: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intenzita: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimalizovať vašu obrazovku na základe dennej doby a podmienok okolia na zlepšenie čitateľnosti a zníženie únavy očí</string>
   <string name="live_display_mode">Režim zobrazenia</string>
@@ -539,6 +531,9 @@
   <string name="live_display_color_profile_cinema_title">Kino</string>
   <string name="live_display_color_profile_astronomy_title">Astronómia</string>
   <string name="live_display_color_profile_astronomy_summary">Tmavo červená pre zachovanie nočného videnia</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Sýtosť</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona výberu metódy vstupu</string>
   <string name="ime_switcher_notify_summary">Zobraziť ikony výberu metódy vstupu</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index fce24c2..cd6bcf4 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -40,6 +40,9 @@
   <string name="root_access_apps">Samo aplikacije</string>
   <string name="root_access_adb">Samo ADB</string>
   <string name="root_access_all">Aplikacije in ADB</string>
+  <!-- Preference link for root appops -->
+  <string name="root_appops_title">Upravljaj s skrbniškimi dostopi</string>
+  <string name="root_appops_summary">Ogled in nadzor skrbniških pravil</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -574,15 +577,6 @@
   <string name="display_rotation_90_title">90 stopinj</string>
   <string name="display_rotation_180_title">180 stopinj</string>
   <string name="display_rotation_270_title">270 stopinj</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Pokaži privzeto sliko</string>
-  <string name="selectnewfile_menu">Pokaži novo sliko iz galerije</string>
-  <string name="selectfile_menu">Pokaži sliko iz galerije</string>
-  <string name="restore_default_str">Ponastavi</string>
-  <string name="hue_str">Odtenek: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Nasičenost: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Jakost: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimiziraj zaslon glede na čas dneva in pogoje okolice, da se izboljša berljivost in zmanjša obremenitev oči</string>
   <string name="live_display_mode">Način prikaza</string>
@@ -614,6 +608,13 @@
   <string name="live_display_color_profile_basic_summary">Uporabi neumerjen zaslon</string>
   <string name="live_display_color_profile_adaptive_title">Prilagodljiv</string>
   <string name="live_display_color_profile_adaptive_summary">Barve se prilagajajo pogojem okolice</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Prilagoditev slike</string>
+  <string name="picture_adjustment_summary">Prilagodi odtenek, nasičenost, jakost in kontrast</string>
+  <string name="adj_hue_title">Odtenek</string>
+  <string name="adj_saturation_title">Nasičenost</string>
+  <string name="adj_intensity_title">Jakost</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona izbirnika</string>
   <string name="ime_switcher_notify_summary">Prikaži ikono izbirnika metode za vnos</string>
@@ -894,6 +895,11 @@
         <![CDATA[<b>Skupaj sodelavcev:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
                  <b>Skupaj prispevkov:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>Zadnja posodobitev:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">Podatki o sodelavcih</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Skupaj sodelavcev:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Skupaj prispevkov:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Zadnja posodobitev:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Zvoki</string>
   <string name="notification_manager">Obvestila</string>
   <string name="lockscreen_settings">Zaklepanje zaslona</string>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index b87d888..b6d81cd 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Само апликације</string>
   <string name="root_access_adb">Само ADB</string>
   <string name="root_access_all">Апликације и ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -572,15 +573,6 @@
   <string name="display_rotation_90_title">90 степени</string>
   <string name="display_rotation_180_title">180 степени</string>
   <string name="display_rotation_270_title">270 степени</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Погледај подразумевану слику</string>
-  <string name="selectnewfile_menu">Погледај нову слику из Галерије</string>
-  <string name="selectfile_menu">Погледај слику из Галерије</string>
-  <string name="restore_default_str">Ресетуј</string>
-  <string name="hue_str">Нијанса: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Засићење: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Интензитет: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Оптимизуј екран у складу са дневним и просторним приликама да побољшаш читљивост и умањиш замарање очију</string>
   <string name="live_display_mode">Режим екрана</string>
@@ -610,6 +602,9 @@
   <string name="live_display_color_profile_photography_summary">Савршена репродукција боје за фотографије</string>
   <string name="live_display_color_profile_basic_title">Основно</string>
   <string name="live_display_color_profile_basic_summary">Користи дисплеј неподешен</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Засићење</string>
+  <string name="adj_contrast_title">Контраст</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Селектор икона</string>
   <string name="ime_switcher_notify_summary">Прикажи улазни метод селектора икона</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index cdd510d..ab0af0f 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Endast appar</string>
   <string name="root_access_adb">Endast ADB</string>
   <string name="root_access_all">Appar och ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -569,15 +570,6 @@
   <string name="display_rotation_90_title">90 grader</string>
   <string name="display_rotation_180_title">180 grader</string>
   <string name="display_rotation_270_title">270 grader</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Visa standardbild</string>
-  <string name="selectnewfile_menu">Visa ny bild från galleriet</string>
-  <string name="selectfile_menu">Visa bild från galleriet</string>
-  <string name="restore_default_str">Återställ</string>
-  <string name="hue_str">Nyans: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Mättnad: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Kontrast: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Intensitet: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Optimera din skärm baserad på dygnets tidpunkt och omgivande förhållanden för att förbättra läsbarhet och minska belastningen på ögonen</string>
   <string name="live_display_mode">Visningsläge</string>
@@ -607,6 +599,9 @@
   <string name="live_display_color_profile_photography_summary">Perfekt färgåtergivning för bilder</string>
   <string name="live_display_color_profile_basic_title">Grundläggande</string>
   <string name="live_display_color_profile_basic_summary">Använd skärmen okalibrerad</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Mättnad</string>
+  <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Väljarikonen</string>
   <string name="ime_switcher_notify_summary">Visa ikonen för inmatningsväxlare</string>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 531b9ca..8565015 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">பயன்பாடுகள் மட்டும்</string>
   <string name="root_access_adb">ADB மட்டும்</string>
   <string name="root_access_all">ஆப்கள் மற்றும் ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 டிகிரீ</string>
   <string name="display_rotation_180_title">180 டிகிரீ</string>
   <string name="display_rotation_270_title">270 டிகிரீ</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">இயல்நிலை படத்தை காண்</string>
-  <string name="selectnewfile_menu">கேலரியில் இருந்து புது படத்தைக் காண்</string>
-  <string name="selectfile_menu">கேலரியில் இருநந்து படத்தைக் காண்</string>
-  <string name="restore_default_str">மீட்டமை</string>
-  <string name="hue_str">வண்ணக்கூறு: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">சாச்சுரேசன்: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">கான்டிராஸ்ட்: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">இன்டென்சிட்டி: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">வாசிக்கும்தன்மையை மேம்படுத்தவும் கண்ணுக்கு சிரமத்தை குறைக்கவும் நாளின் நேரத்தையும் சுற்றுச்சூழல் நிலைமைகளையும் பொருத்து உங்கள் திரையை உகந்ததாக்குங்கள்</string>
   <string name="live_display_mode">காட்சி முறை</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">புகைப்படங்களுக்கான கச்சிதமான வண்ன மறு உருவாக்கம்</string>
   <string name="live_display_color_profile_basic_title">அடிப்படை</string>
   <string name="live_display_color_profile_basic_summary">காட்சியை அளவிடாமல் பயன்படுத்து</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">சாச்சுரேசன்</string>
+  <string name="adj_contrast_title">மாறுபாடு</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">தேர்ந்தெடுக்கும் ஐகான்</string>
   <string name="ime_switcher_notify_summary">உள்ளீட்டு முறை தேர்ந்தெடுத்தல் ஐகானை காட்டு</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 24db942..3c79d81 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">అనువర్తనాలు మాత్రమే</string>
   <string name="root_access_adb">ADB మాత్రమే</string>
   <string name="root_access_all">అనువర్తనాలు మరియు ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 డిగ్రీలు</string>
   <string name="display_rotation_180_title">180 డిగ్రీలు</string>
   <string name="display_rotation_270_title">270 డిగ్రీలు</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">స్వయంసిద్ధ చిత్రాన్ని వీక్షించుము</string>
-  <string name="selectnewfile_menu">గ్యాలరీ నుండి క్రొత్త చిత్రాన్ని వీక్షించుము</string>
-  <string name="selectfile_menu">గ్యాలరీ నుండి చిత్రాన్ని వీక్షించుము</string>
-  <string name="restore_default_str">రీసెట్ చేయి</string>
-  <string name="hue_str">వర్ణం: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">సంతృప్తత: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">వర్ణ వ్యత్యాసం: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">తీవ్రత: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">చదవడానికి అనుకూలంగా ఉండే విధంగా మరియు కళ్ళ పైన ఒత్తిడిని తగ్గించేందుకు రోజు యొక్క సమయం మరియు పరిసర పరిస్థితులను బట్టి సమయాన్ని సెట్ చేయండి</string>
   <string name="live_display_mode">ప్రదర్శిత మోడ్</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">ఫోటోల కొరకు సరైన వర్ణ పునరుత్పత్తి</string>
   <string name="live_display_color_profile_basic_title">ప్రాధమిక</string>
   <string name="live_display_color_profile_basic_summary">అన్‌కాలిబ్రేటెడ్ ప్రదర్శనను ఉపయోగించుము</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">సంతృప్తత</string>
+  <string name="adj_contrast_title">వ్యత్యాసం</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">సెలెక్టర్ చిహ్నం</string>
   <string name="ime_switcher_notify_summary">ఇన్పుట్ ప్రక్రియను ఎంచుకునే చిహ్నాన్ని ప్రదర్శించుము</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 40cd242..24e2cd5 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">แอปเท่านั้น</string>
   <string name="root_access_adb">ADB เท่านั้น</string>
   <string name="root_access_all">แอปและ ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90 องศา</string>
   <string name="display_rotation_180_title">180 องศา</string>
   <string name="display_rotation_270_title">270 องศา</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">ดูรูปภาพเริ่มต้น</string>
-  <string name="selectnewfile_menu">ดูรูปภาพใหม่จากแกลเลอรี</string>
-  <string name="selectfile_menu">ดูรูปภาพจากแกลลอรี</string>
-  <string name="restore_default_str">รีเซ็ต</string>
-  <string name="hue_str">สี: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">ความอิ่มตัว: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ความเข้มจาง: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">ความเข้มข้น: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ปรับหน้าความสว่างหน้าจอตามเวลาและแสงโดยรอบเพื่อทำให้อ่านได้ง่ายขึ้นและลดอาการปวดตา</string>
   <string name="live_display_mode">รูปแบบการแสดงผล</string>
@@ -608,6 +600,9 @@
   <string name="live_display_color_profile_photography_summary">แต่งสีสมบูรณ์แบบสำหรับการถ่ายภาพ</string>
   <string name="live_display_color_profile_basic_title">พื้นฐาน</string>
   <string name="live_display_color_profile_basic_summary">ใช้การแสดงผลที่ไม่ตั้งค่า</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">ความอิ่มตัว</string>
+  <string name="adj_contrast_title">สีตัด</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">ไอคอนตัวเลือก</string>
   <string name="ime_switcher_notify_summary">แสดงไอคอนตัวเลือกวิธีป้อนข้อมูล</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index d16e190..646b3fa 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -38,6 +38,7 @@
   <string name="root_access_apps">Sadece uygulamalar</string>
   <string name="root_access_adb">Sadece ADB</string>
   <string name="root_access_all">Uygulamalar ve ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -571,15 +572,6 @@
   <string name="display_rotation_90_title">90 derece</string>
   <string name="display_rotation_180_title">180 derece</string>
   <string name="display_rotation_270_title">270 derece</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Varsayılan resmi görüntüle</string>
-  <string name="selectnewfile_menu">Galeriden yeni resmi görüntüle</string>
-  <string name="selectfile_menu">Galeriden resmi görüntüle</string>
-  <string name="restore_default_str">Sıfırla</string>
-  <string name="hue_str">Ton: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Doygunluk: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Zıtlık: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Yoğunluk: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Okunabilirliği artırmak ve göz yorgunluğu azaltmak için gün ve ortam koşulları zamanına bağlı olarak ekranı iyileştirir</string>
   <string name="live_display_mode">Görüntü modu</string>
@@ -609,6 +601,9 @@
   <string name="live_display_color_profile_photography_summary">Fotoğraflar için mükemmel renk sunumu</string>
   <string name="live_display_color_profile_basic_title">Temel</string>
   <string name="live_display_color_profile_basic_summary">Ekranı ayarlanmamış şekilde kullan</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Doygunluk</string>
+  <string name="adj_contrast_title">Karşıtlık</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Seçici simgesi</string>
   <string name="ime_switcher_notify_summary">Giriş yöntemi seçici simgesini görüntüle</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index fe73c1d..caf4e92 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">ئەپلەرلا</string>
   <string name="root_access_adb">ADB لا</string>
   <string name="root_access_all">Apps ۋە ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -568,15 +569,6 @@
   <string name="display_rotation_90_title">90 گرادۇس</string>
   <string name="display_rotation_180_title">180 گرادۇس</string>
   <string name="display_rotation_270_title">270 گرادۇس</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">كۆڭۈلدىكى رەسىمنى كۆرسىتىدۇ</string>
-  <string name="selectnewfile_menu">رەسىم توپلىمىدىن يېڭى رەسىمنى كۆرسىتىدۇ</string>
-  <string name="selectfile_menu">رەسىم توپلىمىدىن رەسىمنى كۆرسىتىدۇ</string>
-  <string name="restore_default_str">ئەسلىگە قايتۇر</string>
-  <string name="hue_str">رەڭ تۈسى: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">تويۇنۇشچانلىقى: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">ئاق-قارىلىقى: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">يورۇقلۇقى: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">ۋاقىت ۋە مۇھىت شەرتى ئاساسىدا ئېكرانىڭىزنى ئەلالاشتۇرۇپ ئوقۇشچانلىقنى ياخشىلاپ كۆز چارچاشنى تۆۋەنلىتىدۇ</string>
   <string name="live_display_mode">كۆرسىتىش ھالىتى</string>
@@ -606,6 +598,9 @@
   <string name="live_display_color_profile_photography_summary">رەسىمنىڭ مۇكەممەل رەڭ بىلەن قايتا نامايەن بۇلۇشى</string>
   <string name="live_display_color_profile_basic_title">ئاساسىي</string>
   <string name="live_display_color_profile_basic_summary">تەڭشەلمىگەن ئېكران ئىشلىتىش</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">تويۇنۇش</string>
+  <string name="adj_contrast_title">ئاق-قارىلىقى</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">تاللىغۇچ سىنبەلگىسى</string>
   <string name="ime_switcher_notify_summary">كىرگۈزگۈچ تاللىغۇچ سىنبەلگىسىنى كۆرسىتىدۇ</string>
diff --git a/res/values-ug/strings.xml b/res/values-ug/strings.xml
index 1fbc576..b20fdea 100644
--- a/res/values-ug/strings.xml
+++ b/res/values-ug/strings.xml
@@ -26,6 +26,7 @@
   <!-- Strings for Dialog deny button -->
   <string name="deny">رەت قىل</string>
   <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <string name="dlg_close">تاقاش</string>
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 4ed8089..f94f6e4 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -39,6 +39,7 @@
   <string name="root_access_apps">Тільки програми</string>
   <string name="root_access_adb">Тільки ADB</string>
   <string name="root_access_all">Програми та ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -554,15 +555,6 @@
   <string name="display_rotation_90_title">90 градусів</string>
   <string name="display_rotation_180_title">180 градусів</string>
   <string name="display_rotation_270_title">270 градусів</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Стандартний значок</string>
-  <string name="selectnewfile_menu">Вибрати нове зображення з «Галереї»</string>
-  <string name="selectfile_menu">Вибрати зображення з «Галереї»</string>
-  <string name="restore_default_str">Скинути</string>
-  <string name="hue_str">Відтінок: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Насиченість: <xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">Контраст: <xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">Інтенсивність: <xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Налаштовувати екран залежно від часу доби і умов освітлення для підвищення зручності читання і зменшення втоми очей</string>
   <string name="live_display_mode">Режим екрану</string>
@@ -587,6 +579,9 @@
   <string name="live_display_color_profile_cinema_title">Кіно</string>
   <string name="live_display_color_profile_astronomy_title">Астрономія</string>
   <string name="live_display_color_profile_astronomy_summary">Глибокий червоний для збереження видимості вночі</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Насиченість</string>
+  <string name="adj_contrast_title">Контраст</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Кнопка вибору методу введення</string>
   <string name="ime_switcher_notify_summary">Показувати кнопку вибору методу введення</string>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 4b24827..9425dbf 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">Chỉ cho ứng dụng</string>
   <string name="root_access_adb">Chỉ cho ADB</string>
   <string name="root_access_all">Cả ứng dụng và ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -570,15 +571,6 @@
   <string name="display_rotation_90_title">90 độ</string>
   <string name="display_rotation_180_title">180 độ</string>
   <string name="display_rotation_270_title">270 độ</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">Xem ảnh mặc định</string>
-  <string name="selectnewfile_menu">Xem ảnh mới từ Thư viện</string>
-  <string name="selectfile_menu">Xem hình ảnh từ Thư viện</string>
-  <string name="restore_default_str">Đặt lại</string>
-  <string name="hue_str">Tông màu: <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">Độ bão hòa: <xliff:g id="saturation_value">%1$s </xliff:g></string>
-  <string name="contrast_str">Độ tương phản: <xliff:g id="contrast_value">%1$s </xliff:g></string>
-  <string name="intensity_str">Cường độ: <xliff:g id="intensity_str_value">%1$s </xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">Tối ưu hóa màn hình dựa trên điều kiện môi trường và thời gian trong ngày để cải thiện khả năng đọc và giảm mỏi mắt</string>
   <string name="live_display_mode">Chế độ hiển thị</string>
@@ -608,6 +600,9 @@
   <string name="live_display_color_profile_photography_summary">Tái tạo màu sắc hoàn hảo cho hình ảnh</string>
   <string name="live_display_color_profile_basic_title">Cơ bản</string>
   <string name="live_display_color_profile_basic_summary">Dùng màn hình không hiệu chỉnh</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">Độ bão hòa</string>
+  <string name="adj_contrast_title">Độ tương phản</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Biểu tượng trình chọn</string>
   <string name="ime_switcher_notify_summary">Hiển thị biểu tượng trình chọn phương thức nhập liệu</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index fddadb4..c4756db 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">仅限于应用</string>
   <string name="root_access_adb">仅限于 ADB</string>
   <string name="root_access_all">应用与 ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -571,15 +572,6 @@
   <string name="display_rotation_90_title">90 度</string>
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">查看默认图片</string>
-  <string name="selectnewfile_menu">从图库查看新图片</string>
-  <string name="selectfile_menu">从图库查看图片</string>
-  <string name="restore_default_str">重置</string>
-  <string name="hue_str">色调：<xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">饱和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">对比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">强度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基于时间和环境条件来优化您的屏幕以改善可读性和减少眼睛疲劳</string>
   <string name="live_display_mode">显示模式</string>
@@ -611,6 +603,9 @@
   <string name="live_display_color_profile_basic_summary">使用未校准的屏幕</string>
   <string name="live_display_color_profile_adaptive_title">自适应</string>
   <string name="live_display_color_profile_adaptive_summary">环境条件颜色自适应</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">饱和度</string>
+  <string name="adj_contrast_title">对比度</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">选择器图标</string>
   <string name="ime_switcher_notify_summary">显示输入法选择器图标</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index f191cdf..9e0572f 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -30,6 +30,7 @@
   <string name="root_access_apps">僅限應用程式</string>
   <string name="root_access_adb">僅限 ADB</string>
   <string name="root_access_all">應用程式和 ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod 版本</string>
@@ -473,15 +474,6 @@
   <string name="display_rotation_90_title">90 度</string>
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">檢視預設圖片</string>
-  <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
-  <string name="selectfile_menu">從圖片庫查看圖片</string>
-  <string name="restore_default_str">重設</string>
-  <string name="hue_str">色調： <xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">強度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">您可根據每日時間和環境條件來優化螢幕顯示，以提升可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
@@ -506,6 +498,9 @@
   <string name="live_display_color_profile_cinema_title">電影</string>
   <string name="live_display_color_profile_astronomy_title">天文學</string>
   <string name="live_display_color_profile_astronomy_summary">深紅色保護夜間視力</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">飽和度</string>
+  <string name="adj_contrast_title">對比度</string>
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <string name="heads_up_notifications">浮動通知</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 33e61bb..29aea03 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -37,6 +37,7 @@
   <string name="root_access_apps">僅限應用程式</string>
   <string name="root_access_adb">僅限 ADB</string>
   <string name="root_access_all">應用程式與 ADB</string>
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <string name="mod_version">CyanogenMod 版本</string>
@@ -552,15 +553,6 @@
   <string name="display_rotation_90_title">90 度</string>
   <string name="display_rotation_180_title">180 度</string>
   <string name="display_rotation_270_title">270 度</string>
-  <!-- Display settings.  Screen color. -->
-  <string name="restore_preview">檢視預設相片</string>
-  <string name="selectnewfile_menu">從圖片庫查看新圖片</string>
-  <string name="selectfile_menu">從圖片庫查看圖片</string>
-  <string name="restore_default_str">重設</string>
-  <string name="hue_str">色調：<xliff:g id="hue_value">%1$s</xliff:g></string>
-  <string name="saturation_str">飽和度：<xliff:g id="saturation_value">%1$s</xliff:g></string>
-  <string name="contrast_str">對比度：<xliff:g id="contrast_value">%1$s</xliff:g></string>
-  <string name="intensity_str">亮度：<xliff:g id="intensity_str_value">%1$s</xliff:g></string>
   <!-- LiveDisplay -->
   <string name="live_display_summary">基於日夜和環境條件調整您的螢幕色溫，以改善可讀性和減少眼睛疲勞</string>
   <string name="live_display_mode">顯示模式</string>
@@ -584,6 +576,9 @@
   <string name="live_display_color_profile_photography_summary">完美重現照片色彩</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">使用未校正的顯示</string>
+  <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_saturation_title">飽和度</string>
+  <string name="adj_contrast_title">對比度</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">輸入法選擇器圖示</string>
   <string name="ime_switcher_notify_summary">顯示輸入法選擇器圖示</string>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 56d934d..5d5b9d2 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -22,6 +22,7 @@
   <!-- Launch Dev Tools -->
   <!-- Development shortcut -->
   <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
   <!-- About phone screen, Device model -->
@@ -92,8 +93,8 @@
   <!-- Launch music player when headset is connected -->
   <!-- WiFi auto-configure priorities -->
   <!-- Display : Rotation  -->
-  <!-- Display settings.  Screen color. -->
   <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
   <!-- Whether to display IME switcher notifcation -->
   <!-- Heads up -->
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
-- 
cgit v1.1


From 354b53f9ed0d493a271bcb642ed014c456f5fb0c Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Thu, 30 Jun 2016 11:26:08 -0400
Subject: Pre-setup restrictions DO NOT MERGE

 - Prevent external tiles from system apps
 - Don't let user settings run
 - Disable help

Bug: 29194585
Change-Id: I74ab8aaab62d62cc4dbbdf3164429a503f3a572b
---
 src/com/android/settings/HelpUtils.java          | 7 +++++++
 src/com/android/settings/SettingsActivity.java   | 5 +++++
 src/com/android/settings/users/UserSettings.java | 6 ++++++
 3 files changed, 18 insertions(+)

diff --git a/src/com/android/settings/HelpUtils.java b/src/com/android/settings/HelpUtils.java
index 3c36edb..1b6cbf7 100644
--- a/src/com/android/settings/HelpUtils.java
+++ b/src/com/android/settings/HelpUtils.java
@@ -24,6 +24,7 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.Resources.Theme;
 import android.net.Uri;
+import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.TypedValue;
@@ -90,6 +91,9 @@ public class HelpUtils {
      */
     public static boolean prepareHelpMenuItem(final Activity activity, MenuItem helpMenuItem,
             String helpUriString, String backupContext) {
+        if (Global.getInt(activity.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            return false;
+        }
         if (TextUtils.isEmpty(helpUriString)) {
             // The help url string is empty or null, so set the help menu item to be invisible.
             helpMenuItem.setVisible(false);
@@ -123,6 +127,9 @@ public class HelpUtils {
 
     public static Intent getHelpIntent(Context context, String helpUriString,
             String backupContext) {
+        if (Global.getInt(context.getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            return null;
+        }
         // Try to handle as Intent Uri, otherwise just treat as Uri.
         try {
             Intent intent = Intent.parseUri(helpUriString,
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 8edec09..39c0e90 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -46,6 +46,7 @@ import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.provider.Settings.Global;
 import android.text.TextUtils;
 import android.transition.TransitionManager;
 import android.util.ArrayMap;
@@ -1316,6 +1317,10 @@ public class SettingsActivity extends Activity
     }
 
     private void addExternalTiles(List<DashboardCategory> target) {
+        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            // Don't add external tiles until device is set up.
+            return;
+        }
         Map<Pair<String, String>, DashboardTile> addedCache =
                 new ArrayMap<Pair<String, String>, DashboardTile>();
         UserManager userManager = UserManager.get(this);
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 1849a9a..1278d54 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -45,6 +45,7 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceGroup;
 import android.preference.PreferenceScreen;
 import android.provider.Settings;
+import android.provider.Settings.Global;
 import android.provider.Settings.Secure;
 import android.util.Log;
 import android.util.SparseArray;
@@ -229,6 +230,11 @@ public class UserSettings extends SettingsPreferenceFragment
         filter.addAction(Intent.ACTION_USER_INFO_CHANGED);
         context.registerReceiverAsUser(mUserChangeReceiver, UserHandle.ALL, filter, null,
                 mHandler);
+
+        if (Global.getInt(getContext().getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            getActivity().finish();
+            return;
+        }
     }
 
     @Override
-- 
cgit v1.1


From 4508d8600781f6f79226733f4afad38cfd5f3492 Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sat, 27 Aug 2016 14:22:29 -0700
Subject: Automatic translation import

Change-Id: I07d3bda3746ddb983302208b7fecce1a23ac02d4
Ticket: -
---
 res/values-bs-rBA/arrays.xml     |  156 ++
 res/values-bs-rBA/cm_strings.xml |  193 +++
 res/values-bs-rBA/strings.xml    | 3100 ++++++++++++++++++++++++++++++++++++++
 res/values-ca/cm_strings.xml     |    2 +
 res/values-cs/cm_strings.xml     |    6 +
 res/values-de/cm_strings.xml     |    9 +-
 res/values-el/cm_strings.xml     |    8 +
 res/values-es-rCO/arrays.xml     |  156 ++
 res/values-es-rCO/cm_strings.xml |  193 +++
 res/values-es-rCO/strings.xml    | 3100 ++++++++++++++++++++++++++++++++++++++
 res/values-es/cm_strings.xml     |    2 +-
 res/values-eu-rES/cm_strings.xml |    4 +-
 res/values-fr/cm_strings.xml     |    2 +
 res/values-ga-rIE/arrays.xml     |  156 ++
 res/values-ga-rIE/cm_strings.xml |  193 +++
 res/values-ga-rIE/strings.xml    | 3100 ++++++++++++++++++++++++++++++++++++++
 res/values-hr/cm_strings.xml     |    2 +
 res/values-hu/cm_strings.xml     |   72 +-
 res/values-in/cm_strings.xml     |  275 ++--
 res/values-ja/cm_strings.xml     |   14 +-
 res/values-nb/cm_strings.xml     |    4 +-
 res/values-nl/cm_strings.xml     |    6 +-
 res/values-pl/cm_strings.xml     |    2 +
 res/values-pt-rBR/cm_strings.xml |    2 +
 res/values-pt-rPT/cm_strings.xml |    6 +
 res/values-ru/cm_strings.xml     |    8 +
 res/values-sr/cm_strings.xml     |    2 +
 res/values-ug/cm_strings.xml     |    5 +
 res/values-zh-rCN/cm_strings.xml |    6 +
 29 files changed, 10645 insertions(+), 139 deletions(-)
 create mode 100644 res/values-bs-rBA/arrays.xml
 create mode 100644 res/values-bs-rBA/cm_strings.xml
 create mode 100644 res/values-bs-rBA/strings.xml
 create mode 100644 res/values-es-rCO/arrays.xml
 create mode 100644 res/values-es-rCO/cm_strings.xml
 create mode 100644 res/values-es-rCO/strings.xml
 create mode 100644 res/values-ga-rIE/arrays.xml
 create mode 100644 res/values-ga-rIE/cm_strings.xml
 create mode 100644 res/values-ga-rIE/strings.xml

diff --git a/res/values-bs-rBA/arrays.xml b/res/values-bs-rBA/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-bs-rBA/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 0000000..5d5b9d2
--- /dev/null
+++ b/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2016 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">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Launch Dev Tools -->
+  <!-- Development shortcut -->
+  <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
+  <!-- NFC PreferenceCategory title -->
+  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, Device model -->
+  <!-- About phone screen, Device name -->
+  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, build date -->
+  <!-- CM Updater -->
+  <!-- Settings switch for updating Cyanogen recovery -->
+  <!-- Themes Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Sound settings screen -->
+  <!-- Profiles settings  -->
+  <!-- Profile mode options. -->
+  <!-- Add Profile -->
+  <!-- Rename Dialog  -->
+  <!-- Reset Profiles -->
+  <!-- Delete confimation messages -->
+  <!-- Profile network mode -->
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <!-- Menu item for managing profiles -->
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <!-- Profile Settings sound modes labels -->
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <!-- Title for application group setting screen -->
+  <!-- Add application dialog box title -->
+  <!-- Profiles - system settings -->
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <!-- Wi-Fi region code -->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Profiles -->
+  <!-- Title for application group setting screen -->
+  <!-- Navigation Bar -->
+  <!-- Notification light dialogs -->
+  <!-- Values for the notification light pulse spinners -->
+  <!-- Battery light settings -->
+  <!-- Lights settings screen, notification light settings -->
+  <!-- Lights settings, LED notification -->
+  <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- App ops permissions -->
+  <!-- App ops detail -->
+  <!-- App ops menu options -->
+  <!-- Hostname setting -->
+  <!-- Backlight brightness settings screen -->
+  <!-- Sunlight readability enhancement screen -->
+  <!-- Color enhancement settings screen -->
+  <!-- Key backlight -->
+  <!-- Gesture Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Power menu -->
+  <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
+  <!-- tap-to-sleep -->
+  <!-- Proximity wake -->
+  <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <!-- Font size sample text. This needs to be a very short string, as it is shown in
+    multiple font sizes in a limited amount of space. -->
+  <!-- Volume settings - Volume adjustment sound -->
+  <!-- Hardware tunables - Vibrator intensity -->
+  <!-- Hardware tunables - Color calibration -->
+  <!-- Launch music player when headset is connected -->
+  <!-- WiFi auto-configure priorities -->
+  <!-- Display : Rotation  -->
+  <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
+  <!-- Whether to display IME switcher notifcation -->
+  <!-- Heads up -->
+  <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <!-- High touch sensitivity -->
+  <!-- Display & Lights screen, setting options for LCD density -->
+  <!-- Stylus Icon -->
+  <!-- Stylus Gestures -->
+  <!-- Gestures Options -->
+  <!-- Stylus gestures -->
+  <!-- Touchscreen hovering -->
+  <!-- Increasing ring tone volume -->
+  <!-- LTO download data over wi-fi only -->
+  <!-- Category title for Charging sounds (Power state change) specific Settings.
+         [CHAR LIMIT=40] -->
+  <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <!-- Sound settings, charging sounds label for ringtone == none -->
+  <!-- Status bar -->
+  <!-- Status bar - Clock -->
+  <!-- Status bar - Battery -->
+  <!-- Status bar - Battery percentage -->
+  <!-- Status bar - icon blacklist -->
+  <!-- EdgeGesture service -->
+  <!-- Keep screen on strings -->
+  <!-- Privacy Settings Header item -->
+  <!-- Privacy Guard -->
+  <!-- Sizes for pattern lockscreen -->
+  <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <!-- Whether the keyguard will directly pass to password entry -->
+  <!-- Whether the keyguard will directly pass to pattern view -->
+  <!-- Whether the keyguard will directly pass to PIN entry -->
+  <!-- lock screen visualizer -->
+  <!-- lock screen disabled by QS tile warning -->
+  <!-- Battery saver -->
+  <!-- Battery : Automatic performance profiles -->
+  <!-- Memory -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Advanced reboot options -->
+  <!-- Expanded desktop -->
+  <!-- Kill app long-press back -->
+  <!-- Show/Hide Search Bar -->
+  <!-- Voice Wakeup -->
+  <!-- Blacklist preferences -->
+  <!-- Blacklist management -->
+  <!-- Sms security limit -->
+  <!-- Notification spamfilter -->
+  <!-- Anonymous Statistics #CM -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <!-- Anonymous Statistics - Preview -->
+  <!-- Protected apps lockpattern reset button -->
+  <!-- Protected Apps -->
+  <!-- Contributors cloud activity -->
+  <!-- Edit access point labels: PPP number -->
+  <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <!-- MSIM SIM status -->
+  <!-- Zen mode allowed event setting summary items -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
+  <!-- SAR information -->
+  <!-- IC Codes -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- Factory reset strings -->
+  <!-- Tethering & portable hotspot other category -->
+  <!-- Wi-Fi tethering inactivity timeout -->
+  <!-- Live lock screen -->
+  <!-- Live lock screen title -->
+  <!-- Live lock screen summary -->
+  <!-- Live lock screen settings content description -->
+  <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
+</resources>
diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-bs-rBA/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 4fc2378..ce7459a 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Només ADB</string>
   <string name="root_access_all">Aplicacions i ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Administra els accessos de superusuari</string>
+  <string name="root_appops_summary">Mostra i controla les regles de superusuari</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 6381195..02687ef 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -40,6 +40,8 @@
   <string name="root_access_adb">Pouze ADB</string>
   <string name="root_access_all">Aplikace a ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Spravovat přístupy root</string>
+  <string name="root_appops_summary">Zobrazit a zpravovat pravidla přístupů root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -606,7 +608,11 @@
   <string name="live_display_color_profile_adaptive_title">Adaptivní</string>
   <string name="live_display_color_profile_adaptive_summary">Přizpůsobit barvy okolním podmínkám</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Nastavení obrazu</string>
+  <string name="picture_adjustment_summary">Upravit odstín, sytost, intenzitu a kontrast</string>
+  <string name="adj_hue_title">Odstín</string>
   <string name="adj_saturation_title">Sytost</string>
+  <string name="adj_intensity_title">Intenzita</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona pro volbu</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index a6bf40b..5c189ad 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -40,6 +40,7 @@
   <string name="root_access_all">Apps und ADB</string>
   <!-- Preference link for root appops -->
   <string name="root_appops_title">Root-Zugriffe verwalten</string>
+  <string name="root_appops_summary">Anzeigen und Kontrollieren der Root-Regeln</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -345,7 +346,7 @@
   <string name="app_ops_summaries_toast_window">Pop-ups anzeigen</string>
   <string name="app_ops_summaries_project_media">Medien projizieren</string>
   <string name="app_ops_summaries_activate_vpn">VPN aktivieren</string>
-  <string name="app_ops_summaries_write_wallpaper">Hintergrundbild schreiben</string>
+  <string name="app_ops_summaries_write_wallpaper">Hintergrund schreiben</string>
   <string name="app_ops_summaries_assist_structure">Strukturassistent</string>
   <string name="app_ops_summaries_assist_screenshot">Screenshotassistent</string>
   <string name="app_ops_summaries_read_phone_state">Telefonstatus lesen</string>
@@ -415,7 +416,7 @@
   <string name="app_ops_labels_toast_window">Pop-ups anzeigen</string>
   <string name="app_ops_labels_project_media">Medien projizieren</string>
   <string name="app_ops_labels_activate_vpn">VPN aktivieren</string>
-  <string name="app_ops_labels_write_wallpaper">Hintergrundbild schreiben</string>
+  <string name="app_ops_labels_write_wallpaper">Hintergrund schreiben</string>
   <string name="app_ops_labels_assist_structure">Strukturassistent</string>
   <string name="app_ops_labels_assist_screenshot">Screenshotassistent</string>
   <string name="app_ops_labels_read_phone_state">Telefonstatus lesen</string>
@@ -607,8 +608,10 @@
   <string name="live_display_color_profile_adaptive_summary">Farben an Umgebungsbedingungen anpassen</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="picture_adjustment_title">Bildanpassung</string>
+  <string name="picture_adjustment_summary">Farbton, Sättigung, Leuchtdichte und Kontrast anpassen</string>
   <string name="adj_hue_title">Farbton</string>
   <string name="adj_saturation_title">Sättigung</string>
+  <string name="adj_intensity_title">Leuchtdichte</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Auswahlsymbol</string>
@@ -1060,7 +1063,7 @@
   <string name="lockscreen_wallpaper_title">Hintergrundbild</string>
   <string name="not_available_with_app">Nicht verfügbar für %1$s</string>
   <!-- Format string for fingerprint location message -->
-  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Suchen Sie den Fingerabdrucksensor auf der <xliff:g id="sensor_location">%1$s</xliff:g> des Gerätes.</string>
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Suchen Sie den Fingerabdrucksensor auf der <xliff:g id="sensor_location">%1$s</xliff:g> des Geräts.</string>
   <!-- Fingerprint sensor locations -->
   <string name="security_settings_fingerprint_sensor_location_back">Front</string>
   <string name="security_settings_fingerprint_sensor_location_front">Rückseite</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index d55bd33..c18637f 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Μόνο ADB</string>
   <string name="root_access_all">Εφαρμογές και ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Διαχείριση προσβάσεων root</string>
+  <string name="root_appops_summary">Προβολή και έλεγχος των κανόνων root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -550,6 +552,7 @@
   <string name="volume_adjust_sounds_title">Ήχοι πλήκτρων έντασης</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Ένταση δόνησης</string>
+  <string name="vibrator_warning">Δεν συνιστώνται τιμές άνω του %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Βελτίωση χρωμάτων</string>
   <string name="color_calibration_summary">Βελτίωση των χρωμάτων της οθόνης</string>
@@ -604,7 +607,11 @@
   <string name="live_display_color_profile_adaptive_title">Προσαρμοστική</string>
   <string name="live_display_color_profile_adaptive_summary">Τα χρώματα προσαρμόζονται στις συνθήκες περιβάλλοντος</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Προσαρμογή εικόνας</string>
+  <string name="picture_adjustment_summary">Προσαρμόστε την απόχρωση, τον κορεσμό, την ένταση και την αντίθεση</string>
+  <string name="adj_hue_title">Απόχρωση</string>
   <string name="adj_saturation_title">Κορεσμός</string>
+  <string name="adj_intensity_title">Ένταση</string>
   <string name="adj_contrast_title">Αντίθεση</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Εικονίδιο επιλογέα</string>
@@ -1067,4 +1074,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">στην αριστερή πλευρά</string>
   <string name="security_settings_fingerprint_sensor_location_right">στη δεξιά πλευρά</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Φωνή: <xliff:g id="voice_status">%1$s</xliff:g> / Δεδομένα: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-es-rCO/arrays.xml b/res/values-es-rCO/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-es-rCO/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-es-rCO/cm_strings.xml b/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 0000000..5d5b9d2
--- /dev/null
+++ b/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2016 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">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Launch Dev Tools -->
+  <!-- Development shortcut -->
+  <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
+  <!-- NFC PreferenceCategory title -->
+  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, Device model -->
+  <!-- About phone screen, Device name -->
+  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, build date -->
+  <!-- CM Updater -->
+  <!-- Settings switch for updating Cyanogen recovery -->
+  <!-- Themes Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Sound settings screen -->
+  <!-- Profiles settings  -->
+  <!-- Profile mode options. -->
+  <!-- Add Profile -->
+  <!-- Rename Dialog  -->
+  <!-- Reset Profiles -->
+  <!-- Delete confimation messages -->
+  <!-- Profile network mode -->
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <!-- Menu item for managing profiles -->
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <!-- Profile Settings sound modes labels -->
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <!-- Title for application group setting screen -->
+  <!-- Add application dialog box title -->
+  <!-- Profiles - system settings -->
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <!-- Wi-Fi region code -->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Profiles -->
+  <!-- Title for application group setting screen -->
+  <!-- Navigation Bar -->
+  <!-- Notification light dialogs -->
+  <!-- Values for the notification light pulse spinners -->
+  <!-- Battery light settings -->
+  <!-- Lights settings screen, notification light settings -->
+  <!-- Lights settings, LED notification -->
+  <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- App ops permissions -->
+  <!-- App ops detail -->
+  <!-- App ops menu options -->
+  <!-- Hostname setting -->
+  <!-- Backlight brightness settings screen -->
+  <!-- Sunlight readability enhancement screen -->
+  <!-- Color enhancement settings screen -->
+  <!-- Key backlight -->
+  <!-- Gesture Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Power menu -->
+  <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
+  <!-- tap-to-sleep -->
+  <!-- Proximity wake -->
+  <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <!-- Font size sample text. This needs to be a very short string, as it is shown in
+    multiple font sizes in a limited amount of space. -->
+  <!-- Volume settings - Volume adjustment sound -->
+  <!-- Hardware tunables - Vibrator intensity -->
+  <!-- Hardware tunables - Color calibration -->
+  <!-- Launch music player when headset is connected -->
+  <!-- WiFi auto-configure priorities -->
+  <!-- Display : Rotation  -->
+  <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
+  <!-- Whether to display IME switcher notifcation -->
+  <!-- Heads up -->
+  <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <!-- High touch sensitivity -->
+  <!-- Display & Lights screen, setting options for LCD density -->
+  <!-- Stylus Icon -->
+  <!-- Stylus Gestures -->
+  <!-- Gestures Options -->
+  <!-- Stylus gestures -->
+  <!-- Touchscreen hovering -->
+  <!-- Increasing ring tone volume -->
+  <!-- LTO download data over wi-fi only -->
+  <!-- Category title for Charging sounds (Power state change) specific Settings.
+         [CHAR LIMIT=40] -->
+  <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <!-- Sound settings, charging sounds label for ringtone == none -->
+  <!-- Status bar -->
+  <!-- Status bar - Clock -->
+  <!-- Status bar - Battery -->
+  <!-- Status bar - Battery percentage -->
+  <!-- Status bar - icon blacklist -->
+  <!-- EdgeGesture service -->
+  <!-- Keep screen on strings -->
+  <!-- Privacy Settings Header item -->
+  <!-- Privacy Guard -->
+  <!-- Sizes for pattern lockscreen -->
+  <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <!-- Whether the keyguard will directly pass to password entry -->
+  <!-- Whether the keyguard will directly pass to pattern view -->
+  <!-- Whether the keyguard will directly pass to PIN entry -->
+  <!-- lock screen visualizer -->
+  <!-- lock screen disabled by QS tile warning -->
+  <!-- Battery saver -->
+  <!-- Battery : Automatic performance profiles -->
+  <!-- Memory -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Advanced reboot options -->
+  <!-- Expanded desktop -->
+  <!-- Kill app long-press back -->
+  <!-- Show/Hide Search Bar -->
+  <!-- Voice Wakeup -->
+  <!-- Blacklist preferences -->
+  <!-- Blacklist management -->
+  <!-- Sms security limit -->
+  <!-- Notification spamfilter -->
+  <!-- Anonymous Statistics #CM -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <!-- Anonymous Statistics - Preview -->
+  <!-- Protected apps lockpattern reset button -->
+  <!-- Protected Apps -->
+  <!-- Contributors cloud activity -->
+  <!-- Edit access point labels: PPP number -->
+  <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <!-- MSIM SIM status -->
+  <!-- Zen mode allowed event setting summary items -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
+  <!-- SAR information -->
+  <!-- IC Codes -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- Factory reset strings -->
+  <!-- Tethering & portable hotspot other category -->
+  <!-- Wi-Fi tethering inactivity timeout -->
+  <!-- Live lock screen -->
+  <!-- Live lock screen title -->
+  <!-- Live lock screen summary -->
+  <!-- Live lock screen settings content description -->
+  <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
+</resources>
diff --git a/res/values-es-rCO/strings.xml b/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-es-rCO/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index f0e0a79..7f4cacd 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -1052,7 +1052,7 @@
   <!-- Format string for fingerprint location message -->
   <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localiza el sensor de huella digital en el <xliff:g id="sensor_location">%1$s </xliff:g> de su teléfono.</string>
   <!-- Fingerprint sensor locations -->
-  <string name="security_settings_fingerprint_sensor_location_back">atrás</string>
+  <string name="security_settings_fingerprint_sensor_location_back">posterior</string>
   <string name="security_settings_fingerprint_sensor_location_front">delante</string>
   <string name="security_settings_fingerprint_sensor_location_left">lado izquierdo</string>
   <string name="security_settings_fingerprint_sensor_location_right">lado derecho</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 54d5c22..db46354 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -269,7 +269,7 @@
   <string name="notification_light_missed_call_title">Dei galdua</string>
   <string name="notification_light_voicemail_title">Ahots postontzia</string>
   <string name="notification_light_screen_on">Argitu pantaila piztean</string>
-  <string name="notification_light_zen_mode">Argiak ez molestatu moduan</string>
+  <string name="notification_light_zen_mode">Argiak ez eten moduan</string>
   <string name="notification_light_use_multiple_leds">Hainbat LED</string>
   <string name="keywords_lights_brightness_level">ilundu LEDaren argitasuna</string>
   <string name="notification_light_automagic">Hautatu koloreak automatikoki</string>
@@ -971,7 +971,7 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Beste bat</string>
   <!-- Wi-Fi tethering inactivity timeout -->
-  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi gunearen denbora-muga</string>
+  <string name="hotstpot_inactivity_timeout_text">Wi\u2011Fi gunearen denbora muga agortu da</string>
   <string name="hotstpot_inactivity_timeout_never">Inoiz ez</string>
   <string name="hotstpot_inactivity_timeout_1_minute">minutu bat</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minutu</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index da55149..4ba284e 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -604,6 +604,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="live_display_color_profile_basic_summary">Utiliser l\'écran sans étalonnage</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="adj_saturation_title">Saturation</string>
+  <string name="adj_intensity_title">Intensité</string>
   <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Icône du sélecteur</string>
@@ -1037,6 +1038,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Fond d\'écran</string>
   <!-- Format string for fingerprint location message -->
   <!-- Fingerprint sensor locations -->
   <!-- SIM status format string -->
diff --git a/res/values-ga-rIE/arrays.xml b/res/values-ga-rIE/arrays.xml
new file mode 100644
index 0000000..4acb887
--- /dev/null
+++ b/res/values-ga-rIE/arrays.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Choices for timezone picker first level.
+         These values will be used as search terms for TimeZone displayName
+         strings. -->
+  <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- Security settings.  The delay after screen is turned off until device locks.
+         These are shown in a list dialog. -->
+  <!-- Do not translate. -->
+  <!-- TTS settings -->
+  <!-- Default speech rate choices -->
+  <!-- Do not translate. -->
+  <!-- Default pitch choices -->
+  <!-- Do not translate. -->
+  <!-- Do not translate. -->
+  <!-- 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. -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security choices used when manually added a Wi-Fi network -->
+  <!-- Match this with the constants in AccessPoint. -->
+  <!-- Wi-Fi security types for New User Dialog. EAP is not configurable. -->
+  <!-- Wi-Fi AP settings.  The type of security a Wi-Fi AP supports. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the constants in WifiDialog. -->
+  <!-- Wi-Fi settings.  The type of EAP method a Wi-Fi network has. -->
+  <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
+  <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi WPS setup for p2p connections.  -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Match this with the order of WifiP2pDevice.Status -->
+  <!-- Wi-Fi p2p settings device status message -->
+  <!-- Bluetooth Settings -->
+  <!-- Discoverable mode timeout options -->
+  <!-- Match this with drawable.wifi_signal. -->
+  <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
+         the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
+  <!-- Do not translate. -->
+  <!-- Data Usage settings. Range of data usage. -->
+  <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
+  <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
+  <!-- Do not translate. -->
+  <!-- Display options for UsageStats class -->
+  <!-- EAP method -->
+  <!-- Phase 2 options for PEAP -->
+  <!-- Phase 2 options for rest of EAP methods -->
+  <!-- Wi-Fi IP settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Wi-Fi proxy settings. -->
+  <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Authentication Types used in APN editor -->
+  <!-- Bearer Info used in APN editor -->
+  <!-- MVNO Info used in APN editor -->
+  <!-- Apps on SD installation location options in ApplicationSettings -->
+  <!-- Do not translate. -->
+  <!-- Names of categories of app ops tabs -->
+  <!-- User display names for app ops codes -->
+  <!-- User display names for app ops codes -->
+  <!-- Titles for the list of long press timeout options. -->
+  <!-- Values for the list of long press timeout options. -->
+  <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning typeface preference. -->
+  <!-- Titles for captioning font size preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning font size preference. -->
+  <!-- Titles for captioning character edge type preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning character edge type preference. -->
+  <!-- Titles for captioning color preference. -->
+  <!-- Values for captioning color preference. -->
+  <!-- Titles for captioning opacity preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning opacity preference. -->
+  <!-- Titles for captioning text style preset preference. [CHAR LIMIT=35] -->
+  <!-- Values for captioning text style preset preference. -->
+  <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+  <!-- Titles for logd limit size lowram selection preference. [CHAR LIMIT=14] -->
+  <!-- Values for logd limit size selection preference. -->
+  <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+  <!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
+  <!-- Values for HDCP checking preference. -->
+  <!-- Summaries for HDCP checking preference. [CHAR LIMIT=100]-->
+  <!-- Titles for window animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for window animation scale preference. -->
+  <!-- Titles for transition animation scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for transition animation scale preference. -->
+  <!-- Titles for animator duration scale preference. [CHAR LIMIT=35] -->
+  <!-- Values for animator duration scale preference. -->
+  <!-- Titles for overlay display devices preference. [CHAR LIMIT=35] -->
+  <!-- Values for overlay display devices preference. -->
+  <!-- Titles for OpenGL traces preference. [CHAR LIMIT=35] -->
+  <!-- Values for OpenGL traces preference. -->
+  <!-- Titles for non-rectangular clipping preference. [CHAR LIMIT=35] -->
+  <!-- Values for non-rectangular clipping preference. -->
+  <!-- Titles for frame time tracking preference. [CHAR LIMIT=35] -->
+  <!-- Values for frame time tracking preference. -->
+  <!-- Titles for debug overdraw preference. [CHAR LIMIT=50] -->
+  <!-- Values for debug overdraw preference. -->
+  <!-- Titles for app process limit preference. [CHAR LIMIT=35] -->
+  <!-- Values for app process limit preference. -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Short names for each VPN type, not really translatable. [CHAR LIMIT=20] -->
+  <!-- Match this with the constants in VpnProfile. -->
+  <!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
+  <!-- Match this with the constants in LegacyVpnInfo. -->
+  <!-- Status for a VPN network. [CHAR LIMIT=100] -->
+  <!-- User content ratings for restricted users [CHAR LIMIT=30] -->
+  <!-- Values for user content ratings for restricted users -->
+  <!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
+  <!-- [CHAR LIMIT=40] Labels for memory states -->
+  <!-- Display color space adjustment modes for accessibility -->
+  <!-- Values for display color space adjustment modes for accessibility -->
+  <!-- Display color space adjustment modes for developers -->
+  <!-- Values for display color space adjustment modes for developers -->
+  <!-- Battery saver mode: allowable trigger threshold levels. -->
+  <!-- Process stats memory use details: labels for memory states -->
+  <!-- Process stats memory use details: labels for process -->
+  <!-- Array of titles for sim color for multi-sim -->
+  <!-- USB configuration names for Developer Settings.
+         This can be overridden by devices with additional USB configurations. -->
+  <!-- USB configuration values for Developer Settings.
+         These are lists of USB functions passed to the USB Manager to change USB configuraton.
+         This can be overridden by devices with additional USB configurations.
+         Do not translate. -->
+  <!-- Possible values for user theme in Display Settings.
+         Do not translate. -->
+  <!-- These values should match up with the MODE_NIGHT constants in UiModeManager.
+         Do not translate. -->
+</resources>
diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 0000000..5d5b9d2
--- /dev/null
+++ b/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2016 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">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Launch Dev Tools -->
+  <!-- Development shortcut -->
+  <!-- Setting checkbox title for root access -->
+  <!-- Preference link for root appops -->
+  <!-- NFC PreferenceCategory title -->
+  <!-- About phone screen, CyanogenMod version -->
+  <!-- About phone screen, Device model -->
+  <!-- About phone screen, Device name -->
+  <!-- About phone screen, CyanogenMod Api Level -->
+  <!-- About phone screen, build date -->
+  <!-- CM Updater -->
+  <!-- Settings switch for updating Cyanogen recovery -->
+  <!-- Themes Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Sound settings screen -->
+  <!-- Profiles settings  -->
+  <!-- Profile mode options. -->
+  <!-- Add Profile -->
+  <!-- Rename Dialog  -->
+  <!-- Reset Profiles -->
+  <!-- Delete confimation messages -->
+  <!-- Profile network mode -->
+  <!-- Profile Config screen PreferenceGroup titles -->
+  <!-- Menu item for managing profiles -->
+  <!-- Profile settings screen, section header for settings related to notification profiles -->
+  <!-- Profile Settings sound modes labels -->
+  <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <!-- Title for application group setting screen -->
+  <!-- Add application dialog box title -->
+  <!-- Profiles - system settings -->
+  <!-- Connection override toggles (not all are used at this time ) -->
+  <!-- Wi-Fi region code -->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Profiles -->
+  <!-- Title for application group setting screen -->
+  <!-- Navigation Bar -->
+  <!-- Notification light dialogs -->
+  <!-- Values for the notification light pulse spinners -->
+  <!-- Battery light settings -->
+  <!-- Lights settings screen, notification light settings -->
+  <!-- Lights settings, LED notification -->
+  <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <!-- Android debugging over WiFi -->
+  <!-- Warning for Adb over Network -->
+  <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- User display names for app ops codes - extension of AOSP -->
+  <!-- App ops permissions -->
+  <!-- App ops detail -->
+  <!-- App ops menu options -->
+  <!-- Hostname setting -->
+  <!-- Backlight brightness settings screen -->
+  <!-- Sunlight readability enhancement screen -->
+  <!-- Color enhancement settings screen -->
+  <!-- Key backlight -->
+  <!-- Gesture Settings -->
+  <!-- Settings main menu entry -->
+  <!-- Power menu -->
+  <!-- Buttons - Enable navbar -->
+  <!-- tap-to-wake -->
+  <!-- tap-to-sleep -->
+  <!-- Proximity wake -->
+  <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <!-- Font size sample text. This needs to be a very short string, as it is shown in
+    multiple font sizes in a limited amount of space. -->
+  <!-- Volume settings - Volume adjustment sound -->
+  <!-- Hardware tunables - Vibrator intensity -->
+  <!-- Hardware tunables - Color calibration -->
+  <!-- Launch music player when headset is connected -->
+  <!-- WiFi auto-configure priorities -->
+  <!-- Display : Rotation  -->
+  <!-- LiveDisplay -->
+  <!-- LiveDisplay : Picture Adjustment -->
+  <!-- Whether to display IME switcher notifcation -->
+  <!-- Heads up -->
+  <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <!-- High touch sensitivity -->
+  <!-- Display & Lights screen, setting options for LCD density -->
+  <!-- Stylus Icon -->
+  <!-- Stylus Gestures -->
+  <!-- Gestures Options -->
+  <!-- Stylus gestures -->
+  <!-- Touchscreen hovering -->
+  <!-- Increasing ring tone volume -->
+  <!-- LTO download data over wi-fi only -->
+  <!-- Category title for Charging sounds (Power state change) specific Settings.
+         [CHAR LIMIT=40] -->
+  <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <!-- Sound settings, charging sounds label for ringtone == none -->
+  <!-- Status bar -->
+  <!-- Status bar - Clock -->
+  <!-- Status bar - Battery -->
+  <!-- Status bar - Battery percentage -->
+  <!-- Status bar - icon blacklist -->
+  <!-- EdgeGesture service -->
+  <!-- Keep screen on strings -->
+  <!-- Privacy Settings Header item -->
+  <!-- Privacy Guard -->
+  <!-- Sizes for pattern lockscreen -->
+  <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <!-- Whether the keyguard will directly pass to password entry -->
+  <!-- Whether the keyguard will directly pass to pattern view -->
+  <!-- Whether the keyguard will directly pass to PIN entry -->
+  <!-- lock screen visualizer -->
+  <!-- lock screen disabled by QS tile warning -->
+  <!-- Battery saver -->
+  <!-- Battery : Automatic performance profiles -->
+  <!-- Memory -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Advanced reboot options -->
+  <!-- Expanded desktop -->
+  <!-- Kill app long-press back -->
+  <!-- Show/Hide Search Bar -->
+  <!-- Voice Wakeup -->
+  <!-- Blacklist preferences -->
+  <!-- Blacklist management -->
+  <!-- Sms security limit -->
+  <!-- Notification spamfilter -->
+  <!-- Anonymous Statistics #CM -->
+  <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <!-- Anonymous Statistics - Preview -->
+  <!-- Protected apps lockpattern reset button -->
+  <!-- Protected Apps -->
+  <!-- Contributors cloud activity -->
+  <!-- Edit access point labels: PPP number -->
+  <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <!-- MSIM SIM status -->
+  <!-- Zen mode allowed event setting summary items -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
+  <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
+  <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
+  <!-- SAR information -->
+  <!-- IC Codes -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- Factory reset strings -->
+  <!-- Tethering & portable hotspot other category -->
+  <!-- Wi-Fi tethering inactivity timeout -->
+  <!-- Live lock screen -->
+  <!-- Live lock screen title -->
+  <!-- Live lock screen summary -->
+  <!-- Live lock screen settings content description -->
+  <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <!-- CM Legal -->
+  <!-- Menu label for reset the battery stats -->
+  <!-- Reset stats confirmation dialog's message -->
+  <!-- Dock battery not present message -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <!-- Weather -->
+  <!-- Label for settings shortcut: carrier selection -->
+  <!-- title for lock screen blur preference -->
+  <!-- title for lock screen weather preference -->
+  <!-- Per app controls for LP keyguard notifications -->
+  <!-- CmRadioInfo -->
+  <!-- Radio Control (IMS/MBN etc.) -->
+  <!-- Lock screen wallpaper -->
+  <!-- Format string for fingerprint location message -->
+  <!-- Fingerprint sensor locations -->
+  <!-- SIM status format string -->
+</resources>
diff --git a/res/values-ga-rIE/strings.xml b/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..2216f6c
--- /dev/null
+++ b/res/values-ga-rIE/strings.xml
@@ -0,0 +1,3100 @@
+<?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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Strings for Dialog yes button -->
+  <!-- Strings for Dialog no button -->
+  <!-- Strings for Dialog create button -->
+  <!-- Strings for Dialog allow button -->
+  <!-- Strings for Dialog deny button -->
+  <!-- Strings for Dialog close button [CHAR LIMIT=20] -->
+  <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
+  <!-- Device Info -->
+  <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
+  <!-- Category headings in left-pane header menu -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
+  <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <!-- Phone info -->
+  <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone SMS over IMS IMS registration required on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone IMS registration required off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- VoLTE provisioning flag off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump on. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone ram dump off. Only shown in diagnostic screen, so precise translation is not needed. -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Menu item label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Unmounts the SD card from the phone, meaning it will become available for an attached computer  -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted [CHAR LIMIT=25] -->
+  <!-- Used for diagnostic info screens, precise translation isn't needed. Formats the SD card in the phone, meaning it will be erased and reformatted -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- choice for the font size spinner -->
+  <!-- Do not translate. label for font size preview.  Does not need to be translated. -->
+  <!-- Button. Chosen when they want to save the chosen text size. -->
+  <!-- Title for a notification shown. [CHAR LIMIT=25] -->
+  <!-- Title for a notification shown. -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+  <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Used as setting title (for checkbox) on second screen after selecting Bluetooth settings -->
+  <!-- Bluetooth settings screen, summary after selecting Discoverable check box [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary when Discoverable duration is set to "forever" [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable and no paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, summary text when not discoverable with paired devices [CHAR LIMIT=50] -->
+  <!-- Bluetooth settings screen, option name to pick discoverability timeout duration (a list dialog comes up) -->
+  <!-- Bluetooth settings screen, check box label whether or not to allow
+        bluetooth voice dialing when lock screen is up-->
+  <!-- Bluetooth settings screen, lock voice dialing checkbox summary text -->
+  <!-- Bluetooth settings screen, heading above the list of nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, title for the current bluetooth name setting -->
+  <!-- Bluetooth settings screen, image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Bluetooth settings screen, image description for profile of a device details button. -->
+  <!-- Bluetooth settings screen, summary text when there isn't a name set (for the name setting) -->
+  <!-- Bluetooth settings screen, menu item to scan for nearby bluetooth devices -->
+  <!-- Bluetooth settings screen, menu item to change this device's Bluetooth name. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings screen, confirmation button for rename device dialog. [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings.  Dialog title to confirm disconnecting from all profiles of a device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings.  Message for disconnecting from all profiles of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Settings. text displayed when user has restriction DISALLOW_CONFIG_BLUETOOTH [CHAR LIMIT=NONE]-->
+  <!-- Bluetooth Visibility message.  This message informs the user that their device is now visible to other bluetooth devices.  [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth Visibility discoonect question.  Asks the user if they wish to disconnect a paired bluetooth device.  [CHAR LIMIT=50] -->
+  <!-- Bluetooth broadcasting settings, option to enable/disable broadcasting -->
+  <!-- Bluetooth settings.  Dialog title to disable a single profile of a device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message for disabling a profile of a bluetooth device. [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth settings.  Message when the device state is unknown -->
+  <!--Bluetooth settings screen, summary text for Bluetooth device with no name -->
+  <!--Bluetooth settings screen, text that appears in heading bar when scanning for devices -->
+  <!--Bluetooth settings screen, text that appears when scanning for devices is finished and no nearby bluetooth device was found [CHAR LIMIT=40]-->
+  <!-- Notification ticker text (shown in the status bar) when a Bluetooth device wants to pair with us -->
+  <!-- Notification title when a Bluetooth device wants to pair with us -->
+  <!-- Notification message when a Bluetooth device wants to pair with us -->
+  <!-- Bluetooth settings screen, menu to show the list of received files [CHAR LIMIT=30] -->
+  <!-- Strings for BluetoothDevicePicker [CHAR LIMIT=40]-->
+  <!-- Strings for dialog title when asking to the user whether to allow an app to enable discovery mode -->
+  <!-- This string asks the user whether or not to allow an app to enable bluetooth. [CHAR LIMIT=100] -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable lasting discovery mode  -->
+  <!-- Strings for asking to the user whether to allow an app to start broadcasting -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and start broadcasting -->
+  <!-- Strings for bluetooth broadcasting explanation -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for asking to the user whether to allow an app to enable bluetooth and discovery mode -->
+  <!-- Strings for msg to display to user while bluetooth is turning on [CHAR LIMIT=60] -->
+  <!-- Strings for msg to display to user while bluetooth is turning off [CHAR LIMIT=60] -->
+  <!-- Strings for device profile auto connect setting -->
+  <!-- Activity label of BluetoothPermissionActivity [CHAR LIMIT=none]-->
+  <!-- Notification message when a remote Bluetooth device wants to connect to a Bluetooth profile [CHAR LIMIT=none]-->
+  <!-- Bluetooth connection permission Alert Activity text [CHAR LIMIT=none]-->
+  <!-- Activity label of BluetoothPbPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Bluetooth phone book permission Alert Activity checkbox text [CHAR LIMIT=none] -->
+  <!--FIXME SHOULD BE REMOVED AND ALL LANG VERSIONS FIXED TO ABOVE NAME -->
+  <!-- Activity label of BluetoothMessagePermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth message permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Activity label of BluetoothMessagePermissionActivity for SIM access profile. Also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+  <!-- Bluetooth SIM access permission Alert Activity text [CHAR LIMIT=none] -->
+  <!-- Date & time settings screen title -->
+  <!-- The title of the activity to pick a time zone. -->
+  <!-- Label of preview text when tweaking font size -->
+  <!-- Label for chosen font size -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Used for diagnostic screens, precise translation is not necessary -->
+  <!-- HTTP proxy settings title -->
+  <!-- HTTP proxy settings. Button to clear the proxy box. -->
+  <!-- HTTP proxy settings. The port number label. -->
+  <!-- HTTP proxy settings. The hint text field for port. -->
+  <!-- HTTP proxy settings. The exclusion list label. -->
+  <!-- HTTP proxy settings. The hint text for proxy exclusion list. [CHAR LIMIT=50]-->
+  <!-- HTTP proxy settings. The button to restore the defaults. -->
+  <!-- HTTP proxy settings. The button to save. -->
+  <!-- HTTP proxy settings. The text field for the hostname -->
+  <!-- HTTP proxy settings. The hint text field for the hostname. [CHAR LIMIT=50] -->
+  <!-- HTTP proxy settings. Title if there is an error-->
+  <!-- HTTP proxy settings. Button to get rid of error box-->
+  <!-- HTTP proxy settings. The error if the hostname is not valid -->
+  <!-- HTTP proxy settings. The error if the exclusion list is not valid -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Error msg -->
+  <!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
+  <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
+  <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <!-- Band Mode Selection -->
+  <!-- Band mode screen.  Title of activity. -->
+  <!-- Band mode screen.  Loading message. -->
+  <!-- Band mode screen. Button caption to set the bandmode. -->
+  <!-- Band mode screen. Status message when unsuccessful. -->
+  <!-- Band mode screen. Statusm essage when successful. -->
+  <!-- Instructions after the user changes the mass storage settings -->
+  <!-- Enable USB mass storage mode checkbox title -->
+  <!-- The label for total bytes on SD card -->
+  <!-- Message when there is no SD card present [CHAR LIMIT=30] -->
+  <!-- Message when there is no SD card present -->
+  <!-- Th label for the available (free) sapce on the SD card -->
+  <!-- Message when the SD card is being used by the computer as mass storage [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is being used by the computer as mass storage -->
+  <!-- Message when it is safe to remove the SD card [CHAR LIMIT=30] -->
+  <!-- Message when it is safe to remove the SD card -->
+  <!-- Error message when the SD card was removed without properly unmounting [CHAR LIMIT=30] -->
+  <!-- Error message when the SD card was removed without properly unmounting -->
+  <!-- Label for used bytes on the SD card -->
+  <!-- Message when it is scanning the SD card for new files [CHAR LIMIT=30]  -->
+  <!-- Message when it is scanning the SD card for new files -->
+  <!-- Message when the SD card is mounted as read only [CHAR LIMIT=30] -->
+  <!-- Message when the SD card is mounted as read only -->
+  <!-- Used in setup wizard Wi-Fi screen.  The button label for going to the next screen without submitting. [CHAR LIMIT=20] -->
+  <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
+  <!-- LocalePicker -->
+  <!-- Title for the locale picker activity -->
+  <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
+  <!-- Do not translate. -->
+  <!-- The title of the activity to see random device info. -->
+  <!-- The title of the activity to adjust display settings -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to see phone info -->
+  <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
+  <!-- The title of the activity to adjust SD card settings-->
+  <!-- The title of the activity to adjust proxy settings -->
+  <!-- ======================================================================================= -->
+  <!-- NEW STUFF -->
+  <!-- ======================================================================================= -->
+  <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <!-- Button label for generic OK action [CHAR LIMIT=20] -->
+  <!-- Button label for generic forget action [CHAR LIMIT=20] -->
+  <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <!-- Button label for generic done action [CHAR LIMIT=20] -->
+  <!-- Title of the Settings activity shown within the application itself. -->
+  <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <!-- Label for option to select a settings panel as a shortcut -->
+  <!-- Wireless controls settings screen, setting check box label -->
+  <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
+  <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
+  <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
+  <!-- check box cellular data title [CHAR LIMIT=30] -->
+  <!-- check box Calls title [CHAR LIMIT=30] -->
+  <!-- check box SMS Messges title [CHAR LIMIT=30] -->
+  <!-- check box cellular data summary [CHAR LIMIT=41] -->
+  <!-- check box to allow data usage when roaming [CHAR LIMIT=41] -->
+  <!-- mobile network settings screen, setting check box title -->
+  <!-- mobile network settings screen, setting option summary text when check box is selected -->
+  <!-- mobile network settings screen, setting option summary text when check box is clear -->
+  <!-- mobile network settings screen, dialog message when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, button on dialog box that appears when you are roaming and clear the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser tablets [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, message in dialog box that appears when you select the "Data roaming" check box. This is for multiuser phones [CHAR LIMIT=none] -->
+  <!-- mobile network settings screen, title of dialog box that appears when you select the "Data roaming" check box -->
+  <!-- mobile network settings screen, setting option name -->
+  <!-- mobile network settings screen, setting option summary text -->
+  <!-- Date and time settings -->
+  <!-- Main Settings screen setting option name to go into the date and time settings-->
+  <!-- Title for Date & Time settings screen in SetupWizard [CHAR LIMIT=40] -->
+  <!-- Main Settings screen setting option summary text for the item to go into the date and time settings. -->
+  <!-- Date & time setting screen setting check box title if the date and time should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is selected
+        (that is, when date and time should be determined automatically) [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting option summary text when Automatic check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title if the time zone should be determined automatically [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is selected (that is, when date and time should be determined automatically)
+        [CHAR LIMIT=100]  -->
+  <!-- Date & time setting screen setting option summary text when Automatic time zone check box is clear
+        [CHAR LIMIT=100] -->
+  <!-- Date & time setting screen setting check box title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting check box title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <!-- Date & time setting screen setting option title -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Menu item on Select time zone screen -->
+  <!-- Title string shown above DatePicker, letting a user select system date
+         [CHAR LIMIT=20] -->
+  <!-- Title string shown above TimePicker, letting a user select system time
+         [CHAR LIMIT=20] -->
+  <!-- Security Settings -->
+  <!-- Security settings screen, setting option name to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout -->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Security settings screen, setting option summary to change screen timeout, with additional explanation-->
+  <!-- Text shown next to checkbox for showing owner info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of owner info setting [CHAR LIMIT=20]-->
+  <!-- Text shown for title of settings checkbox to enable widgets [CHAR LIMIT=20]-->
+  <!-- Summary for settings checkbox to disable widgets when the setting has been disabled by an installed device admin [CHAR LIMIT=50] -->
+  <!-- Text shown for summary of owner info setting (if none set) [CHAR LIMIT=40]-->
+  <!-- Description of how many characters are used in owner info [CHAR LIMIT=40]-->
+  <!-- Hint text shown in owner info edit text [CHAR LIMIT=50] -->
+  <!-- Text shown for title of user info setting [CHAR LIMIT=20]-->
+  <!-- Text shown next to checkbox for showing profile info on LockScreen [CHAR LIMIT=50]-->
+  <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
+  <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+  <!-- Main Settings screen setting option title for the item to take you to the security screen -->
+  <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
+  <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
+  <!-- In the security screen, the header title for settings related to  Passwords-->
+  <!-- Fingerprint enrollment and settings -->
+  <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
+  <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
+  <!-- Fingerprint category title - configuration options for managing fingerprint enrollment [CHAR LIMIT=22] -->
+  <!-- Preference to add another fingerprint -->
+  <!-- switch for allowing fingerprint to be used for keyguard -->
+  <!-- message shown for menu item that launches fingerprint settings or enrollment -->
+  <!-- message shown in summary field when no fingerprints are registered -->
+  <!-- Introduction title shown in fingerprint enrollment dialog [CHAR LIMIT=29] -->
+  <!-- Introduction message shown in fingerprint enrollment dialog when the user needs to choose an
+         alternate screen unlock (pin, pattern or password) as a backup to fingerprint. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, first item to describe what
+         the user needs to do. -->
+  <!-- Introduction message shown in fingerprint enrollment dialog, second item to describe what
+         the user needs to do. -->
+  <!-- Introduction title shown in fingerprint enrollment to introduce the fingerprint feature[CHAR LIMIT=29] -->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog [CHAR LIMIT=NONE]-->
+  <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
+  <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
+  <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
+  <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
+  <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
+  <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
+  <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
+  <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=NONE] -->
+  <!-- Title shown in fingerprint enrollment dialog once enrollment is completed [CHAR LIMIT=29] -->
+  <!-- Message shown in fingerprint enrollment dialog once enrollment is completed -->
+  <!-- Message shown when fingerprint enrollment is completed during setup wizard [CHAR LIMIT=NONE] -->
+  <!-- Message shown when fingerprint enrollment is completed, telling user about the fingerprint icon that will be shown whenever they can use their fingerprint [CHAR LIMIT=NONE] -->
+  <!-- Title of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=40] -->
+  <!-- Content of the dialog shown when the user tries to skip fingerprint setup, asking them to confirm the action [CHAR LIMIT=NONE] -->
+  <!-- Button text to setup screen lock in onboard dialog [CHAR LIMIT=34] -->
+  <!-- Button text to exit fingerprint wizard after everything is done [CHAR LIMIT=15] -->
+  <!-- Dialog title for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when user touches the icon on the screen, instead of the sensor at the back [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled. [CHAR LIMIT=45] -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to being idle too long. -->
+  <!-- Dialog message for dialog which shows when finger cannot be enrolled due to an internal error or fingerprint can't be read. -->
+  <!-- Button text shown at the end of enrollment that allows the user to add another fingerprint -->
+  <!-- Button text shown at the end of enrollment that allows the user to move to the next step -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for. [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint settings explaining what the fingerprint can be used for in the case unlocking is disabled [CHAR LIMIT=NONE] -->
+  <!-- Text shown in fingerprint enroll when we didn't observe progress for a few seconds. [CHAR LIMIT=100] -->
+  <!-- Text shown when "Add fingerprint" button is disabled -->
+  <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
+  <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
+  <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Title of the preferences category for preference items to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Title of the preferences item to control encryption -->
+  <!-- Summary of the preferences item to control encryption, when encryption is active -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Informational text in the first confirmation screen before starting device encryption -->
+  <!-- Button text to start encryption process -->
+  <!-- Button text to start encryption process -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Warning string that will be displayed when encryption cannot be started -->
+  <!-- Dialog title, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Dialog message, shown when encryption cannot proceed because a PIN/Password is needed -->
+  <!-- Title of the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Warning text in the final confirmation screen before starting device encryption -->
+  <!-- Title of the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Informational text on the progress screen while encrypting the device -->
+  <!-- Warn user their device will be wiped if they make x more failed attempts -->
+  <!-- Informational text on the password entry screen prompting the user for their password -->
+  <!-- Title of the encryption screen when encrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Title of the encryption screen when decrypting the device failed -->
+  <!-- Informational text when encryption fails -->
+  <!-- Informational text when encryption fails -->
+  <!-- Image button description to switch input method -->
+  <!-- Unlock Picker Settings -->
+  <!-- Security Picker -->
+  <!--  Title for security picker to choose the unlock method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!-- Message shown in screen lock picker while setting up the backup/fallback screen lock method for fingerprint. Users can choose to use this method to unlock the screen instead of fingerprint, or when fingerprint is not accepted. [CHAR LIMIT=80] [BACKUP_MESSAGE_ID=2799884038398627882] -->
+  <!--  Main Security lock settings -->
+  <!--  Title for PreferenceScreen to launch picker for security method when there is none [CHAR LIMIT=22] -->
+  <!--  Title for PreferenceScreen to change security method: None/Pattern/PIN/Password [CHAR LIMIT=22] -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!--  Summary for PreferenceScreen to changeecurity method: None/Pattern/PIN/Password [CHAR LIMIT=45]  -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45] -->
+  <!-- Title for preference that disables unlock security [CHAR LIMIT=22] -->
+  <!-- Summary for preference that disables unlock security [CHAR LIMIT=45]-->
+  <!-- Title for preference that guides the user through creating an unlock pattern [CHAR LIMIT=22]-->
+  <!-- Summary for preference that guides the user through creating an unlock pattern [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
+  <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
+  <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
+  <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
+  <!-- Summary for "Configure lockscreen" when lock screen is off [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security is disabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
+  <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
+         they can add fingerprint after they complete setup wizard. The text "Settings > Security"
+         should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
+  <!-- Title for option to turn of password/pin/pattern unlock. [CHAR LIMIT=22] -->
+  <!-- Title of the dialog shown when the user removes the device lock [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock pattern and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock PIN and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock password and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type [CHAR LIMIT=NONE] -->
+  <!-- Content of the dialog shown when the user removes the device lock of unknown type and the user has fingerprints enrolled [CHAR LIMIT=NONE] -->
+  <!-- Affirmative action of the dialog shown when the user removes the device lock [CHAR LIMIT=25] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen pattern [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen PIN [CHAR LIMIT=22] -->
+  <!-- Title shown on security settings to allow the user to change their lockscreen password [CHAR LIMIT=22]-->
+  <!-- Hint shown in dialog screen when password is too short -->
+  <!-- Hint shown in dialog screen when PIN is too short -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Hint shown after minimum password criteria is met -->
+  <!-- Error shown in popup when password is too long -->
+  <!-- Error shown in popup when PIN is too long -->
+  <!-- Error shown when in PIN mode and user enters a non-digit -->
+  <!-- Error shown when in PIN mode and PIN has been used recently. Please keep this string short! -->
+  <!-- Error shown when in PASSWORD mode and user enters an invalid character -->
+  <!-- Error shown when in PASSWORD mode and password is all digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain any symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of lowercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of uppercase letters -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of numerical digits -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of special symbols -->
+  <!-- Error shown when in PASSWORD mode and password doesn't contain the required number of non-letter characters -->
+  <!-- Error shown when in PASSWORD mode and password has been used recently. Please keep this string short! -->
+  <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for ChoosePassword/PIN OK button -->
+  <!-- Label for LockPatternTutorial Cancel button -->
+  <!-- Label for LockPatternTutorial Continue button -->
+  <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
+  <!-- In the security screen, the header title for settings related to device admins -->
+  <!-- Title of preference to manage device admins -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Title of preference to manage trust agents -->
+  <!-- Summary shown when trust agent settings is disabled because the user hasn't set up primary security -->
+  <!-- Summary of preference to manage device policies -->
+  <!-- Bluetooth settings -->
+  <!-- Bluetooth settings check box title on Main Settings screen -->
+  <!-- Bluetooth settings check box summary for turning on bluetooth -->
+  <!--Used as title on second screen after selecting Bluetooth settings -->
+  <!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
+  <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
+  <!-- ======================================================================================= -->
+  <!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "&lt;b>") in   -->
+  <!--   the following resources to enable formatting followed by HTML styling, as described   -->
+  <!--   here:  http://developer.android.com/guide/topics/resources/string-resource.html       -->
+  <!-- ======================================================================================= -->
+  <!-- Title for the dialog to enter PIN. [CHAR LIMIT=40] -->
+  <!-- Message when bluetooth is informing the user of the pairing key. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth dialog for passkey entry is showing. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label for alphanumeric PIN entry (default is numeric PIN). [CHAR LIMIT=50] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Bluetooth PIN hint text (below the text entry box). [CHAR LIMIT=30] -->
+  <!-- Pairing dialog text to remind user to enter the PIN on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
+  <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
+  <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
+  <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
+  <!-- Checkbox message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Title for BT error dialogs. -->
+  <!-- Message for the error dialog when BT connecting operation fails generically. -->
+  <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
+  <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
+  <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: paring permission message.  [CHAR LIMIT=100] -->
+  <!-- Bluetooth settings: The sub heading for devices which have already been paired with this device. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
+  <!-- Bluetooth settings.  Context menu item for a device.  Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
+  <!-- Bluetooth settings.  Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
+  <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
+  <!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
+  <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Bluetooth settings.  The title of the screen to pick which profiles to connect to on the device.  For example, headphones may have both A2DP and headset, this allows the user to choose which one he wants to connect to. -->
+  <!-- Bluetooth settings.  Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
+  <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
+         When a user decides what Bluetooth capabilities to use with the device.  -->
+  <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
+  <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
+  <!-- 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.  Dock Setting Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog Title -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
+  <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
+  <!-- Wifi Assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
+  <!-- Wifi Display settings. The status summary for connecting devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for connected devices. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's already in use. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The status summary for devices that's not available. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Image description for device details button. This opens the screen to rename, unpair, etc. a single device. -->
+  <!-- Wifi Display settings. Options dialog.  The title of the dialog. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The checkbox title for enabling autonomous GO during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending pause trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The button text for sending play (resume) trigger during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing WPS configuration during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing listen channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
+  <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+  <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+  <!-- Link speed on Wifi Status screen -->
+  <!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
+  <!-- NFC settings -->
+  <!-- Used in the 1st-level settings screen to turn on NFC -->
+  <!-- Description of NFC in the 1st level settings screen, for a tablet. [CHAR LIMIT=NONE] -->
+  <!-- Description of NFC in the 1st level settings screen, for a phone. [CHAR LIMIT=NONE] -->
+  <!-- Used to enter the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Used to describe the on state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the off state of the Android Beam feature [CHAR LIMIT=NONE] -->
+  <!-- Used to describe the enabled state of the Android Beam feature when NFC, which it relies on, is turned off [CHAR LIMIT=NONE] -->
+  <!-- Used in the Android Beam sharing preferences screen. This phrase is a trademark. [CHAR LIMIT=32] -->
+  <!-- Explanation of the Android Beam feature in the Android Beam settings panel. The use of "beam" here is as a verb and not considered trademarked. [CHAR LIMIT=NONE] -->
+  <!-- Network service discovery settings -->
+  <!-- Used in the 1st-level settings screen to turn on NSD -->
+  <!-- Description of NFC in the 1st level settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Settings -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi -->
+  <!-- Used in the 1st-level settings screen as the turn-on summary -->
+  <!-- Used in the 1st-level settings screen to go to the 2nd-level settings screen  [CHAR LIMIT=20]-->
+  <!-- Title of the Wi-fi settings screen -->
+  <!-- Title of the Wi-fi settings entry in the left top level menu -->
+  <!-- Summary text of the Wi-fi settings screen -->
+  <!-- Used in the 1st-level settings screen to turn on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Used by Account creation for turning on Wi-Fi  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning Wi-Fi or bluetooth on -->
+  <!-- Summary text when turning Wi-Fi or bluetooth off -->
+  <!-- Summary text when Wi-Fi or bluetooth has error -->
+  <!-- Summary text when wifi SoftAP started failed due to no legal usable channel allowed in this region by regulatory -->
+  <!-- Toast message when Wi-Fi or bluetooth is disallowed in airplane mode -->
+  <!-- Checkbox title for option to notify user when open networks are nearby -->
+  <!-- Checkbox summary for option to notify user when open networks are nearby [CHAR LIMIT=60]-->
+  <!-- Checkbox title for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection -->
+  <!-- Checkbox summary for option to toggle poor network detection [CHAR LIMIT=60] -->
+  <!-- Checkbox title for option to connect to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Checkbox summary for option to connect to open Wi-Fi automatically  [CHAR LIMIT=100] -->
+  <!-- Dialog title for option to select an app which connects to open Wi-Fi automatically [CHAR LIMIT=40] -->
+  <!-- Preference title for option to install certificates -->
+  <!-- Message to describe "Wi-Fi scan always available feature" when Wi-Fi is off. The
+      place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
+      the user to "scanning settings" screen. -->
+  <!-- Wifi scan always mode checkbox text -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? -->
+  <!-- Setting title for setting the wifi sleep policy. Do we keep Wi-Fi active when the screen turns off? [CHAR LIMIT=30] -->
+  <!-- Generic error message when the sleep policy could not be set. -->
+  <!-- Checkbox title for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations -->
+  <!-- Checkbox summary for option to toggle suspend power optimizations [CHAR LIMIT=30] -->
+  <!-- Checkbox title. Should we switch to using cellular data if Wi-Fi is still connected but the Wi-Fi network we're connected to no longer has Internet access (e.g., due to an outage)? -->
+  <!-- Action bar text message to manually add a wifi network [CHAR LIMIT=20]-->
+  <!-- Header for the list of wifi networks-->
+  <!-- Menu option to do WPS Push Button [CHAR LIMIT=25]-->
+  <!-- Content description for menu button in Wifi setup. Not shown on the screen. [CHAR LIMIT=NONE] -->
+  <!-- Menu option to do WPS Pin Entry [CHAR LIMIT=25]-->
+  <!-- Menu option to launch Wi-Fi Direct settings [CHAR LIMIT=20]-->
+  <!-- Menu option to scan Wi-Fi networks -->
+  <!-- Menu option to Wi-Fi advanced settings -->
+  <!-- Menu option to connect to a Wi-Fi network -->
+  <!-- Menu option to remember a temporary Wi-Fi network -->
+  <!-- Menu option to delete a Wi-Fi network -->
+  <!-- Menu option to modify a Wi-Fi network configuration -->
+  <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. text displayed when Wi-Fi is on and network list is empty [CHAR LIMIT=50]-->
+  <!-- Wifi Settings. text displayed when user has restriction DISALLOW_CONFIG_WIFI [CHAR LIMIT=NONE]-->
+  <!-- Wi-Fi settings. title for setup other network button [CHAR LIMIT=35]-->
+  <!-- Wi-Fi settings. content description for more button [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings. wps menu title [CHAR LIMIT=25]-->
+  <!-- Dialog for Access Points -->
+  <!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
+  <!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
+  <!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
+  <!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
+  <!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails to TKIP [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to authentication issues [CHAR LIMIT=150] -->
+  <!-- Text displayed when WPS fails due to another session [CHAR LIMIT=150] -->
+  <!-- Label for the SSID of the network -->
+  <!-- Hint for a text field to enter the SSID of a hidden wifi network. [CHAR LIMIT=35] -->
+  <!-- Label for the security of the connection -->
+  <!-- Label for the signal strength of the connection -->
+  <!-- Label for the status of the connection -->
+  <!-- Label for the link speed of the connection -->
+  <!-- Label for the frequency band of the connection -->
+  <!-- Label for the IP address of the connection -->
+  <!-- Hint text for the IP address -->
+  <!-- Label for Passpoint network -->
+  <!-- Content for Passpoint network -->
+  <!-- Label for the EAP method of the network -->
+  <!-- Label for the phase2 -->
+  <!-- Label for the EAP CA certificate of the network -->
+  <!-- Label for the EAP user certificate of the network -->
+  <!-- Label for the EAP identity of the network -->
+  <!-- Label for the EAP anonymous identity of the network -->
+  <!-- Label for the password of the secured network -->
+  <!-- Label for the check box to show password -->
+  <!-- Label for the RadioGroup to choose wifi ap band -->
+  <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
+  <!-- Label for the radio button to choose wifi ap 5GHz band -->
+  <!-- Label for the spinner to show ip settings [CHAR LIMIT=25] -->
+  <!-- Hint for unchanged fields -->
+  <!-- Hint for unspecified fields -->
+  <!-- Substring of status line when Wi-Fi Protected Setup (WPS) is available and
+         string is listed first [CHAR LIMIT=20]-->
+  <!-- Substring of wifi status when Wi-Fi Protected Setup (WPS) is available and
+         string is listed after a wifi_secured_* string-->
+  <!-- Message in WriteWifiConfigToNfcDialog when prompted to enter network password [CHAR_LIMIT=40] -->
+  <!-- Message informing the user how to turn off  [CHAR LIMIT=200] -->
+  <!-- Dialog label to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog message to sign in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
+  <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
+  <!-- Button label to connect to a Wi-Fi network -->
+  <!-- Failured notification for connect -->
+  <!-- Button label to delete a Wi-Fi network -->
+  <!-- Failured notification for forget -->
+  <!-- Button label to save a Wi-Fi network configuration -->
+  <!-- Failured notification for save -->
+  <!-- Button label to dismiss the dialog -->
+  <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
+  <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (device) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi with a mobile connect (phone) [CHAR LIMIT=NONE]-->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text warning about skipping Wi-Fi without a mobile connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (tablet) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (device) [CHAR LIMIT=NONE] -->
+  <!-- Text alerting that Wi-Fi couldn't connect (phone) [CHAR LIMIT=NONE] -->
+  <!-- Wi-Fi Advanced Settings -->
+  <!-- Wi-Fi settings screen, Saved networks, settings section.  This is a header shown above Saved networks wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, advanced, settings section.  This is a header shown above advanced wifi settings. [CHAR LIMIT=30] -->
+  <!-- Wi-Fi settings screen, setting title for setting the band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's MAC address. -->
+  <!-- Title of the screen to adjust IP settings -->
+  <!-- Wi-Fi settings screen, advanced, title of the item to show the Wi-Fi device's current IP address. -->
+  <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
+  <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
+  <!-- Menu item to save the IP settings -->
+  <!-- Menu ietm to cancel the IP settings -->
+  <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
+  <!-- Error message if the network prefix length is not valid [CHAR LIMIT=50]-->
+  <!-- Label for the DNS (first one) -->
+  <!-- Hint text for DNS -->
+  <!-- Label for the DNS (second one)-->
+  <!-- Hint text for DNS -->
+  <!-- Label for the gateway of the network -->
+  <!-- Hint text for the gateway -->
+  <!-- Label for the network prefix of the network [CHAR LIMIT=25]-->
+  <!-- Hint text for network prefix length -->
+  <!-- Wi-Fi p2p / Wi-Fi Direct settings -->
+  <!-- Used in the 1st-level settings screen to launch Wi-fi Direct settings [CHAR LIMIT=25] -->
+  <!-- Menu option to discover peers-->
+  <!-- Menu option when discovery is in progress [CHAR LIMIT=25] -->
+  <!-- Menu option to Rename-->
+  <!-- Title for available p2p devices -->
+  <!-- Title for remembered p2p groups -->
+  <!-- Toast text for a failed connection initiation -->
+  <!-- Message text for failure to rename -->
+  <!-- Title for disconnect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for disconnection from multiple devices-->
+  <!-- Title for cancel connect dialog -->
+  <!-- Message text for disconnection from one device-->
+  <!-- Message text for remembered group deletion-->
+  <!-- Wifi AP settings-->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
+  <!-- Label for Wifi tether checkbox. Toggles Access Point on/off  [CHAR LIMIT=30] -->
+  <!-- Label for Wifi tether checkbox summary. Toggles Access Point on/off  [CHAR LIMIT=60] -->
+  <!-- Summary text when turning hotspot on -->
+  <!-- Summary text when turning hotspot off -->
+  <!-- Subtext for wifi tether checkbox on success -->
+  <!-- Subtext for wifi tether checkbox on failure -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point -->
+  <!-- Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=30]-->
+  <!-- Summary Used to open the ssid and security dialog for Wifi Access Point.  [CHAR LIMIT=60] -->
+  <!-- Subtext on configuration preference to indicate SSID and security chosen -->
+  <!-- Default access point SSID used for tethering -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Wi-Fi Testing on the diagnostic screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager enableNetwork API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager disconnect API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConfiguredNetworks API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item for WifiManager getConnectionInfo API-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Button text on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+        Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Status screen-->
+  <!-- wifi state values-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary -->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Menu item on Wifi information screen-->
+  <!-- Do not translate. Used for diagnostic screens, precise translation is not necessary
+         Label on Wifi Configuration screen-->
+  <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
+  <!-- WFC mode [CHAR LIMIT=30] -->
+  <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
+  <!-- Sound and alerts settings -->
+  <!-- Main Settings screen setting option name to go into the display settings screen -->
+  <!-- Sound settings screen heading -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, volume title -->
+  <!-- Sound settings screen, music effects title [CHAR LIMIT=30]-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option name checkbox -->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
+  <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
+         the same as the incoming call volume. -->
+  <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
+  <!-- Sound settings screen, setting option title-->
+  <!-- Sound settings screen, setting option name -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Sound settings screen, alarm volume slider title -->
+  <!-- Sound settings screen, dock settings summary-->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option name checkbox to enable/disable audio recording features that improve audio recording in noisy environments -->
+  <!-- Volume description for media volume -->
+  <!-- Volume description for ringtone and notification volume -->
+  <!-- Volume description for notification volume -->
+  <!-- Volume description for alarm volume -->
+  <!-- Image description for ringer volume mute button. -->
+  <!-- Image description for media volume mute button. -->
+  <!-- Image description for notification volume mute button. -->
+  <!-- Image description for alarm volume mute button. -->
+  <!-- Dock settings title, top level -->
+  <!-- Dock settings title -->
+  <!-- Dock audio settings -->
+  <!-- Dock audio summary for docked to desk dock -->
+  <!-- Dock audio summary for docked to car dock -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for undocked -->
+  <!-- Dock audio summary for docked to unknown -->
+  <!-- Dock not found dialog title -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock not found dialog text -->
+  <!-- Dock settings screen, dock events SFX setting check box label -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Dock settings screen, setting option summary text when check box is selected -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Sound settings screen, setting option summary text when check box is clear -->
+  <!-- Account settings header. [CHAR LIMIT=30] -->
+  <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+  <!-- Header for items under the work user [CHAR LIMIT=30] -->
+  <!-- Content description for work profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile accounts group [CHAR LIMIT=NONE] -->
+  <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
+  <!-- Main Settings screen, setting option name to go into search settings -->
+  <!-- Main Settings screen, setting option summary to go into search settings -->
+  <!-- Display settings -->
+  <!-- Sound & display settings screen, section header for settings related to display -->
+  <!-- Sound & display settings screen, accelerometer-based rotation check box label -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is selected -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, accelerometer-based rotation summary text when check box is clear -->
+  <!-- Sound & display settings screen, setting option name to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to change brightness level [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change brightness level -->
+  <!-- Sound & display settings screen, setting option name to enable adaptive brightness [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout -->
+  <!-- Sound & display settings screen, setting option name to change screen timeout [CHAR LIMIT=30] -->
+  <!-- Sound & display settings screen, setting option summary to change screen timeout -->
+  <!-- Wallpaper settings title [CHAR LIMIT=30] -->
+  <!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
+  <!-- Display settings screen, trigger for screen saver options -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked or asleep and charging -->
+  <!-- Dream settings screen, dialog option, activated when docked or asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when asleep and charging -->
+  <!-- Display settings screen, summary fragment for screen saver options, activated when docked  -->
+  <!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
+  <!-- Dream settings screen, caption for when dreams are disabled -->
+  <!-- Dream settings screen, action label, when to dream -->
+  <!-- Dream settings screen, button label to start dreaming -->
+  <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
+  <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
+  <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
+  <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->
+  <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
+  <!-- Sound & display settings screen, setting option summary displaying the currently selected font size -->
+  <!-- [CHAR LIMIT=40] Sound & display settings screen, title of dialog for picking font size -->
+  <!-- SIM lock settings title  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, setting option name  [CHAR LIMIT=40] -->
+  <!-- Security & location settings screen, section heading for settings related to sim card locking  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting check box label  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is selected  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option summary text when SIM lock check box is clear  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, setting option name to change the SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, Re-type new PIN.  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message instruction  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when wrong PIN is entered  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when PINs don't match  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN  [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog message when the entered PIN is correct [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
+  <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
+  <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
+  <!-- Message confirming the user wishes to change the default data SIM from one to another.  [CHAR LIMIT=NONE] -->
+  <!-- Title for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=30] -->
+  <!-- Message for the dialog asking to user to change the preferred SIM  [CHAR LIMIT=NONE] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying to unlock the keyguard.  Displayed in a dialog box.  [CHAR LIMIT=100] -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard with SIM PIN failed. Displayed in one line in a large font.  [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- Advanced (used for diagnostics) device info activity title [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item title.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, list item summary.  Takes the user to the screen for seeing and installing system updates. [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
+  <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
+  <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->
+  <!-- About phone screen, show when a value of some status item is unavailable. -->
+  <!-- About phone screen, phone status screen title -->
+  <!-- About phone screen, title of the item to go into the Phone status screen -->
+  <!-- About tablet screen, summary of the item that takes you to tablet status screen -->
+  <!-- About phone screen, summary of the item to go into the phone status screen -->
+  <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
+  <!-- Main settings screen item's title to go into the storage & USB settings screen [CHAR LIMIT=25] -->
+  <!-- Storage settings screen title -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- [CHAR LIMIT=100] Main settings screen item's summary for the SD card and storage settings -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- Do not translate. About phone, status item title -->
+  <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The phone MIN number of the current device.-->
+  <!-- About phone, status item title.  The phone MSID number of the current device.-->
+  <!-- About phone, status item title.  The phone PRL Version of the current device.-->
+  <!-- About phone, status item title.  The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title.  The ICCID of the current LTE device. [CHAR LIMIT=30] -->
+  <!-- About phone, status item title for the type of data phone network we're connected to, for example 3G or Edge or GPRS -->
+  <!-- About phone, status item title for the latest area info cell broadcast received (Brazil only). -->
+  <!-- About phone, status item title. The status of data access.  For example, the value may be "Connected" -->
+  <!-- About phone, status item title. The status of whether we have service.  for example, the value may be "In service" -->
+  <!-- About phone, status item title. The  current cell tower signal strength -->
+  <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
+  <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
+  <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
+  <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
+  <!-- About phone, status item value if the actual value is not available. -->
+  <!-- About phone, status item title.  How long the device has been running since its last reboot. -->
+  <!-- About phone, status item title.  How much time the device has had its main CPU awake. -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
+  <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
+  <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
+  <!-- SD card & phone storage settings summary. Displayed when the total memory usage is being calculated. Will be replaced with a number like "12.3 GB" when finished calucating. [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of applications installed. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of media on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of /sdcard/Download on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of all pictures, videos in /sdcard/DCIM, /sdcard/Pictures folders on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of audio files in /sdcard on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- SD card & phone storage settings title. Displayed as a title when showing the total usage of misc files on the device. Below it will be a number like "123.4 MB" indicating used storage. [CHAR LIMIT=50] -->
+  <!-- Storage item representing all cached data on device. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.  This will be done before the user phyiscally removes the SD card from the phone.  Kind of like the "Safely remove" on some operating systems.   -->
+  <!-- SD card & phone storage settings item title for toggling PTP mode on and off.  When PTP mode is on the device will appear on the USB bus as a PTP camera device instead of an MTP music player.   -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted.  This version of the string can probably never come up on current hardware. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item summary that is displayed when no SD card is inserted -->
+  <!-- Storage setting item that will mount USB storage if it unmounted. A user should never see this. [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone mounting the SD card. -->
+  <!-- Subtext for Mount USB storage in Storage settings. User should never see this since we use automount. -->
+  <!-- Subtext for Mount SD Card in Storage settings. User should never see this since we use automount. -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the USB storage.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone formatting the SD card.   [CHAR LIMIT=25] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card & phone storage settings item title that will result in the phone unmounting the SD card.   [CHAR LIMIT=80] -->
+  <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->
+  <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
+  <!-- SD card & phone storage settings item summary that will result in the phone connected to PC and MTP/PTP enabled.   [CHAR LIMIT=80] -->
+  <!-- SD card eject confirmation dialog title   [CHAR LIMIT=25] -->
+  <!-- SD card eject confirmation dialog title   -->
+  <!-- SD card eject confirmation dialog  [CHAR LIMIT=NONE] -->
+  <!-- SD card eject confirmation dialog  -->
+  <!-- SD card eject error dialog title   [CHAR LIMIT=30] -->
+  <!-- SD card eject error dialog title   -->
+  <!-- SD card eject error dialog text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject error dialog text   -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card unmount informative text   [CHAR LIMIT=NONE] -->
+  <!-- SD card eject progress title   -->
+  <!-- SD card eject progress text   -->
+  <!-- Settings item title when storage is running low [CHAR LIMIT=32] -->
+  <!-- Settings item summary when storage is running low [CHAR LIMIT=NONE] -->
+  <!-- Storage setting.  Menu option for renaming a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for mounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for unmounting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for erasing and formatting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for migrating data to a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for forgetting a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for setting up a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Menu option for exploring a storage device [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
+  <!-- Storage setting.  USB connection category [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Title for MTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for PTP checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for PTP checkbox [CHAR LIMIT=NONE]-->
+  <!-- Storage setting.  Title for MIDI checkbox [CHAR LIMIT=30]-->
+  <!-- Storage setting.  Summary for MIDI checkbox [CHAR LIMIT=NONE]-->
+  <!-- Section header above list of other users storage [CHAR LIMIT=32] -->
+  <!-- Section header above list of internal storage devices [CHAR LIMIT=30]-->
+  <!-- Section header above list of external storage devices [CHAR LIMIT=30]-->
+  <!-- Summary of a single storage volume, constrasting available and total storage space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->
+  <!-- Toast informing that storage mount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage unmount operation failed. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation was successful. [CHAR LIMIT=64]-->
+  <!-- Toast informing that storage format operation failed. [CHAR LIMIT=64]-->
+  <!-- Title of dialog prompting user to rename a storage volume [CHAR LIMIT=32]-->
+  <!-- Dialog body informing user about an unmounted storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unmountable storage device. [CHAR LIMIT=NONE]-->
+  <!-- Dialog body informing user about an unsupported storage device. [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of formatting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of ejecting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about consequences of forgetting an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
+  <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
+  <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by cached data [CHAR LIMIT=48]-->
+  <!-- Item title describing storage used by other data [CHAR LIMIT=48]-->
+  <!-- Item title that will launch a file explorer [CHAR LIMIT=48]-->
+  <!-- Body of dialog informing user about other files on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Body of dialog informing user about other users on a storage device [CHAR LIMIT=NONE]-->
+  <!-- Title of wizard step prompting user to setup a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard choice to use storage device as external storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as external storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to use storage device as internal storage [CHAR LIMIT=64] -->
+  <!-- Summary of wizard choice to use storage device as internal storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to format a storage device [CHAR LIMIT=NONE] -->
+  <!-- Next button text of wizard step prompting user to format a storage device [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing formatting progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing formatting progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to migrate data to new storage [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to migrate data to new storage [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard choice to migrate data right now [CHAR LIMIT=64] -->
+  <!-- Title of wizard choice to migrate data at later time [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button prompting user to start data migration [CHAR LIMIT=32] -->
+  <!-- Title of wizard step showing migration progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step providing details about data migration [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step indicating that storage is ready [CHAR LIMIT=32] -->
+  <!-- Body of wizard step indicating that external storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Body of wizard step indicating that internal storage is ready [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step prompting user to move an app [CHAR LIMIT=32] -->
+  <!-- Body of wizard step prompting user to move an app [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard step showing app move progress [CHAR LIMIT=32] -->
+  <!-- Body of wizard step showing app move progress [CHAR LIMIT=NONE] -->
+  <!-- Title of wizard button offering to cancel move [CHAR LIMIT=32] -->
+  <!-- Title of wizard step prompting user to start data migration [CHAR LIMIT=NONE] -->
+  <!-- Phone info screen, section titles: -->
+  <!-- Phone info screen, section titles: -->
+  <!-- APN Settings -->
+  <!-- APN settings screen title -->
+  <!-- Screen title after user selects APNs setting option -->
+  <!-- Edit access point label summary text when no value has been set -->
+  <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <!-- Edit access point labels: The actual access point name-->
+  <!-- Edit access point labels: The addess of the proxy to use for this APN -->
+  <!-- Edit access point labels: The port number of the proxy to use for this APN -->
+  <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
+  <!-- Edit access point labels: The port on the proxy used for MMS-->
+  <!-- Edit access point labels: -->
+  <!-- Edit access point labels: -->
+  <!-- Edit acces  point labels: Authenticaton type-->
+  <!-- Authentication Typs: None -->
+  <!-- Authentication Typs: PAP -->
+  <!-- Authentication Typs: CHAP -->
+  <!-- Authentication Typs: PAP or CHAP -->
+  <!-- Edit access point labels: The type of APN -->
+  <!-- Edit access point labels: The protocol of the APN, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit access point labels: The protocol of the APN when roaming, e.g., "IPv4", "IPv6", or "IPv4/IPv6". -->
+  <!-- Edit enable/disable of APN -->
+  <!-- Edit Beaerer Info of APN -->
+  <!-- Edit Mvno Type Info of APN -->
+  <!-- Edit Mvno Match Data Info of APN -->
+  <!-- Edit access point screen menu option to delete this APN -->
+  <!-- APNs screen menu option to create a brand spanking new APN -->
+  <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <!-- Edit access point screen menu option to discard the user's changes for this APN -->
+  <!-- APN error dialog title -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- APN error dialog messages: -->
+  <!-- The message of dialog indicated restoring default APN settings in progress -->
+  <!-- APNs screen menu option to reset default APN settings -->
+  <!-- APNs screen toast message to inform reset default APN settings is completed -->
+  <!-- Reset Network -->
+  <!-- SD card & phone storage settings screen, setting option name under Backup & Restore heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset network settings [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset network settings -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset settings button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset settings button -->
+  <!-- Reset settings confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to reset network settings [CHAR LIMIT=none] -->
+  <!-- Reset settings complete toast text [CHAR LIMIT=75] -->
+  <!-- Master Clear -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions and list of current accounts.  The list of accounts follows this text[CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, notification if other users are present on the device [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, list of items in user data storage (USB storage or SD card) that will be erased during this operation [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, instructions about whether to also erase the external storage (SD card) when erasing the internal storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase USB storage [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, label for check box to erase SD card [CHAR LIMIT=30] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, description for check box to erase USB storage [CHAR LIMIT=NONE] -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Factory data reset -->
+  <!-- SD card & phone storage settings screen, message on screen after user selects Reset phone button -->
+  <!-- SD card & phone storage settings screen, button on screen after user selects Reset phone button -->
+  <!-- Master clear failed message -->
+  <!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
+  <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+  <!-- Master clear progress screen title [CHAR LIMIT=30] -->
+  <!-- Master clear progress screen text [CHAR LIMIT=75] -->
+  <!-- Main settings screen, Call settings title for item to go into the call settings -->
+  <!-- Main settings screen, Call settings summary for item to go into call settings -->
+  <!-- TODO: Remove them once the same entries in SettingsLib is translated. -->
+  <!-- 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]-->
+  <!-- USB Tethering options -->
+  <!-- USB available subtext - shown when USB is connected but not currently being tethered -->
+  <!-- USB tethered subtext - shown when USB is connected and being tethered -->
+  <!-- USB storage subtext - shown when tethering is disabled because USB storage is active -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB unavailable subtext - shown when USB is not connected -->
+  <!-- USB errored subtext - shown when USB is broken for some reason -->
+  <!-- Bluetooth Tethering settings-->
+  <!-- Label for bluetooth tether checkbox [CHAR LIMIT=25]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth available subtext - shown when Bluetooth tethering is turned on but it is not currently tethered to any devices [CHAR LIMIT=50]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when a device is tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth connected subtext - shown when multiple devices are tethered over Bluetooth [CHAR LIMIT=60]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=50]-->
+  <!-- Bluetooth errored subtext - shown when Bluetooth is broken for some reason [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
+  <!-- Bluetooth Tethering settings.  Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
+  <!-- Tethering help button - calls up a web view with general tethering info -->
+  <!-- Wireless controls, item title to go into the network settings -->
+  <!-- Mobile plan [CHAR LIMIT=35]-->
+  <!-- SMS Application [CHAR LIMIT=35]-->
+  <!-- Wifi Assistant change wi-fi assistant title.  [CHAR LIMIT=40] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant instead of the current Wifi Assistant app. [CHAR LIMIT=100] -->
+  <!-- Wifi Assistant request message.  This message asks the user if it is okay for an app to become the Wifi Assistant. [CHAR LIMIT=100] -->
+  <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
+  <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
+  <!-- Ask user to insert a SIM card [CHAR_ LIMIT=50]-->
+  <!-- Ask user to connect to the internet [CHAR_ LIMIT=50]-->
+  <!-- Security & location settings screen, section header for settings relating to location -->
+  <!-- Title for managed profile preference category [CHAR_LIMIT=25] -->
+  <!-- [CHAR LIMIT=30] Title for managed profile location switch  -->
+  <!-- [CHAR LIMIT=30] Text to show on managed profile location switch if MDM has locked down location access for managed profile-->
+  <!-- [CHAR LIMIT=30] Location settings screen, setting preference screen box label for location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, high accuracy location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, battery saving location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, device only location mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, location off mode -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for recent location requests -->
+  <!-- Location settings screen, displayed when there's no recent app accessing location -->
+  <!-- [CHAR LIMIT=30] Location settings screen, sub category for location services -->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests high battery use-->
+  <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->
+  <!-- [CHAR LIMIT=30] Location mode screen, screen title -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for high accuracy mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for battery saving mode -->
+  <!-- [CHAR LIMIT=130] Location mode screen, description for sensors only mode -->
+  <!-- Help menu label [CHAR LIMIT=20] Location settings screen, overflow menu that takes the user
+      to scanning settings activity -->
+  <!-- [CHAR LIMIT=30] Wireless background scanning settings screen, screen title -->
+  <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->
+  <!-- Preference description text for Wi-Fi always scanning -->
+  <!-- [CHAR LIMIT=130] Description text for Bluetooth always scanning -->
+  <!-- Description text for Bluetooth always scanning -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for Google location service (cell ID, wifi, etc.) -->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary for Google location service check box-->
+  <!-- [CHAR LIMIT=130] Security & location settings screen, setting summary when Use wireless networks check box is selected, for wifi-only devices -->
+  <!-- [CHAR LIMIT=30] Security & location settings screen, setting check box label for GPS satellites -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a tablet -->
+  <!-- [CHAR LIMIT=100] Security & location settings screen, setting check box summary for GPS satellites on a phone -->
+  <!-- Security & location settings screen, setting check box label if Assisted GPS should be enabled -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is selected -->
+  <!-- Security & location settings screen, setting summary when Assisted GPS check box is clear -->
+  <!-- [CHAR_LIMIT=30] Security & location settings screen, setting check box label for Google search -->
+  <!-- [CHAR_LIMIT=100] Security & location settings screen, setting check box summary for Google search -->
+  <!-- [CHAR LIMIT=45] Label for turning on/off location access completely. -->
+  <!-- [CHAR LIMIT=none] Description text for location access switch -->
+  <!-- [CHAR LIMIT=45] Section heading for location sources -->
+  <!-- About -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting title for the user to go into the About phone screen -->
+  <!-- Main settings screen, setting summary for the user to go into the About phone screen-->
+  <!-- About phone settings screen, setting option name to go to dialog that shows legal info -->
+  <!-- About phone settings screen, setting option name to see a list of contributors -->
+  <!-- About phone settings screen, setting option name to show Manual [CHAR LIMIT=25] -->
+  <!-- About phone settings screen, setting option name to show regulatory information [CHAR LIMIT=25] -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see copyright-related info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see terms and conditions -->
+  <!-- Note: this may be replaced by a more-specific title of the activity that will get launched -->
+  <!-- About phone settings screen, setting option name to see licensing info for WebView component. [CHAR LIMIT=35] -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions -->
+  <!-- About phone settings screen, setting option name to see wallpapers attributions values -->
+  <!-- Phone Manual -->
+  <!-- About phone settings screen, Manual dialog message when manual cannot be loaded -->
+  <!-- Title for actual Settings license activity. -->
+  <!-- About phone settings, Legal information setting option name and title of dialog box holding license info -->
+  <!-- About phone settings screen, Open source license dialog message when licenses cannot be loaded -->
+  <!-- About phone settings screen, Open source license dialog title until license is fully loaded -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings, Safety Legal information setting option name and title of dialog box holding safety legal info -->
+  <!-- About phone settings screen, Safety legal dialog message when data network is not connected -->
+  <!-- About phone settings screen, Safety Legal dialog title until the link is fully loaded -->
+  <!-- Lock Pattern settings -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose pattern flow [CHAR LIMIT=30] -->
+  <!-- Header on first screen of choose password/PIN flow [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on pattern confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen [CHAR LIMIT=30] -->
+  <!-- Header on password confirm screen if second password doesn't match the first. [CHAR LIMIT=30] -->
+  <!-- Header on pin confirm screen if second pin doesn't match the first. [CHAR LIMIT=30]-->
+  <!-- Header shown to ask the user to select an unlock method [CHAR LIMIT=30] -->
+  <!-- Toast shown if setting password was successful -->
+  <!-- Toast shown if setting PIN was successful -->
+  <!-- Toast shown if setting pattern was successful -->
+  <!-- Message to be used to explain the user that he needs to enter his pattern to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his PIN to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Message to be used to explain the user that he needs to enter his password to continue a
+         particular operation. [CHAR LIMIT=70]-->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect PIN [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change security method screen instruction if user
+         enters incorrect password [CHAR LIMIT=30] -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction if user
+         draws incorrect pattern [CHAR LIMIT=30] -->
+  <!-- Lock Pattern settings -->
+  <!-- Security & location settings screen, header -->
+  <!-- Security & location settings screen, setting option name -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction when the user chooses "Change unlock pattern".  We first ask the user toe nter the current pattern, and this is the message seen -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen.  This si when they are supposed to draw a new unlock pattern (for example, if they are changing their unlock patterns)..-->
+  <!-- Security & location settings screen, change unlock pattern screen hint on bottom of screen.  We are telling them to press the menu button to see more options or help. -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen while drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen if user doesn't connect enough dots -->
+  <!-- Security & location settings screen, change unlock pattern screen message on top of screen after drawing pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen instruction on top of screen to confirm pattern -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  When they are ready to draw it once again to confirm it, they press this button. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen.  After they draw a pattern and release their finger, we display the pattern so they remember.  If they are nto satisfied with this pattern, they click this button to redraw the pattern. -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. If they are supposed to enter their current pattern before being able to draw another one, and they screw up, they hit this button to try again -->
+  <!-- Security & location settings screen, change unlock pattern screen button, on bottom of screen. Once they draw a new pattern and confirm it by drawing it again, they press this button to exit -->
+  <!-- Security & location settings screen, unlock screen activity title -->
+  <!-- Security & location settings screen, setting check box title if the unlock pattern MUST be drawn everytime they turn on the screen -->
+  <!-- Security & location settings screen, setting summary for the checkbox "Require pattern" -->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether a visible green line is drawn as the user moves his finger around while drawing the unlock pattern.  If checked, this line is drawn.  If unchecked, there is nothing drawn so the user does not reveal his pattern while he unlocks the phone.-->
+  <!-- Security & location settings screen, setting check box title. This setting controls whether tactile feedback will be produced when the user draws the pattern.-->
+  <!-- Security & location settings screen, setting check box title. This controls whether the device locks immediately when the power button is pressed. [CHAR LIMIT=28]-->
+  <!-- Security & location settings screen, setting optional summary when a trust agent is enabled-->
+  <!-- Security & location settings screen, setting option name when user has never set an unlock pattern -->
+  <!-- Security & location settings screen, setting option name when user has previously set an unlock pattern and wants to change to a new pattern -->
+  <!-- Security & location settings screen, the help instructions (an animation) caption -->
+  <!-- Security & location settings screen, confirm unlock pattern screen hint at the bottom after
+         too many incorrect attempts [CHAR LIMIT=120]-->
+  <!-- Displayed when user launches a widget configuration activity that was uninstalled -->
+  <!-- Applications Settings -->
+  <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
+  <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
+  <!-- Applications settings screen heading. The header for the Application settings screen. -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
+  <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  [CHAR LIMIT=30] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  [CHAR LIMIT=65] -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Unknown sources" checkbox  -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, message text of alert that appears if user selects the "Unknown sources" check box -->
+  <!-- Applications settings screen, setting check box title. If checked, applications show more settings options. -->
+  <!-- Applications settings screen, setting check box summary.  This is the summary for "Advanced settings" checkbox  -->
+  <!-- Manage applications, individual application info screen title. For example, if they click on "Browser" in "Manage applications", the title of the next screen will be this -->
+  <!-- Manage applications, individual application info screen, section heading for stuff relating to an app's storage settings. -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling whether this app is the default for some actions *and* whether the app was given permission by the user to create widgets -->
+  <!-- Manage applications, individual application info screen,  heading for settings related to controlling application screen compatibility -->
+  <!-- Manage applications, individual application info screen, heading for settings related to the app's permissions. for example, it may list all the permissions the app has. -->
+  <!-- Manage applications, Header name used for cache information -->
+  <!-- Manage applications, text label for button -->
+  <!-- Manage applications, label that appears next to the cache size -->
+  <!-- Manage applications, Header name used for other controls -->
+  <!-- Manage applications, text label for button to kill / force stop an application -->
+  <!-- Manage applications, individual application info screen,label under Storage heading.  The total storage space taken up by this app. -->
+  <!-- Manage applications, individual application info screen, label under Storage heading. The amount of space taken up by the application itself (for example, the java compield files and things like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's code on USB storage [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
+  <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
+  <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
+  <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
+  <!-- Manage applications, restore updated system application to factory version -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app is set as a default for some actions. -->
+  <!-- Manage applications, individual application info screen, screen, message text under Launch by default heading. This is present if the app was given user permission to create widgets. -->
+  <!-- Manage applications, individual application screen, text under Launch by default heading if the app is NOT a default for actions -->
+  <!-- Manage applications, individual application screen, button label under Launch by default heading.  This is used to clear any default actions that may be assigned to this app.  -->
+  <!-- Manage applications, individual application info screen, screen, message text under screen compatibility heading -->
+  <!-- Manage applications, individual application screen, checkbox to control asking for compatibility mode.  -->
+  <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
+  <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show background cached processes. -->
+  <!-- [CHAR LIMIT=NONE] Advanced applications screen, preference title.  Choose the emergency application. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Reset all of user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Title of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=NONE] Manage applications screen, menu item.  Body of dialog to confirm resetting user's app preferences. -->
+  <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Confirmation button of dialog to confirm resetting user's app preferences. -->
+  <!-- Manage applications screen, individual app screen, button label when the user wants to manage the space taken up by an app. -->
+  <!-- Text for menu option in ManageApps screen to present various menu options -->
+  <!-- Title of dialog for presenting filter options -->
+  <!-- Text for filter option in ManageApps screen to display all installed
+    applications -->
+  <!-- [CHAR LIMIT=NONE] Text for filter option in ManageApps screen to display disabled apps -->
+  <!-- Text for filter option in ManageApps screen to display third party
+    applications only -->
+  <!-- Text for filter option in ManageApps screen to display list of running
+    packages only. -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. [CHAR LIMIT=30] -->
+  <!-- Text for filter option in ManageApps screen to display list of
+    packages installed on sdcard. -->
+  <!-- [CHAR LIMIT=25] Manage applications, text telling using an application is disabled. -->
+  <!-- [CHAR LIMIT=30] Manage applications, text telling using an application is not installed for the current user. The key part is that it's not installed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no applications to display. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing internal storage use. -->
+  <!-- [CHAR LIMIT=30] Title for internal device storage that is capitalized for placement as a phrase into another sentence -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- [CHAR LIMIT=15] Manage applications, label for chart showing SD card storage use. -->
+  <!-- Manage app screen, shown when the activity is busy recomputing the size of each app -->
+  <!-- Manage applications, individual application screen, confirmation dialog title. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
+  <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
+  <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
+  <!-- Manage applications, factory reset dialog title for system applications. -->
+  <!-- Manage applications, factory reset option dialog text for system applications. -->
+  <!-- Manage applications, title for dialog if clear data fails-->
+  <!-- Manage applications, text for dialog if clear data fails-->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading. This describes the permissions that the application has. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Manage applications, individual application info screen, text that appears under the "Permissions" heading.
+         This describes the permissions that the application has.  It is used when multiple packages are contributing
+         to the permissions and need to be listed here. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put together two items in a list. -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
+  <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
+  <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
+  <!-- String displayed when list is empty -->
+  <!-- Manage applications, version string displayed in app snippet -->
+  <!-- Manage applications, text for Move button -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button to move app to internal storage -->
+  <!-- Manage applications, text for Move button  to move app to sdcard [CHAR LIMIT=25] -->
+  <!-- Manage applications, text for Move button  to move app to sdcard -->
+  <!-- Manage applications, title for dialog when killing persistent apps-->
+  <!-- Manage applications, text for Move button when move is in progress -->
+  <!-- Manage applications, text for move error messages -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when killing persistent apps-->
+  <!-- Manage applications, text for dialog when moving an app -->
+  <!-- Manage applications, text for dialog moving an app -->
+  <!-- Manage applications, application installation location title -->
+  <!-- Manage applications. application installation location summary -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, label for option to disable app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, title for dialog when disabling updated apps -->
+  <!-- [CHAR LIMIT=NONE] Manage applications, text for dialog when disabling update apps -->
+  <!-- [CHAR LIMIT=30] Manage applications, title for dialog when disabling notifications for an app -->
+  <!-- [CHAR LIMIT=200] Manage applications, text for dialog when disabling notifications for an app -->
+  <!-- App Ops Settings -->
+  <!-- [CHAR LIMIT=NONE] App ops settings title, on main settings screen. If clicked, the user is taken to a settings screen for app operations -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that is currently running. -->
+  <!-- [CHAR LIMIT=NONE] Time label for an operation that has never executed. -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no default Apps -->
+  <!-- [CHAR LIMIT=25] Services settings screen, setting option name for the user to go to the screen to view app storage use -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to app storage use -->
+  <!-- Services settings screen, setting option name for the user to go to the screen to view running services -->
+  <!-- Services settings screen, setting option summary for the user to go to the screen to view running services  -->
+  <!-- Label for a service item when it is restarting -->
+  <!-- Label for a process item representing a background process -->
+  <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- Running services, description for a service in the started state -->
+  <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
+  <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
+  <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
+  <!-- Text to label a process entry with the process name. -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <!-- Descriptive text of a running process: singular process, singular service. -->
+  <!-- Descriptive text of a running process: singular process, plural service. -->
+  <!-- Descriptive text of a running process: plural process, singular service. -->
+  <!-- Descriptive text of a running process: plural process, plural service. -->
+  <!-- [CHAR LIMIT=NONE] Top title of the header of the running processes/services list. -->
+  <!-- [CHAR LIMIT=NONE] Bottom test of the header leading in to the running
+         processes/services list. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by system. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         used by apps. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
+         that is free. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
+         used by everything. -->
+  <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing portion
+         of free RAM that is used by cached apps. -->
+  <!-- [CHAR_LIMIT=20] Running processes/services header: formatter for RAM use amount. -->
+  <!-- Details about an application's running services. -->
+  <!-- Message displayed when there are no active services in a process. -->
+  <!-- Title for list of services. -->
+  <!-- Title for list of services. -->
+  <!-- Running service details, stop a service that has started itself. -->
+  <!-- Running service details, manage a service that is running for some other reason. -->
+  <!-- Running service details, default description for services that are started. -->
+  <!-- Running service details, description for running heavy-weight process. -->
+  <!-- Running service details, description for background process. -->
+  <!-- Running service details, default description for services that are managed. -->
+  <!-- Description of the main process in the details. -->
+  <!-- Message that a process's service is in use. -->
+  <!-- Message that a process's provider is in use. -->
+  <!-- Running service details, stop confirmation dialog title. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Running service details, stop confirmation descriptive text. Displays when user selects selects to stop a system service. -->
+  <!-- Language Settings -->
+  <!-- Title of setting on main settings screen.  This item will take the user to the screen to tweak settings realted to locale and text -->
+  <!-- Title of Language and keyboard settings screen -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
+  <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
+  <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
+  <!-- On Text & language settings screen, setting option name.  title of the setting to enable autocapitalization of entered text.  for example, after the user finishes a sentence, the next letter he types will automatically be capitalizated. [CHAR LIMIT=25] -->
+  <!-- On Text & language settings screen, setting summary. Summary for the Auto-cap setting. [CHAR LIMIT=100]-->
+  <!-- On Text & language settings screen, setting option name. title of the setting to enable automatic punctuation of entered text.  for example, it will change an entered "youre" to "you're". -->
+  <!-- On Text & language settings screen, category for physical keyboard text entry options. -->
+  <!-- On Text & language settings screen, setting summary for the Auto-punctuate setting. -->
+  <!-- On Security & location settings screen, setting check box name. Title of the checkbox to set whether password edit fields will show the most recent character typed and then hide it, or just hide it right away.  By hide, I mean mask it out. -->
+  <!-- Warning message about security implications of enabling an input method, displayed as a dialog
+         message when the user selects to enable an IME. -->
+  <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
+         message when the user selects to enable a spell checker. -->
+  <!-- Image button description for spell checker quick settings. -->
+  <!-- Image button description for spell checker language. -->
+  <!-- Toast that settings for an application is failed to open. -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to game controller devices. [CHAR LIMIT=40] -->
+  <!-- On Language & input settings screen, setting title.  Setting to redirect vibration to input devices. [CHAR LIMIT=35] -->
+  <!-- On Language & input settings screen, setting summary.  Setting to redirect vibration to input devices. [CHAR LIMIT=100] -->
+  <!-- Keyboard Layout Preference Dialog -->
+  <!-- Title for the keyboard layout preference dialog. [CHAR LIMIT=35] -->
+  <!-- Button to configure keyboard layouts.  [CHAR LIMIT=35] -->
+  <!-- Hint describing how to switch keyboard layouts using the keyboard.  [CHAR LIMIT=48] -->
+  <!-- Label of the default keyboard layout.  [CHAR LIMIT=35] -->
+  <!-- Keyboard Layout Picker -->
+  <!-- Title for the keyboard layout picker activity. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings -->
+  <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
+  <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
+  <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
+  <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
+  <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
+  <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
+  <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
+  <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
+  <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
+  <!-- Input methods Settings -->
+  <!-- Setting name for Input Method chooser -->
+  <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
+  <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
+  <!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
+  <!-- An option to always show input method selector [CHAR LIMIT=25] -->
+  <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
+  <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
+  <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
+  <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
+  <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
+  <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
+  <!-- Summary for on-screen keyboard settings -->
+  <!-- Title for built-in keyboard settings -->
+  <!-- Summary for built-in keyboard settings -->
+  <!-- Development Settings.  the title for the item to take the user to Development settings.  Development settings are settings meant for application developers.  -->
+  <!-- Development Settings summary.  The summary of the item to take the user to Development settings.  Development settings are settings meant for application developers. -->
+  <!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
+  <!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+  <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+  <!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
+  <!-- Setting title to revoke secure USB debugging authorizations -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+  <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+  <!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
+  <!-- setting Checkbox summary whether to keep the screen on when plugged in  -->
+  <!-- Setting Checkbox title whether to enable bluetooth HCI snoop log -->
+  <!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
+  <!-- setting Checkbox title whether to enable OEM unlock [CHAR_LIMIT=35] -->
+  <!-- setting Checkbox summary whether to enable OEM unlock [CHAR_LIMIT=50] -->
+  <!-- Confirmation dialog title to ensure user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- Warning dialog message to confirm user wishes to enable OEM unlock and disable theft protection features -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select current app to mock location [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no mock location app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: mock location app has been set [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Preference category for networking debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Setting Checkbox title whether to show options for wireless display certification -->
+  <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox title whether to always keep cellular data active. [CHAR LIMIT=80] -->
+  <!-- setting Checkbox summary whether to show options for wireless display certification  -->
+  <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+  <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+  <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+  <!-- UI debug setting: limit size of Android logger buffers -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- UI debug setting: select USB configuration -->
+  <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+  <!-- Setting Checkbox title whether to allow mock locations -->
+  <!-- setting Checkbox summary whether to allow mock locations  -->
+  <!-- Setting Checkbox title whether to enable view attribute inspection -->
+  <!-- Title of warning dialog about the implications of enabling USB debugging -->
+  <!-- Setting Checkbox summary whether to use DHCP client from Lollipop (Android 5.0) [CHAR LIMIT=130] -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Message of dialog confirming that user wants to revoke access to adb from all computers they have authorized -->
+  <!-- Title of warning dialog about the implications of enabling developer settings -->
+  <!-- Warning text to user about the implications of enabling USB debugging -->
+  <!-- Title of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting to perform package verification on apps installed over USB/ADT/ADB [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that protects external storage. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that protects external storage. [CHAR LIMIT=64] -->
+  <!-- Title of dialog confirming that user wants to protect external storage. [CHAR LIMIT=32] -->
+  <!-- Message of dialog confirming that user wants to protect external storage. [CHAR LIMIT=NONE] -->
+  <!-- Title of checkbox setting that enables the terminal app. [CHAR LIMIT=32] -->
+  <!-- Summary of checkbox setting that enables the terminal app. [CHAR LIMIT=64] -->
+  <!-- Title for the screen that lets the user choose a gadget to add to the home screen
+         (or other screens that can host gadgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title for the screen that lets the user choose a widget to add to the home screen
+         (or other screens that can host widgets).  Note to translators: we're still determining
+         the final name for Gadgets/Widgets, so please translate both for now. -->
+  <!-- Title in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Message in dialog that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Text for checkbox that pops up when an app requests permission to bind a widget [CHAR LIMIT=NONE] -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "d days, h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "h hours, m minutes, s seconds" in BatteryHistory -->
+  <!-- Used to show an amount of time in the form "m minutes, s seconds" in BatteryHistory -->
+  <!-- XXX remove? Strings used for displaying usage statistics -->
+  <!-- In the Testing screen. The item title of the activity that shows usage statistics.  -->
+  <!-- label for text to indicate sort options -->
+  <!-- label for application name -->
+  <!-- label for last time used -->
+  <!-- label for usage time -->
+  <!-- Accessibility settings -->
+  <!-- Settings title in main settings screen for accessibility settings -->
+  <!-- Settings title for accessibility settings screen -->
+  <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
+  <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->
+  <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->
+  <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->
+  <!-- Summary for the preference screen to enable the global geture that turns on accessibility (off state). [CHAR LIMIT=35] -->
+  <!--  Description for the preference screen to enable the global geture taht turns on accessibility. [CHAR LIMIT=none] -->
+  <!-- Title for the accessibility preference to enable large text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to high contrast text. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to enable screen magnification. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to auto update screen magnification. [CHAR LIMIT=35] -->
+  <!-- Summary for the accessibility preference to auto update screen magnification. [CHAR LIMIT=50] -->
+  <!-- Title for the accessibility preference to power button to end a call. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to speak passwords. [CHAR LIMIT=35] -->
+  <!-- Title for accessibility preference to choose long-press delay i.e. timeout before it is detected. [CHAR LIMIT=35] -->
+  <!-- Title for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color inversion. [CHAR LIMIT=NONE] -->
+  <!-- Title for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Subtitle for the accessibility preference to configure display color space correction. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to show a tile for a particular feature in the Quick Settings pane. [CHAR LIMIT=NONE] -->
+  <!-- Title for the preference to configure the type of color space correction to apply. [CHAR LIMIT=NONE] -->
+  <!-- Summary shown for color space correction preference when its value is overridden by another preference [CHAR LIMIT=35] -->
+  <!-- Label for disabling color space adjustment [CHAR LIMIT=45] -->
+  <!-- Label for converting display colors to grayscale, which simulates monochromacy (complete color blindness). [CHAR LIMIT=45] -->
+  <!-- Label for deuteranomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
+  <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
+  <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
+  <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
+  <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
+  <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
+  <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption background opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption window opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption text opacity. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge color. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption edge type. [CHAR LIMIT=35] -->
+  <!-- Title for the preference to change video caption font family (ex. monospace, sans-serif). [CHAR LIMIT=35] -->
+  <!-- Sample text for previewing video caption preferences. [CHAR LIMIT=NONE] -->
+  <!-- Sample characters for previewing video caption preferences. [CHAR LIMIT=2] -->
+  <!-- Label for the default device locale. [CHAR LIMIT=35] -->
+  <!-- Label for color selection title in sim settings [CHAR LIMIT=35] -->
+  <!-- Label for default color. This lets the app pick the color. [CHAR LIMIT=35] -->
+  <!-- Label for no color (transparent). [CHAR LIMIT=35] -->
+  <!-- Label for the color white. [CHAR LIMIT=35] -->
+  <!-- Label for the color gray. [CHAR LIMIT=35] -->
+  <!-- Label for the color black. [CHAR LIMIT=35] -->
+  <!-- Label for the color red. [CHAR LIMIT=35] -->
+  <!-- Label for the color green. [CHAR LIMIT=35] -->
+  <!-- Label for the color blue. [CHAR LIMIT=35] -->
+  <!-- Label for the color cyan. [CHAR LIMIT=35] -->
+  <!-- Label for the color yellow. [CHAR LIMIT=35] -->
+  <!-- Label for the color magenta. [CHAR LIMIT=35] -->
+  <!-- Label for custom colors, formats as a HTML color. -->
+  <!-- Title for a warning about security implications of enabling an accessibility
+         service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the list of capabilities of an accessibility service. -->
+  <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+        enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
+  <!-- Warning that the device data will not be encrypted with password or PIN if
+         choosing a secure lock and there is an enabled accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his pattern before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his PIN before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message to the user to enter his password before enabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the capability of an accessibility service to receive events and keys. -->
+  <!-- Description for the capability of an accessibility service to receive events and keys. -->
+  <!-- Title for a warning about disabling an accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Message for a warning about disabling accessibility service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <!-- Printing settings -->
+  <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
+  <!-- Title for print service settings screen [CHAR LIMIT=25] -->
+  <!-- Title for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a print service,
+         displayed as a dialog message when the user selects to enable a print service. [CHAR LIMIT=NONE] -->
+  <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
+  <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
+  <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
+  <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
+  <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
+  <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
+  <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the label of the state for a blocked print job. [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] -->
+  <!-- App Fuel Gauge strings -->
+  <!-- Activity title for App Fuel Gauge summary -->
+  <!-- Activity title summary for App Fuel Gauge summary -->
+  <!-- Message to show when battery usage data is not available [CHAR LIMIT=30] -->
+  <!-- Display the battery level and status [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is discharged [CHAR_LIMIT=60] -->
+  <!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
+  <!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
+  <!-- Battery usage since unplugged -->
+  <!-- Battery usage since user reset the stats -->
+  <!-- Battery usage on battery duration -->
+  <!-- Battery usage duration -->
+  <!-- [CHAR LIMIT=25] Label for battery stats charging state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats screen on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats gps on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats camera on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats flashlight on state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wifi running state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats wake lock state graph -->
+  <!-- [CHAR LIMIT=25] Label for battery stats phone signal strength graph -->
+  <!-- Battery usage during last unplugged period -->
+  <!-- CPU awake time title -->
+  <!-- Wifi on time -->
+  <!-- Bluetooth on time -->
+  <!-- Activity title for battery usage history details -->
+  <!-- Activity title for battery usage details for an app. or power consumer -->
+  <!-- Subtitle for application/subsystem details -->
+  <!-- Subtitle for possible options -->
+  <!-- Subtitle for list of packages -->
+  <!-- Label for power consumed by the screen -->
+  <!-- Label for power consumed by the flashlight -->
+  <!-- Label for power consumed by the camera -->
+  <!-- Label for power consumed by Wi-Fi -->
+  <!-- Label for power consumed by Bluetooth -->
+  <!-- Label for power consumed by Cell idle -->
+  <!-- Label for power consumed by Calling -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power consumed when Idle -->
+  <!-- Label for power that we aren't able to account for -->
+  <!-- Label for power that we computed too much for -->
+  <!-- Label for CPU usage time -->
+  <!-- Label for CPU usage in foreground -->
+  <!-- [CHAR LIMIT=25] Label for keeping device from sleeping -->
+  <!-- Label for GPS usage time -->
+  <!-- [CHAR LIMIT=25] Label for WIFI usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for Phone usage time -->
+  <!-- Label for mobile network data sent [CHAR LIMIT=32] -->
+  <!-- Label for mobile network data received [CHAR LIMIT=32] -->
+  <!-- Label for mobile network radio active time [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data sent [CHAR LIMIT=32] -->
+  <!-- Label for Wi-Fi network data received [CHAR LIMIT=32] -->
+  <!-- Label for Audio usage time -->
+  <!-- Label for Video usage time -->
+  <!-- Label for Camera usage time -->
+  <!-- Label for Flashlight usage time -->
+  <!-- Label for time that a feature has been on -->
+  <!-- Label for time that there was no cell coverage -->
+  <!-- Label for the total power capacity of the device's battery -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was computed -->
+  <!-- [CHAR_LIMIT=NONE] Label for amount of power use that was actually observed (though
+         the change in battery level) -->
+  <!-- Label for force stop action -->
+  <!-- Label for app details action -->
+  <!-- Label for app settings action -->
+  <!-- Label for display settings -->
+  <!-- Label for wifi settings -->
+  <!-- Label for bluetooth settings -->
+  <!-- Description for voice call detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for standby detail -->
+  <!-- Description for cell radio detail -->
+  <!-- Suggestion to switch to airplane mode to save power -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the flashlight -->
+  <!-- [CHAR_LIMIT=NONE] Description for power consumed by the camera -->
+  <!-- Description for power consumed by display -->
+  <!-- Suggestion for reducing display power -->
+  <!-- Description for wifi connectivity -->
+  <!-- Suggestion for wifi connectivity power drain -->
+  <!-- Description for bluetooth power consumption detail -->
+  <!-- Suggestion for bluetooth -->
+  <!-- Suggestion for bluetooth headset -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by applications -->
+  <!-- Suggestion for exploring application info to stop or uninstall -->
+  <!-- [CHAR LIMIT=100] Suggestion for getting apps to consume less power due to GPS-->
+  <!-- Suggestion for getting apps to consume less power -->
+  <!-- [CHAR LIMIT=50] Description for power consumed by users -->
+  <!-- [CHAR LIMIT=50] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=NONE] Description for unaccounted power use -->
+  <!-- [CHAR LIMIT=50] Description for over-counted power use -->
+  <!-- Representation of a mAh value. [CHAR LIMIT=NONE] -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage since unplugged -->
+  <!-- Menu label for viewing battery usage total -->
+  <!-- Menu label for refreshing with latest usage numbers -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Label for mediaserver process in battery usage -->
+  <!-- Label for dex2oat process in battery usage used for the optimization of one or more apps -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
+  <!-- Process Stats strings -->
+  <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Activity title summary for Process Stats summary -->
+  <!-- [CHAR LIMIT=NONE] Label for amount of memory use -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, duration of time the stats are over;
+         timeDuration is a duration such as "1h 30m" -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label for process stats, text for stats type -->
+  <!-- [CHAR LIMIT=NONE] Label OS "process" app -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all native processes -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all kernel memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for all zram memory -->
+  <!-- [CHAR LIMIT=NONE] Name of OS "process" for base memory needed for caches -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing details of average RAM use -->
+  <!-- [CHAR LIMIT=NONE] Label for item showing percent of time spent running -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats processes list -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats services list -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+  <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+  <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+  <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
+  <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
+         as percentages-->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether computation should be based
+        on Uss (Unique Set Size) instead of Pss (Proportional Set Size) -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to select which type of stats to show -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on background processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on foreground processes -->
+  <!-- [CHAR LIMIT=NONE] Menu for process stats to show information on cached processes -->
+  <!-- Voice input/output settings -->
+  <!-- Title of setting on main settings screen. This item will take the user to the screen to tweak settings related to speech functionality -->
+  <!-- Main voice input/output settings screen title -->
+  <!-- Title of voice search settings list item within voice input/output settings -->
+  <!-- Title of keyboard settings list item within voice input/output settings -->
+  <!-- Title for the 'voice input' category of voice input/output settings -->
+  <!-- Voice input settings -->
+  <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
+  <!-- [CHAR_LIMIT=NONE] Title of the screen of the voice input settings -->
+  <!-- [CHAR LIMIT=50] The text for the settings section in which users select
+         a voice interaction or recognition service to use. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a full voice interaction service.  This is something that provides interactive
+         voice control of applications; for example you can tell it commands to have it
+         launch and let you interact with applications through your voice. -->
+  <!-- [CHAR LIMIT=NONE] The summary text for the voice service preference that is
+         a simple voice recognition service.  This is something that only provides simple
+         speech to text conversions that applications can use when they want to allow you
+         to provide text to them through your voice (instead of with a keyboard). -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of enabling a
+         voice interaction service, displayed as a dialog
+         message when the user selects to enable a service. -->
+  <!-- Text-To-Speech (TTS) settings -->
+  <!-- Name of the TTS package as listed by the package manager. -->
+  <!-- TTS option item name in the main settings screen -->
+  <!-- On main TTS Settings screen, title for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, summary for toggle used to force use of default TTS settings -->
+  <!-- On main TTS Settings screen, section header for default TTS settings -->
+  <!-- On main TTS Settings screen, in default settings section, setting default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default synthesis engine for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default speech rate for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
+  <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
+  <!-- On main TTS Settings screen, triggers playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, summary for triggering playback of an example of speech synthesis -->
+  <!-- On main TTS Settings screen, click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for click to install required speech synthesis data -->
+  <!-- On main TTS Settings screen, summary for when required speech synthesis data alrady installed on SD card -->
+  <!-- Text spoken by the TTS engine when TTS settings (other than language) have been changed -->
+  <!-- Error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Button text for error screen when a selected TTS engine can't run because it's missing components -->
+  <!-- Warning message about security implications of enabling a TTS engine, displayed as a dialog
+         message when the user selects to enable an engine. -->
+  <!-- Warning message about required internet conectivity for TTS synthesis, displayed as a dialog
+         message when the user selects to play an example for network only locale and there's no internet connectivity. -->
+  <!-- Text spoken by the TTS engine as an example if the engine doesn't provide sample text [CHAR LIMIT=100] -->
+  <!-- On main TTS Settings screen, title of a field explaining current TTS engine status for
+         current default language [CHAR LIMIT=50] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is fully supported by the engine [CHAR LIMIT=150]-->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is supported by the engine only if there's a working network connection [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         selected language is not supported by the engine [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, current TTS engine status for the current default language,
+         tts engine is queried for status [CHAR LIMIT=150] -->
+  <!-- On main TTS Settings screen, text for divider under which all TTS engines are listed -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name, clicking this button will launch the engine settings -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine can be used by the user -->
+  <!-- On main TTS Settings screen, text preceded by the TTS engine name to indicate the engine cannot be used by the user -->
+  <!-- On the main TTS settings screen, text for a divider under which
+         the engine specific settings and the "engine install data" option
+         are listed [CHAR LIMIT=30]-->
+  <!-- Title for a preference in the main TTS settings screen, which
+         launches the settings screen for a given TTS engine when clicked
+         [CHAR LIMIT=30]-->
+  <!-- On Pico TTS Settings screen, text to mark the section for the various languages and voices that are available -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as installed -->
+  <!-- On Pico TTS Settings screen, text to mark a voice as not installed -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is female -->
+  <!-- On Pico TTS Settings screen, summary text to indicate that a voice is male -->
+  <!-- [CHAR LIMIT=33] Notification title that appears when the installation of a new TTS engine completed -->
+  <!-- [CHAR LIMIT=30] Notification message that appears after the user has installed a new TTS engine,
+         to warn the user that this engine cannot be used before the checkbox for that engine
+         in TTS settings is checked. -->
+  <!-- [CHAR LIMIT=150] Text for screen readers / accessibility programs for
+         the image that launches the TTS engine settings when clicked. -->
+  <!-- [CHAR LIMIT=50] The text for the settings section that users to set a
+         preferred text to speech engine -->
+  <!-- [CHAR LIMIT=50] Title of the settings section that displays general preferences
+         that are applicable to all engines, such as the speech rate -->
+  <!-- Power Control Widget -->
+  <!-- Template for gadget toggle button description. Populated examples are "Wi-Fi off" or "Wi-Fi turning on". -->
+  <!-- Gadget value used to describe on state. -->
+  <!-- Gadget value used to describe off state. -->
+  <!-- Gadget value used to describe turning on state. -->
+  <!-- Gadget value used to describe turning off state. -->
+  <!-- Spoken description for the Wi-Fi power control gadget. -->
+  <!-- Spoken description for the Bluetooth power control gadget. -->
+  <!-- Spoken description for the Location power control gadget. -->
+  <!-- Spoken description for the data synchronization gadget. -->
+  <!-- Template for brightness gadget toggle button description. -->
+  <!-- Brightness gadget value used to describe automatic brightness state. -->
+  <!-- Brightness gadget value used to describe maximum brightness state. -->
+  <!-- Brightness gadget value used to describe half brightness state. -->
+  <!-- Brightness gadget value used to describe minimum brightness state. -->
+  <!-- Title of preference to enter the VPN settings activity -->
+  <!-- Title of preference group for credential storage settings [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Title of preference to install certificates from SD card [CHAR LIMIT=30] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Summary of preference to install certificates from SD card [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to reset credential storage [CHAR LIMIT=30] -->
+  <!-- Summary of preference to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=30] -->
+  <!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
+  <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+  <!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
+  <!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
+  <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+  <!-- Title of dialog to enable credential storage [CHAR LIMIT=30] -->
+  <!-- Description of dialog to enable credential storage [CHAR LIMIT=NONE] -->
+  <!-- Description of the input box for the old password [CHAR LIMIT=30] -->
+  <!-- Description of dialog to reset credential storage [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Error message [CHAR LIMIT=NONE] -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Toast message [CHAR LIMIT=30] when credential storage containing private keys and certificates could not be erased (opposite of string credentials_erased) -->
+  <!-- Toast message [CHAR LIMIT=30] -->
+  <!-- Description of dialog to explain that a lock screen password is required to use credential storage [CHAR LIMIT=NONE] -->
+  <!-- Title of Usage Access preference item [CHAR LIMIT=30] -->
+  <!-- Sound settings screen, setting check box label -->
+  <!-- Sound settings screen, setting option summary text -->
+  <!-- Backup and reset Settings screen -->
+  <!-- Backup and reset settings menu title -->
+  <!-- Privacy settings activity title -->
+  <!-- Backup section title -->
+  <!-- Personal data section title -->
+  <!-- Backup data menu title -->
+  <!-- Summary text of the "back up data" setting -->
+  <!-- Configure backup account options menu title [CHAR LIMIT=25]-->
+  <!-- Auto-restore menu title [CHAR LIMIT=30] -->
+  <!-- Auto-restore menu title -->
+  <!-- Summary text of the "automatic restore" setting -->
+  <!-- Title of the preference informing the user about the backup service being inactive [CHAR LIMIT=50]-->
+  <!-- Default summary text of the "Configure backup account" setting [CHAR LIMIT=80]-->
+  <!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
+  <!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
+  <!-- Summary text of the "local backup password" setting when the user has already supplied a password -->
+  <!-- Toast message shown when the user successfully sets a new local backup password [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not correctly typing the password again for confirmation [CHAR LIMIT=80] -->
+  <!-- Toast message shown when setting a new local backup password fails due to the user not supplying the correct existing password. The phrasing here is deliberately quite general. [CHAR LIMIT=80] -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase backup data from server -->
+  <!-- Dialog title for confirmation to erase full backup data from server -->
+  <!-- Summary for explanation of what full app data backup means. Manufacturers may wish to overlay this resource with their own text  -->
+  <!-- Device admin settings screen -->
+  <!-- Device admin settings activity title -->
+  <!-- Label for screen showing the active device policy -->
+  <!-- Label for button to remove the active device admin -->
+  <!-- Label for screen showing to select device policy -->
+  <!-- Message when there are no available device admins to display -->
+  <!-- Message displayed when the device admin can only be disabled by deleting the work profile [CHAR_LIMIT=120] -->
+  <!-- Title for personal device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Title for managed device admins on the list [CHAR_LIMIT=25] -->
+  <!-- Message when there are no available trust agents to display -->
+  <!-- Label for screen showing to add device policy -->
+  <!-- Label for button to set the active device admin -->
+  <!-- Device admin add activity title -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Device admin warning message about policies an admin can use -->
+  <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
+  <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
+  <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
+         [CHAR LIMIT=40] -->
+  <!-- Wifi Setup For Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen -->
+  <!-- Title shown in Wifi Setup Wizard with XL screen when
+         a user is configuring password for a network.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device is connecting a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         the device successfully connected to a network the user specified.
+         The argument should be the name of the network.
+         [CHAR LIMIT=50] -->
+  <!-- Title shown in Wifi Setup For Setup Wizard with XL screen when
+         a user is adding a network.
+         [CHAR LIMIT=50] -->
+  <!-- Text message shown when Wifi is not connected.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button adding manual setting.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button refreshing a list of network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Button message shown on the button enabling users skip Wifi Setup.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button message shown on the button enabling users go the next step.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=10] -->
+  <!-- Button label to go back to previous screen. Used in SetupWizard for
+      XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to show detailed dialog for a selected Wi-Fi settings.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
+  <!-- Button label to connect to a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to delete a Wi-Fi network.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to save a Wi-Fi network configuration.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- Button label to dismiss the dialog.
+         Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <!-- The message shown above available networks when the device is scanning
+         available networks [CHAR LIMIT=35] -->
+  <!-- Message shown above available network when there's no connected network.
+         Used in Wifi Setup For Setup Wizard with XL screen. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is showing one possible existing network.
+         Used in Wifi Setup. -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the network doesn't require configuration (e.g. password)
+         Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown above available networks when a user clicked one of available
+         networks and the UI is prompting the user to edit the network configuration
+         if needed. Used in Wifi Setup with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked "Add network"
+         button. Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked one of available
+         networks or created another profile and he/she is waiting for the connection
+         is established.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when connection is established,
+         letting a user to proceed to the next step of the SetupWizard.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- The message shown above available networks when a user clicked a network secured by
+         EAP. We don't allow the user to connect it.
+         Used in Wifi Setup For Setup Wizard with XL screen. [CHAR LIMIT=35] -->
+  <!-- Message shown when users select EAP in Wi-Fi settings for SetupWizard,
+         saying EAP can't be configured in SetupWizard flow.
+         [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connecting a network [CHAR LIMIT=NONE] -->
+  <!-- Message shown when the device is connected to a network [CHAR LIMIT=NONE] -->
+  <!-- Do not translate. This is a stub which will be removed soon. -->
+  <!-- Content description of the enabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Image description for the sync failed icon. -->
+  <!-- Animation description for the sync active icon. -->
+  <!-- Account specific sync settings title [CHAR LIMIT=35] -->
+  <!-- Message when sync is currently failing [CHAR LIMIT=100] -->
+  <!-- Button label to add an account [CHAR LIMIT=20] -->
+  <!-- Label for the state of the work profile [CHAR LIMIT=80] -->
+  <!-- Button label to remove the work profile [CHAR LIMIT=35] -->
+  <!-- Data synchronization settings screen, title of setting that controls whether background data should be used [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, summary of setting that controls whether background data should be used [CHAR LIMIT=60] -->
+  <!-- Data synchronization settings screen, title of dialog that confirms the user's unchecking of background data [CHAR LIMIT=20] -->
+  <!-- Data synchronization settings screen, message of dialog that confirms the user's unchecking of background data [CHAR LIMIT=200] -->
+  <!-- Title for a checkbox that enables data synchronization in the account and sync screen [CHAR LIMIT=35] -->
+  <!-- Sync status messages on Accounts & Synchronization settings -->
+  <!-- Sync status shown when sync is enabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=25] -->
+  <!-- Sync status shown when last sync resulted in an error [CHAR LIMIT=25] -->
+  <!-- Last synced date/time for accounts that synced [CHAR LIMIT=none] -->
+  <!-- Sync status shown when sync is disabled [CHAR LIMIT=30] -->
+  <!-- Data synchronization settings screen, setting option name -->
+  <!-- Data synchronization settings screen, setting option summary text when check box is selected -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, menu option -->
+  <!-- Data synchronization settings screen, summary of a sync provider (for example, Gmail) when autosync is off and the user wants to do a one-time sync. -->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
+  <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
+  <!-- Data synchronization settings screen, checkbox setting option name -->
+  <!-- Message introducing the user to Google Sync. -->
+  <!-- Header title for those settings relating to application syncing. -->
+  <!-- Header for data and synchronization -->
+  <!-- Preference item that lets the user change password -->
+  <!-- Header that appears at the top of Account Settings screen -->
+  <!-- Button label to remove current account -->
+  <!-- Title shown in AddAccount -->
+  <!-- Button shown when this activity is run from SetupWizard -->
+  <!-- Title of remove message for remove account dialog -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- Remove account message in dialog [CHAR LIMIT=NONE] -->
+  <!-- This is shown if the autheticator for a given account fails to remove it. [CHAR LIMIT=NONE] -->
+  <!-- What to show in messaging that refers to this provider, e.g. AccountSyncSettings -->
+  <!-- Formatter in AccountSyncSettings for each application we wish to synchronize, e.g. "Sync Calendar" -->
+  <!-- Title of dialog shown when you can't manually sync an item because it's disabled -->
+  <!-- Messaage shown in dialog when you can't manually sync -->
+  <!-- This is displayed to the user when the device needs to be decrypted -->
+  <!-- Informational text on the pin entry screen prompting the user for their pin -->
+  <!-- Informational text on the pattern entry screen prompting the user for their pattern -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Shown when a password has been entered, and we're checking it -->
+  <!-- Shown when password is correct, and we're starting Android -->
+  <!-- the following are for Settings Storage screen -->
+  <!-- Menu item/button 'delete' -->
+  <!-- Misc files [CHAR LIMIT=25] -->
+  <!-- number of misc files selected [CHAR LIMIT=40] -->
+  <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
+  <!--  action to select all [CHAR LIMIT=30] -->
+  <!-- HDCP checking title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- HDCP checking dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
+  <!-- Preference category for app debugging development settings. [CHAR LIMIT=50] -->
+  <!-- UI debug setting: select current app to debug [CHAR LIMIT=50] -->
+  <!-- UI debug setting: no debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: debug app has been set [CHAR LIMIT=50] -->
+  <!-- UI debug setting: title for app picker dialog [CHAR LIMIT=50] -->
+  <!-- UI debug setting: label for app picker to select no applicatiojn [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process? [CHAR LIMIT=50] -->
+  <!-- UI debug setting: wait for debugger to attach to debugging process summary [CHAR LIMIT=500] -->
+  <!-- Preference category for input debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for drawing debugging development settings. [CHAR LIMIT=25] -->
+  <!-- Preference category for hardware accelerated drawing debugging development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for media development settings. [CHAR LIMIT=50] -->
+  <!-- Preference category for monitoring debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: always enable strict mode? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show strict mode summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show pointer location? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show pointer location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show touches? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show touches location summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where surface updates happen? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show surface updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show where window updates happen with GPU rendering? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show the amount of overdraw in apps using the GPU [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: simulate color space anomalies. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable various types of OpenGL traces [CHAR LIMIT=25] -->
+  <!-- UI debug setting: disable USB audio routing title [CHAR LIMIT=32] -->
+  <!-- UI debug setting: disable USB audio routing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show layout bounds information [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show layout bounds information summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force right to left layout [CHAR LIMIT=37] -->
+  <!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
+  <!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force hardware acceleration summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: force anti-aliasing to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: force anti-aliasing summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: show when non-rectangular clip operations are used [CHAR LIMIT=100] -->
+  <!-- UI debug setting: profile time taken by hardware acceleration to render apps [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for window animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for transition animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: scaling factor for all Animator-based animations [CHAR LIMIT=25] -->
+  <!-- UI debug setting: simulate secondary display devices using overlays [CHAR LIMIT=25] -->
+  <!-- UI debug setting: enable/disable debug multi-window ui [CHAR LIMIT=25] -->
+  <!-- setting Checkbox summary whether to enable debug multi-window ui [CHAR_LIMIT=50] -->
+  <!-- Warning dialog message to confirm user wishes to enable experimental multi-window mode feature -->
+  <!-- Preference category for application debugging development settings. [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: immediately destroy activities summary [CHAR LIMIT=50] -->
+  <!-- UI debug setting: limit number of running background processes [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs? [CHAR LIMIT=25] -->
+  <!-- UI debug setting: show all ANRs summary [CHAR LIMIT=50] -->
+  <!-- Activity title for network data usage summary. [CHAR LIMIT=25] -->
+  <!-- Activity title for Appk data usage summary. [CHAR LIMIT=25] -->
+  <!-- Message about carrier data accounting.  [CHAR LIMIT=100] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for app usage. [CHAR LIMIT=40] -->
+  <!-- Title for cellular data usage. [CHAR LIMIT=40] -->
+  <!-- Title for setting data limit. [CHAR LIMIT=40] -->
+  <!-- Title for option to pick visible time range from a list available usage periods. [CHAR LIMIT=25] -->
+  <!-- Title for application data usage separator in data usage list. [CHAR LIMIT=25] -->
+  <!-- Title for menu option to enable mobile data when roaming. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to restrict background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to allow background data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show 4G mobile data usage separate from other mobile data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Wi-Fi data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to hide Ethernet data usage. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to configure metered networks. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to enable global auto-sync of account data -->
+  <!-- Title for menu option to show details for all SIM cards. [CHAR LIMIT=26] -->
+  <!-- Title for menu option to show details for all cellular networks. [CHAR LIMIT=26] -->
+  <!-- Summary String for Cellular data enable toggle. [CHAR LIMIT=33] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of personal account data [CHAR LIMIT=30] -->
+  <!--  Title for menu option to enable global auto-sync of work account data [CHAR LIMIT=30] -->
+  <!-- Title for option to change data usage cycle day. [CHAR LIMIT=32] -->
+  <!-- Body of dialog prompting user to change numerical day of month that data usage cycle should reset. [CHAR LIMIT=64] -->
+  <!-- Label shown when no applications used data during selected time period. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in foreground. [CHAR LIMIT=48] -->
+  <!-- Label for data usage occuring while application in background. [CHAR LIMIT=48] -->
+  <!-- Label for application which has its data usage restricted. [CHAR LIMIT=16] -->
+  <!-- Body of dialog shown to request confirmation that mobile data will be disabled. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox label that will disable mobile network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 4G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable 2G-3G network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Checkbox label that will disable Wi-Fi network data connection when user-defined limit is reached. [CHAR LIMIT=26] -->
+  <!-- Tab title for showing Wi-Fi data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing Ethernet data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing combined mobile data usage. [CHAR LIMIT=20] -->
+  <!-- Tab title for showing 4G data usage. [CHAR LIMIT=10] -->
+  <!-- Tab title for showing 2G and 3G data usage. [CHAR LIMIT=10] -->
+  <!-- Title shown when current operation applies to mobile networks. [CHAR LIMIT=20] -->
+  <!-- Title shown when current operation applies to no networks. [CHAR LIMIT=20] -->
+  <!-- Toggle switch title for enabling all mobile data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 2G and 3G data network connections. [CHAR LIMIT=32] -->
+  <!-- Toggle switch title for enabling 4G data network connection. [CHAR LIMIT=32] -->
+  <!-- Data Usage Foreground label.  [CHAR LIMIT=40] -->
+  <!-- Data Usage Background label.  [CHAR LIMIT=40] -->
+  <!-- Button title for launching application-specific data usage settings. [CHAR LIMIT=32] -->
+  <!-- Checkbox label that restricts background data usage of a specific application. [CHAR LIMIT=40] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application. [CHAR LIMIT=64] -->
+  <!-- Summary message for checkbox that restricts background data usage of a specific application when no networks have been limited. [CHAR LIMIT=84] -->
+  <!-- Title of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when user restricts background data usage of a specific application. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown when user attempts to restrict background data before a network data limit has been set. [CHAR LIMIT=NONE] -->
+  <!--  Title of dialog shown when user enables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user enables global auto sync, for tablet [CHAR LIMIT=none] -->
+  <!--  Body of dialog shown when user enables global auto sync [CHAR LIMIT=none] -->
+  <!--  Title of dialog shown when user disables global auto sync [CHAR LIMIT=32] -->
+  <!--  Body of dialog shown when user disables global auto sync [CHAR LIMIT=none] -->
+  <!-- Title of dialog for editing data usage cycle reset date. [CHAR LIMIT=48] -->
+  <!-- Subtitle of dialog for editing data usage cycle reset date. [CHAR LIMIT=32] -->
+  <!-- Positive button title for data usage cycle editor, confirming that changes should be saved. [CHAR LIMIT=32] -->
+  <!-- Title of dialog for editing data usage warning in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog for editing data usage limit in bytes. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown before user limits data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user limits mobile data usage. [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown before user restricts background data usage. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown before user restricts background data usage. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser tablets. [CHAR LIMIT=NONE] -->
+  <!-- Body of dialog shown before user restricts background data usage. This is for multiuser phones. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying current network data usage warning threshold. [CHAR LIMIT=18] -->
+  <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
+  <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
+  <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
+  <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
+  <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
+  <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
+  <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
+  <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
+  <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
+  <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
+  <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the L2TP secret of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec identifier of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the IPSec pre-shared key of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec user certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec CA certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Selection label for the IPSec server certificate of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to show advanced options of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS search domains of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
+  <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
+  <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Dialog message body to disconnect from a VPN profile. -->
+  <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
+  <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
+  <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to edit a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to delete a VPN profile. [CHAR LIMIT=40] -->
+  <!-- Menu item to select always-on VPN profile. [CHAR LIMIT=40] -->
+  <!-- Summary describing the always-on VPN feature. [CHAR LIMIT=NONE] -->
+  <!-- List item indicating that no always-on VPN is selected. [CHAR LIMIT=64] -->
+  <!-- Error indicating that the selected VPN doesn't meet requirements. [CHAR LIMIT=NONE] -->
+  <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
+  <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
+  <!-- Tab label for built-in system CA certificates. -->
+  <!-- Tab label for user added CA certificates. -->
+  <!-- Button label for disabling a system CA certificate. -->
+  <!-- Button label for enabling a system CA certificate. -->
+  <!-- Button label for removing a user CA certificate. -->
+  <!-- Alert dialog confirmation when enabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when disabling a system CA certificate. -->
+  <!-- Alert dialog confirmation when removing a user CA certificate. -->
+  <!--  Title for spell checker settings -->
+  <!-- Prompt for the user to enter their current full-backup password -->
+  <!-- Prompt for the user to enter a new full-backup password -->
+  <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
+  <!-- Button label for setting the user's new full-backup password -->
+  <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <!-- A menu item in "About phone" that allows the user to update the phone with settings
+    from their cell phone carrier. The use of the string is similar to the string
+    "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
+  <!-- These statuses are displayed when a device was built with SE Android supoprt.
+    These are displayed by the settings app in the about section. -->
+  <!-- Notification of installed CA Certs -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Button to close the SSL CA cert warning dialog box, meaning the user is done reading.  [CHAR LIMIT=NONE] -->
+  <!-- Title of Dialog warning users of SSL monitoring. [CHAR LIMIT=NONE] -->
+  <!-- Text of message to show to users whose administrator has installed a SSL CA Cert.  [CHAR LIMIT=NONE] -->
+  <!-- Text of warning to show to users that have a SSL CA Cert installed.  [CHAR LIMIT=NONE] -->
+  <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
+  <!-- User settings -->
+  <!-- User settings screen title [CHAR LIMIT=25] -->
+  <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
+  <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
+  <!-- User settings add user menu [CHAR LIMIT=35] -->
+  <!-- User settings summary for a restricted profile [CHAR LIMIT=50] -->
+  <!-- User settings warning that restricted profile needs a screen lock [CHAR LIMIT=NONE] -->
+  <!-- User settings dialog button to set screen lock [CHAR LIMIT=25] -->
+  <!-- User summary to indicate that user is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
+  <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
+  <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
+  <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
+  <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
+  <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Title of dialog to setup a new user [CHAR LIMIT=30] -->
+  <!-- Message in dialog to setup a new user after creation [CHAR LIMIT=none] -->
+  <!-- Message in dialog to setup a new restricted profile after creation [CHAR LIMIT=none] -->
+  <!-- Button text to setup the new user now [CHAR LIMIT=25] -->
+  <!-- Button text to setup the new user later [CHAR LIMIT=25] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to secondary users that only owner can manage users [CHAR LIMIT=none] -->
+  <!-- Message to limited users that they cannot add accounts [CHAR LIMIT=100] -->
+  <!-- User details remove user menu [CHAR LIMIT=20] -->
+  <!-- User menu to allow creating new users from lockscreen [CHAR LIMIT=30] -->
+  <!-- User details new user name [CHAR LIMIT=30] -->
+  <!-- User details new restricted profile name [CHAR LIMIT=30] -->
+  <!-- User (self) removal confirmation title [CHAR LIMIT=30] -->
+  <!-- User removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- Work profile removal confirmation title [CHAR LIMIT=25] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User (self) removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Work profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
+  <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
+  <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <!-- Delete button text [CHAR LIMIT=25] -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
+  <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
+  <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
+  <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
+  <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
+  <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
+  <!-- Message for confirmation of turning on calls and SMS [CHAR LIMIT=none] -->
+  <!-- Application Restrictions screen title [CHAR LIMIT=45] -->
+  <!-- Applications with restrictions header [CHAR LIMIT=45] -->
+  <!-- Applicaitons with restrictions - settings button [CHAR LIMIT=30] -->
+  <!-- Home application selection - uninstall button [CHAR LIMIT=80] -->
+  <!-- Message to user that Home Settings will be hidden because there is now only one available home application -->
+  <!-- Warning message when changing a global setting for a tablet.[CHAR LIMIT=none] -->
+  <!-- Warning message when changing a global setting for a phone.[CHAR LIMIT=none] -->
+  <!-- Warning message title for global locale change [CHAR LIMIT=40] -->
+  <!-- Warning message title for global font change [CHAR LIMIT=40] -->
+  <!-- NFC payment settings -->
+  <!-- Caption for button linking to a page explaining how Tap and Pay works-->
+  <!-- String shown when there are no NFC payment applications installed -->
+  <!-- Header text that can be clicked on to change the default payment app -->
+  <!-- Summary text that is shown when no default app is set -->
+  <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
+  <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
+  <!-- Always use the default app (independent of what app is open) -->
+  <!-- If open app supports TapPay, use that app instead of the default -->
+  <!-- Header for a dialog asking the user which payment app to use -->
+  <!-- Header for text explaning how to pay at a payment terminal in a store -->
+  <!-- Content for text explaning how to pay at a payment terminal in a store -->
+  <!-- Button the user can click to indicate he understood and dismiss the screen -->
+  <!-- NFC More... title.  [CHAR LIMIT=40] -->
+  <!-- Label for the dialog that is shown when the user is asked to set a
+         preferred payment application -->
+  <!-- Restrictions settings -->
+  <!-- Restriction settings title [CHAR LIMIT=35] -->
+  <!-- Restrictions screen - reset menu to reset to unrestricted [CHAR LIMIT=25] -->
+  <!-- Restrictions screen - menu label to change restrictions pin [CHAR LIMIT=25] -->
+  <!-- Label for are-notifications-enabled checkbox in app details [CHAR LIMIT=20] -->
+  <!--  Help URLs for some screens. Not specified here. Specified in product overlays -->
+  <!-- Help menu label [CHAR LIMIT=20] -->
+  <!-- Help URI, Default [DO NOT TRANSLATE] -->
+  <!-- Help URI, Dashboard [DO NOT TRANSLATE] -->
+  <!-- Help URI, Android beam [DO NOT TRANSLATE] -->
+  <!-- Help URI, Display [DO NOT TRANSLATE] -->
+  <!-- Help URI, Wallpaper [DO NOT TRANSLATE] -->
+  <!-- Help URI, Interruptions [DO NOT TRANSLATE] -->
+  <!-- Help URI, Other sounds [DO NOT TRANSLATE] -->
+  <!-- Help URI, Notifications [DO NOT TRANSLATE] -->
+  <!-- Help URI, Apps [DO NOT TRANSLATE] -->
+  <!-- Help URI, Storage [DO NOT TRANSLATE] -->
+  <!-- Help URI, Accessibility [DO NOT TRANSLATE] -->
+  <!-- Help URI, Printing [DO NOT TRANSLATE] -->
+  <!-- Help URI, About phone [DO NOT TRANSLATE] -->
+  <!-- Help URL, WiFi [DO NOT TRANSLATE] -->
+  <!-- Help URL, Bluetooth [DO NOT TRANSLATE] -->
+  <!-- Help URL, Data usage [DO NOT TRANSLATE] -->
+  <!-- Help URL, More [DO NOT TRANSLATE] -->
+  <!-- Help URL, Vpn [DO NOT TRANSLATE] -->
+  <!-- Help URL, Sound [DO NOT TRANSLATE] -->
+  <!-- Help URL, Battery [DO NOT TRANSLATE] -->
+  <!-- Help URL, Accounts [DO NOT TRANSLATE] -->
+  <!-- Help URL, Choose lockscreen [DO NOT TRANSLATE] -->
+  <!-- Help URL, Backup & reset [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tethering [DO NOT TRANSLATE] -->
+  <!-- Help URL, Dreams [DO NOT TRANSLATE] -->
+  <!-- Help URL, User settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Location access [DO NOT TRANSLATE] -->
+  <!-- Help URL, Security settings [DO NOT TRANSLATE] -->
+  <!-- Help URL, Tap & pay [DO NOT TRANSLATE] -->
+  <!-- Help URL, Remote display [DO NOT TRANSLATE] -->
+  <!-- Help URL, Fingerprint [DO NOT TRANSLATE] -->
+  <!-- User account title [CHAR LIMIT=30] -->
+  <!-- User picture title [CHAR LIMIT=30] -->
+  <!-- Extreme threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=62] -->
+  <!-- Severe threats title.  [CHAR LIMIT=30] -->
+  <!-- Extreme threats summary.  [CHAR LIMIT=60] -->
+  <!-- Amber alerts title.  [CHAR LIMIT=30] -->
+  <!-- Amber alerts summary.  [CHAR LIMIT=60] -->
+  <!-- repeat title.  Allows the user to set how oftem to repeat alert reminders.
+         For example, they may have alerts just once or every 2 or 15 minutes.  [CHAR LIMIT=30] -->
+  <!-- Call Manager enable settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager enable settings summary.  [CHAR LIMIT=80] -->
+  <!-- Call Manager settings title.  [CHAR LIMIT=50] -->
+  <!-- Call Manager settings summary.  [CHAR LIMIT=50] -->
+  <!-- Cell Broadcast settings title.  [CHAR LIMIT=50] -->
+  <!-- Network operators settings title.  [CHAR LIMIT=50] -->
+  <!-- Access point names title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode title.  [CHAR LIMIT=50] -->
+  <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
+  <!-- Preferred network type title.  [CHAR LIMIT=50] -->
+  <!-- Preferred network type summary.  [CHAR LIMIT=100] -->
+  <!-- Work SIM title.  [CHAR LIMIT=50] -->
+  <!-- User app limits screen title [CHAR LIMIT=35] -->
+  <!-- User limits screen, user name rename text [CHAR LIMIT=15] -->
+  <!-- Preference label for custom restrictions [CHAR LIMIT=35] -->
+  <!-- Summary for app entries that are controlled by another entry [CHAR LIMIT=none] -->
+  <!-- Summary text for apps that are allowed to access accounts from the primary user [CHAR LIMIT=none] -->
+  <!-- Summary for a case when app entries that are controlled by another entry and app can access user accounts [CHAR LIMIT=none] -->
+  <!-- Restrictions title for configuring wifi and mobile [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for configuring wifi and mobile [CHAR LIMIT=100] -->
+  <!-- Restrictions title for changing bluetooth configuration [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for changing bluetooth configuration [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing NFC transfers [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
+  <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
+  <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
+  <!-- Wizard back button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- Wizard next button label [CHAR LIMIT=25] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->
+  <!-- Accessibility message for the photo selector which is a button/popup with the current photo [CHAR LIMIT=50] -->
+  <!-- Text to display in regulatory info screen (from device overlay). -->
+  <!-- Title for SIM card settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Title for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Summary for SIM settings title settings during Setup Wizard.  [CHAR LIMIT=40] -->
+  <!-- Message that SIM cards have changed.  [CHAR LIMIT=40] -->
+  <!-- Message smmary that SIM cards have changed.  [CHAR LIMIT=60] -->
+  <!-- Message that Cellular data is unavailable.  [CHAR LIMIT=40] -->
+  <!-- Message summary that Cellular data is unavailable.  [CHAR LIMIT=60] -->
+  <!-- Checkbox to always use for calls.  [CHAR LIMIT=40] -->
+  <!-- Message for selecting sim for data in settings.  [CHAR LIMIT=40] -->
+  <!-- Message for switching data SIM; switching takes a while -->
+  <!-- Message for selecting sim for call in settings.  [CHAR LIMIT=40] -->
+  <!-- Title for selecting a SIM card.  [CHAR LIMIT=40] -->
+  <!-- Label for a numbered SIM card.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim card that is empty.  [CHAR LIMIT=40] -->
+  <!-- Name label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Hint for SIM name in sim name editor dialog.  [CHAR LIMIT=40] -->
+  <!-- Title label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Carrier label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Number label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Color label of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Select label Title of Sim Editor.  [CHAR LIMIT=40] -->
+  <!-- Orange label.  [CHAR LIMIT=40] -->
+  <!-- Purple label.  [CHAR LIMIT=40] -->
+  <!-- Message informing the user that no SIM card is inserted  [CHAR LIMIT=60] -->
+  <!-- SIM status title  [CHAR LIMIT=40] -->
+  <!-- Title for call back. [CHAR LIMIT=60] -->
+  <!-- Title for outgoing back. [CHAR LIMIT=60] -->
+  <!-- Title for other call settings. [CHAR LIMIT=60] -->
+  <!-- Preferred Network offload title.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Header.  [CHAR LIMIT=25] -->
+  <!-- Preferred Network offload Footer.  [CHAR LIMIT=100] -->
+  <!-- Preferred Network offload Popup.  [CHAR LIMIT=100] -->
+  <!-- Summary text describing signal strength to the user.  [CHAR LIMIT=60] -->
+  <!-- Title for SIM card notification.  [CHAR LIMIT=40] -->
+  <!-- Message under title informing the user to touch to go to SIM Cards in Settings.  [CHAR LIMIT=40] -->
+  <!-- This is a divider in the SIM cards preferences that is the header of various settings where the user chooses which SIM to use for phone calls, data, and SMS messages [CHAR LIMIT=50] -->
+  <!-- When a user chooses this "Ask first" preference for the SIM to use for phone calls, they'll be prompted to choose a SIM every time they initiate a call [CHAR LIMIT=50] -->
+  <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
+  <!--Dashboard strings-->
+  <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <!-- Search strings -->
+  <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used as a search hint into the search box -->
+  <!-- Text used to identify the search query suggestions / recent searches -->
+  <!-- Text used to identify the search results -->
+  <!--Search Keywords [CHAR LIMIT=NONE]-->
+  <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
+  <!-- NFC Wi-Fi pairing/setup strings-->
+  <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
+  <!-- Text for button to confirm writing tag -->
+  <!-- Text to inform the user to tap a tag to complete the setup process -->
+  <!-- Text to inform the user that the network key entered was incorrect -->
+  <!-- Text displayed when tag successfully writen -->
+  <!-- Text displayed in error cases (failure to write to tag) -->
+  <!-- Text displayed when tag is not writable -->
+  <!-- Option title for the default sound, context based on screen -->
+  <!-- Sounds and Notification -->
+  <!-- Sound & notification: Settings header. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing media volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing alarm volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing ringer volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing notification volume. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the Priority interruptions option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the zen mode automation option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Important interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: Alarms only [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode option: No interruptions [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Zen mode combined summary + condition line [CHAR LIMIT=60] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the phone ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications:  all information will be
+         shown in notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: sensitive information will be
+         hidden or redacted from notifications shown on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Notification section: Value for lockscreen notifications: notifications will not appear on a secure lock screen
+         [CHAR LIMIT=50] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
+  <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for screen locking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling charging sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling docking sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling haptic feedback on touch. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Title for the option enabling dock audio media. [CHAR LIMIT=50] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 0: disabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the dock audio media with value 1: enabled. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 0: silent. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 1: alert. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Other sounds: Value for the emergency tone option with value 2: vibrate. [CHAR LIMIT=30] -->
+  <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
+  <!-- Summary of preference to manage notification listeners, when none are enabled -->
+  <!-- Summary of preference to manage notification listeners, when one or more are enabled
+         and are therefore able to read the user's notifications -->
+  <!-- String to show in the list of notification listeners, when none is installed -->
+  <!-- Title for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about security implications of enabling a notification
+          listener, displayed as a dialog message. [CHAR LIMIT=NONE] -->
+  <!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
+  <!-- Sound & notification > Do Not Disturb access > Text to display when the list is empty. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Block option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Priority option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Peekable option description-->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option title -->
+  <!-- [CHAR LIMIT=NONE] App notification settings: Sensitive option description-->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when banned -->
+  <!-- [CHAR LIMIT=40] Notification settings: App notifications row summary when high priority -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications row summary when sensitive -->
+  <!-- [CHAR LIMIT=20] Notification settings: App notifications dialog dismiss button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name option and edit dialog title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule name hint text -->
+  <!-- [CHAR LIMIT=100] Zen mode settings: Warning text for invalid zen rule names -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Add rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event rule type name -->
+  <!-- [CHAR LIMIT=NONE] Zen mode settings: Event rule toast hint when enabled -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: During events for -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule summary fragment: Where reply is -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule calendar option value for any calendar -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
+  <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
+  <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
+  <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: None -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
+  <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
+  <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
+  <!-- [CHAR LIMIT=20] Zen mode settings: End time option -->
+  <!-- [CHAR LIMIT=60] Zen mode settings: End time option: Summary text value format when end time = next day -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only forever. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for < 60 minutes. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only for N hours. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: switch to alarms only until a specific time. -->
+  <!-- [CHAR LIMIT=NONE] Zen mode summary spoken when changing mode by voice: Turn on all notifications. -->
+  <!-- [CHAR LIMIT=20] Notifications settings: Apps section header -->
+  <!-- [CHAR LIMIT=NONE] Content description for per-app notification
+         settings button -->
+  <!-- [CHAR LIMIT=35] Feedback on the device -->
+  <!-- Full package name of OEM preferred device feedback reporter [DO NOT TRANSLATE] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- Switch On/Off  -->
+  <!-- [CHAR LIMIT=28] Screen pinning title -->
+  <!-- [CHAR LIMIT=300] Screen pinning description -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- [CHAR LIMIT=60] Unlock setting for screen pinning -->
+  <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Opening string on the dialog that prompts the user to confirm that they really want to delete their existing work profile. The administration app icon and name appear after the final colon. [CHAR LIMIT=NONE] -->
+  <!-- Summary for work profile accounts group. [CHAR LIMIT=25] -->
+  <!-- Summary Title for saying that the preference is experimental and will evolve over time due to User feedback. [CHAR LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=45] Auto-rotate setting title -->
+  <!-- [CHAR LIMIT=70] Rotate when screen is turned option -->
+  <!-- [CHAR LIMIT=70] Keep the screen in portrait when rotated -->
+  <!-- [CHAR LIMIT=70] Keep the screen in landscape when rotated -->
+  <!-- [CHAR LIMIT=70] Don't rotate when screen is turned option -->
+  <!-- Title and summary for SIM Status -->
+  <!-- Title for IMEI preference [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial title. This screen asks the user whether the device will ask for a PIN / pattern / password before the device starts up. [CHAR LIMIT=30] -->
+  <!-- Encryption interstitial button to continue with the shown setting.  Appears on screen that asks the user to opt in/out of encrypting device with a pin/pattern/password. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a PIN to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a pattern to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Message shown on encryption interstitial to ask the user whether or not they want to use a password to encrypt the device while setting up fingerprint unlock. [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a PIN to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a pattern to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that require a password to start device [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a PIN to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a pattern to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Radio button text that doesn't require a password to decrypt [CHAR LIMIT=NONE] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Title for encryption dialog that disables TalkBack. [CHAR_LIMIT=25] -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Message for encryption dialog telling the user that Talkback and other accessibility services will be disabled. -->
+  <!-- Title and summary for SIM Status -->
+  <!-- New strings needed for App Info 2 -->
+  <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
+  <!-- Summary for app storage preference [CHAR LIMIT=15] -->
+  <!-- Category name for App Launch -->
+  <!-- Summary for app storage preference -->
+  <!-- Internal storage label -->
+  <!-- External storage label -->
+  <!-- Summary describing internal storage for applications [CHAR LIMIT=25] -->
+  <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
+  <!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
+  <!-- Summary for data usage preference [CHAR LIMIT=15] -->
+  <!-- Title of storage preference to control where app is stored -->
+  <!-- Title of button to change storage [CHAR LIMIT=25] -->
+  <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
+  <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
+  <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
+  <!-- App notification summary with notification peeking disabled [CHAR LIMIT=40] -->
+  <!-- App notification summary with 2 items [CHAR LIMIT=15] -->
+  <!-- App notification summary with 3 items [CHAR LIMIT=15] -->
+  <!-- Permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary.  Number of additional permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app has no permissions granted. [CHAR LIMIT=40] -->
+  <!-- Runtime permissions preference summary, shown when the app requests no permissions. [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
+  <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
+  <!-- Label for showing all apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing enabled apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing personal apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing work apps in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with blocked notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with priority notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with sensitive notifications in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with peeking disabled in list [CHAR LIMIT=30] -->
+  <!-- Label for showing apps with domain URLs (data URI with http or https) in list [CHAR LIMIT=30] -->
+  <!-- Summary for a trust agent that was disabled by the device policy [LIMIT=NONE] -->
+  <!-- Title for advanced application management settings [CHAR LIMIT=30] -->
+  <!-- Title for application configuration settings [CHAR LIMIT=30] -->
+  <!-- Warning toast shown when data usage screen can't find specified app -->
+  <!-- Title for profile selection dialog [CHAR LIMIT=30] -->
+  <!-- Label for list that shows all permissions -->
+  <!-- Summary of permissions currently granted to apps [CHAR LIMIT=45] -->
+  <!-- Summary of number of apps currently granted a single permission [CHAR
+        LIMIT=45] -->
+  <!-- Label for tap to wake setting [CHAR LIMIT=30] -->
+  <!-- Summary for take to wake setting [CHAR LIMIT=90] -->
+  <!-- Label for the Domain URLs list that shows domain urls per App [CHAR LIMIT=30] -->
+  <!-- Summary for an App that dont open any domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open one and only one domain URLs [CHAR LIMIT=45] -->
+  <!-- Summary of number of App that can open several domain URLs [CHAR LIMIT=45] -->
+  <!-- Description of settings item that leads to list of all apps with Domain URLs [CHAR LIMIT=NONE] -->
+  <!-- Explanation that the app that will ALWAYS be launched to open web links to domains that it understands -->
+  <!-- Explanation that the user will be asked whether to launch the app to open web links to domains that it understands -->
+  <!-- Explanation that the app that will NEVER be launched to open web links to domains that it understands -->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <!-- Title for Default Apps settings [CHAR LIMIT=30] -->
+  <!-- Title for Assist and voice input settings [CHAR LIMIT=30] -->
+  <!-- Title for Default Assist settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Assist settings [CHAR LIMIT=45] -->
+  <!-- Title for Choose Assist dialog [CHAR LIMIT=35] -->
+  <!-- [CHAR_LIMIT=45] Title of the security warning dialog for setting an assitant -->
+  <!-- [CHAR_LIMIT=NONE] Warning message about security implications of setting an assistant,
+         displayed as a dialog message when the user selects an assistant. -->
+  <!-- Label for the button to acknowledge assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Label for the button to bail out assistant security implications. [CHAR LIMIT=30] -->
+  <!-- Title for Choose voice input dialog [CHAR LIMIT=30] -->
+  <!-- Title for Default Browser settings [CHAR LIMIT=30] -->
+  <!-- Summary for No Default Browser settings [CHAR LIMIT=45] -->
+  <!--  Title for Default Phone app settings [CHAR LIMIT=30] -->
+  <!-- Label of default app for current setting [CHAR LIMIT=40] -->
+  <!-- Title of app storage screen [CHAR LIMIT=30] -->
+  <!-- Title of usage access screen [CHAR LIMIT=30] -->
+  <!-- Label for setting which controls whether app has usage access [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for app usage settings [CHAR LIMIT=45] -->
+  <!-- Description of the usage access setting [CHAR LIMIT=NONE] -->
+  <!-- Title for screen showing recent memory usage of device [CHAR LIMIT=30]-->
+  <!-- Title for screen showing recent memory usage of specific app [CHAR LIMIT=30]-->
+  <!-- Description of app always running [CHAR LIMIT=45] -->
+  <!-- Description of app sometimes running [CHAR LIMIT=45] -->
+  <!-- Description of app rarely running [CHAR LIMIT=45] -->
+  <!-- Maximum memory usage key [CHAR LIMIT=25] -->
+  <!-- Average memory usage key [CHAR LIMIT=25] -->
+  <!-- Maximum memory used by an app [CHAR LIMIT=25] -->
+  <!-- Average memory used by an app [CHAR LIMIT=25] -->
+  <!-- Formatting for memory description [CHAR LIMIT=25] -->
+  <!-- Label for process [CHAR LIMIT=25] -->
+  <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=27]-->
+  <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
+  <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
+  <!-- Summary of app which doesn't have a battery optimization setting [CHAR LIMIT=60] -->
+  <!-- Description of high power switch [CHAR LIMIT=NONE] -->
+  <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
+  <!-- Title of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Body text of prompt dialog app can invoke to turn off optimization [CHAR LIMIT=NONE] -->
+  <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
+  <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
+  <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
+  <!-- Turn on settings for system ui tuner [CHAR LIMIT=40] -->
+  <!-- Label for button that leads to more permissions [CHAR LIMIT=40] -->
+  <!-- Description of how many more permissions to view on next page [CHAR LIMIT=30] -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for charging only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
+         user select what the USB connection for this device should be used for. This choice
+         is for powering the other device only. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring files via MTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for transferring photos via PTP. -->
+  <!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- Description of one of the choices in a dialog (with title defined in usb_use) that lets the user
+         select what the USB connection for this device should be used for. This choice
+         is for entering MIDI mode. -->
+  <!-- The title used in a dialog which lets the user select what the USB connection
+         for this device should be used for. Choices are usb_use_charging_only,
+         usb_use_file_transfer, use_use_photo_transfer, and usb_use_MIDI -->
+  <!-- Settings item title for inactive apps [CHAR LIMIT=35] -->
+  <!-- Settings item summary for inactive app [CHAR LIMIT=100] -->
+  <!-- Settings item summary for active app [CHAR LIMIT=100] -->
+  <!-- Title for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "context" preference to determine whether assist can access the data currently displayed on-screen [CHAR LIMIT=NONE] -->
+  <!-- Title for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=40] -->
+  <!-- Summary for the "screenshot" preference to determine whether assist can access the screenshot of your screen [CHAR LIMIT=NONE] -->
+  <!-- Footer text in the manage assist screen. [CHAR LIMIT=NONE] -->
+  <!-- Label for average memory use section [CHAR LIMIT=30] -->
+  <!-- Label for maximum memory use section [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for app list of memory use [CHAR LIMIT=30] -->
+  <!-- Label for details about an app's memory use [CHAR LIMIT=30] -->
+  <!-- Summary for how much memory an app has used [CHAR LIMIT=NONE] -->
+  <!-- Summary for no memory use for an app [CHAR LIMIT=NONE] -->
+  <!-- Menu item for Sorting list by average memory use [CHAR LIMIT=NONE]-->
+  <!-- Menu item for Sorting list by maximum memory use [CHAR LIMIT=NONE] -->
+  <!-- Label for the current performance of the device [CHAR LIMIT=25] -->
+  <!-- Label for total memory of device [CHAR LIMIT=25] -->
+  <!-- Label for average memory usage of device [CHAR LIMIT=25] -->
+  <!-- Label for free memory of device [CHAR LIMIT=25] -->
+  <!-- Label for button that leads to list of apps and their memory usage [CHAR LIMIT=40]-->
+  <!-- Description of number of apps using memory [CHAR LIMIT=NONE] -->
+  <!-- Label for frequency that the app is runnig (e.g. always, sometimes, etc.) [CHAR LIMIT=25] -->
+  <!-- Label for maximum amount of memory app has used [CHAR LIMIT=25] -->
+  <!-- Summary of data item when no data usage [CHAR LIMIT=40] -->
+  <!-- Zen mode access settings - title for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Zen mode access settings - summary for warning dialog when enabling access [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations on label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations off label [CHAR LIMIT=30] -->
+  <!-- Ignore battery optimizations on description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations off description [CHAR LIMIT=NONE] -->
+  <!-- Ignore battery optimizations dialog title [CHAR LIMIT=NONE] -->
+  <!-- Label for None item in AppListPreference [CHAR LIMIT=40] -->
+  <!-- Warning message about disabling usage access on profile owner [CHAR LIMIT=NONE] -->
+  <!-- Number of characters used for lock screen text [CHAR LIMIT=NONE] -->
+  <!-- System Alert Window settings -->
+  <!-- Title of Draw Overlay preference item [CHAR LIMIT=55] -->
+  <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
+  <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
+  <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
+  <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
+  <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
+  <!-- Description of allowing overlay setting [CHAR LIMIT=NONE] -->
+  <!-- Keyword for SYSTEM_ALERT_WINDOW -->
+  <!-- Main settings screen item's title to go into the overlay settings screen [CHAR LIMIT=30] -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
+  <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <!-- Write Settings settings -->
+  <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
+  <!-- Keyword for WRITE_SETTINGS -->
+  <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
+  <!-- Label for showing apps that can write system settings [CHAR LIMIT=45] -->
+  <!-- Title for the apps that are allowed to write system settings [CHAR LIMIT=60] -->
+  <!-- Main settings screen item's title to go into the write system settings screen [CHAR LIMIT=30] -->
+  <!-- Link to the apps page for WRITE_SETTINGS settings [CHAR LIMIT=52] -->
+  <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
+  <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
+  <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
+  <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
+  <!-- Description of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=NONE] -->
+  <!-- Name of each color mode for the display. [CHAR LIMIT=40] -->
+  <!-- Description of each color mode for the display. [CHAR LIMIT=NONE] -->
+  <!-- Name of feature to change color setting for the display [CHAR LIMIT=60] -->
+  <!-- Description of feature to change color setting for the display [CHAR LIMIT=NONE] -->
+  <!-- Name of the setting to change the display's color temperature -->
+  <!-- Description of the setting to change the display's color temperature -->
+  <!-- Toast message letting the user know the color temperature setting is not immediate -->
+</resources>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 06ba6ad..cf70b37 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -40,6 +40,8 @@
   <string name="root_access_adb">Samo ADB</string>
   <string name="root_access_all">Aplikacije i ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Upravljaj root pristupima</string>
+  <string name="root_appops_summary">Prikaz i kontrola root pravila</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index b2ee3a2..b4c99d9 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Csak ADB</string>
   <string name="root_access_all">Alkalmazások és ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Root hozzáférések kezelése</string>
+  <string name="root_appops_summary">Root szabályok megtekintése és kezelése</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -274,6 +276,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">LED beállítások</string>
   <string name="led_notification_text">LED fény engedélyezve</string>
+  <string name="notification_light_no_apps_summary">Alkalmazásonkénti vezérléshez aktiválja: \"%1$s\" és nyomja meg \"\u002b\" jelet a menüsávon</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android hibakeresés</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -443,6 +446,7 @@
   <string name="app_ops_allowed_count">Engedélyezve <xliff:g id="count" example="2 times">%s</xliff:g> alkalommal</string>
   <string name="app_ops_ignored_count">Megtagadva <xliff:g id="count" example="2 times">%s</xliff:g> alkalommal</string>
   <string name="app_ops_both_count">Engedélyezve <xliff:g id="count">%1$s</xliff:g>, megtagadva <xliff:g id="count">%2$s</xliff:g> alkalommal</string>
+  <string name="app_ops_disabled_by_optimization">Akkumulátor optimalizáció által tiltva</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Felhasználói alkalmazások megjelenítése</string>
   <string name="app_ops_show_system_apps">Rendszeralkalmazások megjelenítése</string>
@@ -548,6 +552,7 @@
   <string name="volume_adjust_sounds_title">Hangerő állítási hangok</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Rezgés erőssége</string>
+  <string name="vibrator_warning">Nem ajánlott %1$d%% feletti értékre állítani</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Színek kalibrálása</string>
   <string name="color_calibration_summary">Képernyőn megjelenő színek kalibrálása</string>
@@ -599,8 +604,14 @@
   <string name="live_display_color_profile_photography_summary">Tökéletes színreprodukció fotókhoz</string>
   <string name="live_display_color_profile_basic_title">Alap</string>
   <string name="live_display_color_profile_basic_summary">Kijelző használata kalibrálatlanul</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptív</string>
+  <string name="live_display_color_profile_adaptive_summary">Színek alkalmazkodnak a környezethez</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Kép beállítása</string>
+  <string name="picture_adjustment_summary">Árnyalat, telítettség, intenzitás és kontraszt beállítása</string>
+  <string name="adj_hue_title">Árnyalat</string>
   <string name="adj_saturation_title">Telítettség</string>
+  <string name="adj_intensity_title">Intenzitás</string>
   <string name="adj_contrast_title">Kontraszt</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Választó ikon</string>
@@ -681,15 +692,11 @@
   <string name="status_bar_notif_count_summary">Folyamatban lévő értesítések számának megjelenítése az értesítési sávon</string>
   <string name="status_bar_quick_qs_pulldown_title">Gyors legördítés</string>
   <string name="status_bar_quick_qs_pulldown_summary">Csempék megjelenítése az értesítési sáv %1$s oldalán történő legörgetéskor</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Bal</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Jobb</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">bal</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">jobb</string>
   <string name="status_bar_quick_qs_pulldown_off">Ki</string>
-  <string name="status_bar_quick_qs_pulldown_left">Bal</string>
-  <string name="status_bar_quick_qs_pulldown_right">Jobb</string>
   <!-- Status bar - Clock -->
   <string name="status_bar_clock_style_title">Óra stílusa</string>
-  <string name="status_bar_clock_style_right">Jobb</string>
-  <string name="status_bar_clock_style_left">Bal</string>
   <string name="status_bar_clock_style_center">Középen</string>
   <string name="status_bar_clock_style_hidden">Rejtett</string>
   <string name="status_bar_am_pm_title">De/Du stílusa</string>
@@ -858,6 +865,7 @@
   <string name="menu_hidden_apps_delete">Visszaállítás</string>
   <string name="menu_hidden_apps_reset_lock">Minta visszaállítása</string>
   <string name="protected_apps">Védett alkalmazások</string>
+  <string name="protected_apps_summary">A biztonsági zár mögötti rejtett alkalmazások kezelése</string>
   <string name="saving_protected_components">Összetevő állapotának mentése\u2026</string>
   <string name="pa_login_username_hint">Felhasználónév (e-mail)</string>
   <string name="pa_login_password_hint">Jelszó</string>
@@ -989,11 +997,42 @@
   <string name="battery_info_status_charging_dock_ac">Töltés dokkolón (AC)</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Töltés dokkolón (USB)</string>
+  <string name="restrict_app_wlan_title">Alkalmazás Wi\u2011Fi használatának tiltása</string>
+  <string name="restrict_app_wlan_summary">Megakadályozza az alkalmazás Wi\u2011Fi használatát</string>
+  <string name="restrict_app_cellular_title">Alkalmazás adathasználatának tiltása</string>
+  <string name="restrict_app_cellular_summary">Megakadályozza az alkalmazás mobilnet használatát</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Időjárás</string>
+  <string name="weather_settings_no_services_prompt">Nincs telepítve Időjárás szolgáltató</string>
+  <string name="weather_settings_button">Szolgáltató beállítások</string>
+  <string name="weather_settings_activity_not_found">Ezen szolgáltató beállítások menüje nem indítható</string>
+  <string name="weather_settings_add_weather_provider">Időjárás szolgáltató felvétele</string>
   <string name="weather_settings_general_settings_title">Általános</string>
+  <string name="weather_settings_providers_title">Szolgáltatók</string>
+  <string name="weather_settings_temp_units_title">Hőmérsékleti egység</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">időjárás</string>
+  <string name="background_data_access">Háttéradatokhoz való hozzáférés</string>
+  <string name="allow_background_both">Mobilneten és Wi\u2011Fin keresztül</string>
+  <string name="allow_background_wlan">Csak Wi\u2011Fin keresztül</string>
+  <string name="allow_background_none">Nincs hozzáférés</string>
+  <string name="mobile_data_alert">Mobilnet riasztás</string>
+  <string name="mobile_data_alert_summary">Értesítés, ha az alkalmazás jelentős mennyiségű adatot használ</string>
+  <string name="data_usage_menu_enable_data_alerts">Adathasználati riasztások engedélyezése</string>
+  <string name="data_usage_menu_disable_data_alerts">Adathasználati riasztás kikapcsolása</string>
+  <string name="data_usage_menu_reset_stats">Adatstatisztika törlése</string>
+  <string name="reset_data_stats_msg">Ez törli az összes rögzített felhasználási adatokat</string>
+  <string name="reset_stats_confirm">Megerősítés</string>
+  <string name="restrict_cellular_access_title">Mobilnet hozzáférés korlátozása</string>
+  <string name="restrict_cellular_access_summary">Adathozzáférés tiltása mobilhálózatokon</string>
+  <string name="restrict_cellular_access_dialog_title">Korlátozza a mobilhálózati hozzáférést?</string>
+  <string name="restrict_cellular_access_dialog_summary">Ez a funkció bizonyos alkalmazások működésképtelenségét okozhatja, amelyek a hálózathoz való hozzáféréssel működnek és csak a mobilnet elérhető.\n\nMegfelelőbb adathasználati vezérlőket az alkalmazáson belüli beállításokban találhat.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Hálózati üzemeltetők</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Háttér életlenítés</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Időjárás megjelenítése</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1002,9 +1041,30 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Állandó értesítés tiltása a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Fejlett rádiós vezérlés</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">MBN automatikus betöltés kikapcsolása</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">MBN automatikus betöltés bekapcsolása</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">VoLTE hibakeresés kikapcsolása</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">VoLTE hibakeresés bekapcsolása</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">VT hibakeresés kikapcsolása</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">VT hibakeresés bekapcsolása</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">WFC hibakeresés kikapcsolása</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">WFC hibakeresés bekapcsolása</string>
+  <string name="cm_radio_info_adb_log_on_label">ADB rádió napló kikapcsolása</string>
+  <string name="cm_radio_info_adb_log_off_label">ADB rádió napló bekapcsolása</string>
+  <string name="cm_radio_info_diag_log_on_label">Diagnosztikai napló kikapcsolása</string>
+  <string name="cm_radio_info_diag_log_off_label">Diagnosztikai napló bekapcsolása</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Háttérkép</string>
+  <string name="not_available_with_app">Nem érhető el ezzel: %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Keresse meg az ujjlenyomat érzékelőt a telefon <xliff:g id="sensor_location">%1$s</xliff:g>.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">hátulján</string>
+  <string name="security_settings_fingerprint_sensor_location_front">elején</string>
+  <string name="security_settings_fingerprint_sensor_location_left">bal oldalán</string>
+  <string name="security_settings_fingerprint_sensor_location_right">jobb oldalán</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Hang: <xliff:g id="voice_status">%1$s</xliff:g> / Adat: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index 3d7acdc..d9e490f 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -18,26 +18,28 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
-    <item quantity="other">Anda sekarang <xliff:g id="step_count">%1$d</xliff:g> beberapa langkah dari mengaktifkan opsi pengembang.</item>
+    <item quantity="other"><xliff:g id="step_count">%1$d</xliff:g> langkah lagi untuk mengaktifkan opsi pengembang.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">Anda telah mengaktifkan opsi pengembang!</string>
+  <string name="show_dev_on_cm">Anda adalah seorang pengembang!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan mengaktifkan opsi pengembang.</string>
+  <string name="show_dev_already_cm">Tidak perlu, Anda telah mengaktifkan opsi pengembang.</string>
   <!-- Launch Dev Tools -->
   <string name="development_tools_title">Alat pengembangan</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">Pintasan pengembangan</string>
   <string name="development_shortcut_summary">Aktifkan pintasan manajemen aplikasi dalam daftar aplikasi terakhir</string>
   <!-- Setting checkbox title for root access -->
-  <string name="root_access">Akses punca (root)</string>
-  <string name="root_access_warning_title">Izinkan akses punca (root)?</string>
-  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses punca (root) sangat berbahaya dan dapat membahayakan keamanan sistem Anda!</string>
-  <string name="root_access_none">Dinonaktifkan</string>
+  <string name="root_access">Akses root</string>
+  <string name="root_access_warning_title">Izinkan akses root?</string>
+  <string name="root_access_warning_message">Mengizinkan aplikasi untuk meminta akses root sangat berbahaya dan dapat membahayakan keamanan sistem Anda!</string>
+  <string name="root_access_none">Dimatikan</string>
   <string name="root_access_apps">Aplikasi saja</string>
   <string name="root_access_adb">ADB saja</string>
   <string name="root_access_all">Aplikasi dan ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Kelola akses root</string>
+  <string name="root_appops_summary">Lihat dan kontrol aturan root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">Komunikasi jarak dekat</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -55,18 +57,18 @@
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Pembaruan CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Perbarui pemulihan Cyanogen</string>
-  <string name="update_recovery_summary">Perbarui pemulihan dengan pembaruan sistem</string>
-  <string name="update_recovery_on_warning">PERHATIAN: Jika fitur ini diaktifkan, pemulihan yang terinstal akan digantikan oleh salah satu yang disertakan dengan versi terbaru dari OS yang berjalan.\n\nPemulihan akan diperbarui bersama dengan peningkatan sistem agar pemulihan tetap kompatibel dengan versi mendatang.\n\nApakah Anda ingin mengaktifkan fitur ini?</string>
+  <string name="update_recovery_title">Perbarui Cyanogen recovery</string>
+  <string name="update_recovery_summary">Perbarui recovery dengan pembaruan sistem</string>
+  <string name="update_recovery_on_warning">PERHATIAN: Jika fitur ini diaktifkan, recovery yang terpasang akan digantikan oleh salah satu yang disertakan dengan versi terbaru dari OS yang berjalan.\n\nRecovery akan diperbarui bersama dengan peningkatan sistem agar recovery tetap kompatibel dengan versi mendatang.\n\nApakah Anda ingin mengaktifkan fitur ini?</string>
   <string name="update_recovery_off_warning">PERINGATAN: Jika fitur ini dinonaktifkan, pemulihan yang terinstal tidak akan diperbarui dengan peningkatan OS.\n\nPembaruan OS mendatang mungkin tidak dapat diinstal dengan versi pemulihan khusus atau versi pemulihan yang sudah usang.\n\nApakah Anda benar-benar ingin menonaktifkan fitur ini?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Tema</string>
   <!-- Sound settings screen -->
-  <string name="ring_mode_title">Modus dering</string>
+  <string name="ring_mode_title">Mode dering</string>
   <string name="ring_mode_normal">Normal</string>
   <string name="ring_mode_vibrate">Getar</string>
-  <string name="ring_mode_mute">Bungkam</string>
+  <string name="ring_mode_mute">Diam</string>
   <string name="settings_reset_button">Atur kembali</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Profil sistem</string>
@@ -80,7 +82,7 @@
   <string name="profile_write_success">Tag berhasil ditulis</string>
   <string name="profile_write_failed">Tag gagal ditulis!</string>
   <string name="profile_selected">Profil dipilih: %1$s</string>
-  <string name="profile_nfc_text">Menulis sebuah profil untuk NFC tag memungkinkan untuk men-tap tag untuk memilih profil. Ketuk kedua kalinya akan memilih profil yang dipilih sebelumnya.</string>
+  <string name="profile_nfc_text">Menulis sebuah profil untuk tag NFC memungkinkan untuk menyentuh tag untuk memilih profil. Sentuh kedua kalinya akan memilih profil yang dipilih sebelumnya.</string>
   <string name="profile_unknown_nfc_tag">Profil tidak diketahui</string>
   <string name="profile_add_nfc_text">Tag NFC ini mengacu pada profil yang tidak diketahui. Melampirkan tag NFC ini ke profil yang ada akan memungkinkan untuk memilih profil di masa depan.</string>
   <string name="profile_select">Pilih profil</string>
@@ -92,8 +94,8 @@
   <string name="profile_app_group_item_instructions">Tambah atau hapus grup</string>
   <string name="profile_app_group_item_instructions_summary">Tambah atau hapus penimpa pemberitahuan grup aplikasi ke profil ini</string>
   <!-- Profile mode options. -->
-  <string name="profile_entries_on">Aktif</string>
-  <string name="profile_entries_off">Nonaktif</string>
+  <string name="profile_entries_on">Hidup</string>
+  <string name="profile_entries_off">Mati</string>
   <string name="profile_entries_no_override">Tidak menimpa</string>
   <!-- Add Profile -->
   <string name="profile_name_title">Nama</string>
@@ -105,7 +107,7 @@
   <string name="rename_dialog_hint">Masukkan nama profil</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Set ulang</string>
-  <string name="profile_reset_message">Hapus semua profil yang dibuat oleh pengguna dan kelompok-kelompok aplikasi dan mengembalikan mereka ke standar?</string>
+  <string name="profile_reset_message">Hapus semua profil buatan pengguna dan kelompok aplikasi serta mengembalikan mereka ke standar?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Hapus aplikasi ini?</string>
   <!-- Profile network mode -->
@@ -149,23 +151,23 @@
   <string name="profile_choose_app">Pilih aplikasi</string>
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">Pengaturan aplikasi</string>
-  <string name="profile_lockmode_title">Modus layar kunci</string>
+  <string name="profile_lockmode_title">Mode layar kunci</string>
   <string name="profile_lockmode_policy_disabled_summary">Opsi profil ini dinonaktifkan oleh kebijakan pengelola perangkat</string>
   <string name="profile_lockmode_insecure_summary">Jangan meminta PIN atau kata sandi</string>
   <string name="profile_lockmode_disabled_summary">Nonaktifkan layar kunci</string>
-  <string name="profile_airplanemode_title">Modus pesawat</string>
+  <string name="profile_airplanemode_title">Mode pesawat</string>
   <string name="profile_brightness_title">Kecerahan layar</string>
   <string name="profile_brightness_override_summary">Setel ke %1$d%%</string>
   <string name="profile_brightness_override_checkbox_label">Ganti kecerahan</string>
   <!-- Connection override toggles (not all are used at this time ) -->
   <string name="toggleWifi">Wi\u2011Fi</string>
-  <string name="toggleWifiAp">Area bersinyal Wi\u2011Fi portabel</string>
+  <string name="toggleWifiAp">Hotspot Wi\u2011Fi portabel</string>
   <string name="toggleBluetooth">Bluetooth</string>
   <string name="toggleGPS">GPS</string>
-  <string name="toggleData">Sambungan data</string>
+  <string name="toggleData">Koneksi data</string>
   <string name="toggleSync">Otomatis sinkronkan data</string>
   <string name="toggle2g3g4g">Jenis jaringan pilihan</string>
-  <string name="toggle2g3g4g_msim">Jenis jaringan pilihan (%1$s)</string>
+  <string name="toggle2g3g4g_msim">Jenis jaringan (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
   <string name="wifi_setting_countrycode_title">Kode wilayah Wi\u2011Fi</string>
@@ -266,7 +268,7 @@
   <string name="notification_light_missed_call_title">Panggilan yang tidak terjawab</string>
   <string name="notification_light_voicemail_title">Pesan suara</string>
   <string name="notification_light_screen_on">Lampu dengan layar yang menyala</string>
-  <string name="notification_light_zen_mode">Lampu dalam modus Do Not Disturb</string>
+  <string name="notification_light_zen_mode">Lampu di mode Jangan Ganggu</string>
   <string name="notification_light_use_multiple_leds">Diode Pancaran Cahaya Ganda</string>
   <string name="keywords_lights_brightness_level">redupkan kecemerlangan diode pancaran cahaya</string>
   <string name="notification_light_automagic">Memilih warna secara otomatis</string>
@@ -280,7 +282,7 @@
   <string name="enable_adb_summary_cm">Aktifkan antarmuka Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB melalui jaringan</string>
-  <string name="adb_over_network_summary">Aktifkan perbaikan galat fungsi TCP/IP melalui antarmuka jaringan (Wi\u2011Fi, jaringan USB). Pengaturan ini diatur ulang pada saat dibut kembali</string>
+  <string name="adb_over_network_summary">Aktifkan TCP/IP debug melalui antarmuka jaringan (Wi-Fi, jaringan USB). Pengaturan ini dikembalikan standar saat dihidupkan ulang</string>
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">PERINGATAN: Ketika ADB melalui jaringan diaktifkan, ponsel Anda terbuka terhadap intrusi pada semua jaringan yang terhubung!\n\nHanya gunakan fitur ini ketika Anda terhubung pada jaringan tepercaya\n\nApakah Anda benar-benar ingin mengaktifkan fungsi ini?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
@@ -305,8 +307,8 @@
   <string name="app_ops_summaries_modify_call_log">ubah log panggilan</string>
   <string name="app_ops_summaries_read_calendar">membaca kalendar</string>
   <string name="app_ops_summaries_modify_calendar">ubah kalendar</string>
-  <string name="app_ops_summaries_wifi_scan">Tinjau Wi-Fi</string>
-  <string name="app_ops_summaries_notification">pemberitahuan</string>
+  <string name="app_ops_summaries_wifi_scan">Pindai Wi-Fi</string>
+  <string name="app_ops_summaries_notification">notifikasi/toast</string>
   <string name="app_ops_summaries_cell_scan">pindai sel</string>
   <string name="app_ops_summaries_call_phone">panggilan telepon</string>
   <string name="app_ops_summaries_read_sms">baca SMS</string>
@@ -338,16 +340,16 @@
   <string name="app_ops_summaries_keep_awake">tetap terjaga</string>
   <string name="app_ops_summaries_monitor_location">memantau lokasi</string>
   <string name="app_ops_summaries_monitor_high_power_location">memantau lokasi daya tinggi</string>
-  <string name="app_ops_summaries_get_usage_stats">dapakan statistik penguunaan</string>
+  <string name="app_ops_summaries_get_usage_stats">dapatkan statistik penggunaan</string>
   <string name="app_ops_summaries_mute_unmute_microphone">bungkam/bunyikan mikrofon</string>
   <string name="app_ops_summaries_toast_window">tampilkan toast</string>
   <string name="app_ops_summaries_project_media">proyek media</string>
   <string name="app_ops_summaries_activate_vpn">aktifkan VPN</string>
-  <string name="app_ops_summaries_write_wallpaper">menulis gambar latar</string>
+  <string name="app_ops_summaries_write_wallpaper">mengganti wallpaper</string>
   <string name="app_ops_summaries_assist_structure">bantu struktur</string>
-  <string name="app_ops_summaries_assist_screenshot">bantu cuplikan layar</string>
-  <string name="app_ops_summaries_read_phone_state">membaca kondisi ponsel</string>
-  <string name="app_ops_summaries_add_voicemail">menambahkan pesan suara</string>
+  <string name="app_ops_summaries_assist_screenshot">membantu tangkap layar</string>
+  <string name="app_ops_summaries_read_phone_state">membaca kondisi telepon</string>
+  <string name="app_ops_summaries_add_voicemail">tambah pesan suara</string>
   <string name="app_ops_summaries_use_sip">menggunakan SIP</string>
   <string name="app_ops_summaries_make_call">membuat panggilan</string>
   <string name="app_ops_summaries_use_fingerprint">gunakan sidik jari</string>
@@ -355,14 +357,14 @@
   <string name="app_ops_summaries_read_cell_broadcasts">membaca siaran seluler</string>
   <string name="app_ops_summaries_mock_location">memalsukan lokasi</string>
   <string name="app_ops_summaries_read_external_storage">membaca penyimpanan luar</string>
-  <string name="app_ops_summaries_write_external_storage">tulis untuk penyimpanan luar</string>
-  <string name="app_ops_summaries_turn_screen_on">menyalakan layar</string>
-  <string name="app_ops_summaries_get_accounts">mendapatkan laporan</string>
-  <string name="app_ops_summaries_toggle_wifi">beralih ke Wi-Fi</string>
-  <string name="app_ops_summaries_toggle_bluetooth">beralih ke bluetooth</string>
-  <string name="app_ops_summaries_start_at_boot">mulai saat but</string>
-  <string name="app_ops_summaries_toggle_nfc">beralih ke NFC</string>
-  <string name="app_ops_summaries_toggle_mobile_data">mengalihkan data seluler</string>
+  <string name="app_ops_summaries_write_external_storage">menulis penyimpanan luar</string>
+  <string name="app_ops_summaries_turn_screen_on">menghidupkan layar</string>
+  <string name="app_ops_summaries_get_accounts">mendapatkan akun</string>
+  <string name="app_ops_summaries_toggle_wifi">hidup/matikan Wi-Fi</string>
+  <string name="app_ops_summaries_toggle_bluetooth">hidup/matikan bluetooth</string>
+  <string name="app_ops_summaries_start_at_boot">mulai saat boot</string>
+  <string name="app_ops_summaries_toggle_nfc">hidup/matikan NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">hidup/matikan data selular</string>
   <string name="app_ops_summaries_superuser">akses punca (root)</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Lokasi gersang</string>
@@ -375,16 +377,16 @@
   <string name="app_ops_labels_modify_call_log">Ubah log panggilan</string>
   <string name="app_ops_labels_read_calendar">Baca kalendar</string>
   <string name="app_ops_labels_modify_calendar">Ubah kalendar</string>
-  <string name="app_ops_labels_wifi_scan">Tinjau Wi-Fi</string>
+  <string name="app_ops_labels_wifi_scan">Pindai Wi-Fi</string>
   <string name="app_ops_labels_notification">Pemberitahuan/Toast</string>
-  <string name="app_ops_labels_cell_scan">Tinjau jaringan</string>
+  <string name="app_ops_labels_cell_scan">Pindai jaringan</string>
   <string name="app_ops_labels_call_phone">Panggilan Telepon</string>
-  <string name="app_ops_labels_read_sms">Membaca SMS</string>
-  <string name="app_ops_labels_write_sms">Menulis SMS</string>
+  <string name="app_ops_labels_read_sms">Baca SMS</string>
+  <string name="app_ops_labels_write_sms">Tulis SMS</string>
   <string name="app_ops_labels_receive_sms">Menerima SMS</string>
-  <string name="app_ops_labels_receive_emergency_sms">Menerima SMS darurat</string>
+  <string name="app_ops_labels_receive_emergency_sms">Terima SMS darurat</string>
   <string name="app_ops_labels_receive_mms">Menerima MMS</string>
-  <string name="app_ops_labels_receive_wap_push">Menerima Wireless Application Protocol push</string>
+  <string name="app_ops_labels_receive_wap_push">Menerima WAP push</string>
   <string name="app_ops_labels_send_sms">Kirim SMS</string>
   <string name="app_ops_labels_read_icc_sms">Membaca ICC SMS</string>
   <string name="app_ops_labels_write_icc_sms">Menulis ICC SMS</string>
@@ -408,16 +410,16 @@
   <string name="app_ops_labels_keep_awake">Tetap terjaga</string>
   <string name="app_ops_labels_monitor_location">Memantau lokasi</string>
   <string name="app_ops_labels_monitor_high_power_location">Memantau lokasi daya tinggi</string>
-  <string name="app_ops_labels_get_usage_stats">Dapakan statistik penggunaan</string>
+  <string name="app_ops_labels_get_usage_stats">Dapatkan statistik penggunaan</string>
   <string name="app_ops_labels_mute_unmute_microphone">Bungkam/bunyikan mikrofon</string>
   <string name="app_ops_labels_toast_window">Tampilkan toast</string>
   <string name="app_ops_labels_project_media">Proyek media</string>
   <string name="app_ops_labels_activate_vpn">Aktifkan VPN</string>
-  <string name="app_ops_labels_write_wallpaper">Menulis gambar latar</string>
+  <string name="app_ops_labels_write_wallpaper">Menulis wallpaper</string>
   <string name="app_ops_labels_assist_structure">Membantu struktur</string>
-  <string name="app_ops_labels_assist_screenshot">Bantu cuplikan layar</string>
+  <string name="app_ops_labels_assist_screenshot">Membantu tangkapan layar</string>
   <string name="app_ops_labels_read_phone_state">Membaca kondisi ponsel</string>
-  <string name="app_ops_labels_add_voicemail">Menambahkan pesan suara</string>
+  <string name="app_ops_labels_add_voicemail">Tambah pesan suara</string>
   <string name="app_ops_labels_use_sip">Menggunakan SIP</string>
   <string name="app_ops_labels_make_call">Buat panggilan</string>
   <string name="app_ops_labels_use_fingerprint">Gunakan sidik jari</string>
@@ -425,15 +427,15 @@
   <string name="app_ops_labels_read_cell_broadcasts">Baca siaran seluler</string>
   <string name="app_ops_labels_mock_location">Palsukan lokasi</string>
   <string name="app_ops_labels_read_external_storage">Baca penyimpanan eksternal</string>
-  <string name="app_ops_labels_write_external_storage">Tulis untuk penyimpanan eksternal</string>
-  <string name="app_ops_labels_turn_screen_on">Aktifkan layar</string>
-  <string name="app_ops_labels_get_accounts">Dapatkan akun</string>
-  <string name="app_ops_labels_toggle_wifi">Beralih ke Wi-Fi</string>
-  <string name="app_ops_labels_toggle_bluetooth">Beralih ke bluetooth</string>
-  <string name="app_ops_labels_start_at_boot">Mulai saat but</string>
-  <string name="app_ops_labels_toggle_nfc">Beralih ke NFC</string>
-  <string name="app_ops_labels_toggle_mobile_data">Mengalihkan data seluler</string>
-  <string name="app_ops_labels_superuser">Akses punca (root)</string>
+  <string name="app_ops_labels_write_external_storage">Menulis penyimpanan luar</string>
+  <string name="app_ops_labels_turn_screen_on">Menghidupkan layar</string>
+  <string name="app_ops_labels_get_accounts">Mendapatkan akun</string>
+  <string name="app_ops_labels_toggle_wifi">Hidup/matikan Wi-Fi</string>
+  <string name="app_ops_labels_toggle_bluetooth">Hidup/matikan bluetooth</string>
+  <string name="app_ops_labels_start_at_boot">Mulai saat boot</string>
+  <string name="app_ops_labels_toggle_nfc">Hidup/matikan NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Hidup/matikan data seluler</string>
+  <string name="app_ops_labels_superuser">Akses root</string>
   <!-- App ops permissions -->
   <string name="app_ops_permissions_allowed">Diperbolehkan</string>
   <string name="app_ops_permissions_ignored">Diabaikan</string>
@@ -443,7 +445,7 @@
   <string name="app_ops_allowed_count">Diizinkan: <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Ditolak: <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Diizinkan: <xliff:g id="count">%1$s</xliff:g>; ditolak: <xliff:g id="count">%2$s</xliff:g></string>
-  <string name="app_ops_disabled_by_optimization">Dinonaktifkan oleh pengoptimuman baterai</string>
+  <string name="app_ops_disabled_by_optimization">Dinonaktifkan oleh optimasi baterai</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Tampilkan aplikasi pengguna</string>
   <string name="app_ops_show_system_apps">Tampilkan aplikasi bawaan</string>
@@ -458,10 +460,10 @@
   <string name="button_pref_title">Tombol</string>
   <string name="hardware_keys_power_key_title">Tombol power</string>
   <string name="hardware_keys_home_key_title">Tombol beranda</string>
-  <string name="hardware_keys_back_key_title">Tombol Back</string>
-  <string name="hardware_keys_menu_key_title">Tombol Menu</string>
-  <string name="hardware_keys_assist_key_title">Tombol penelusuran</string>
-  <string name="hardware_keys_appswitch_key_title">Tombol terbaru</string>
+  <string name="hardware_keys_back_key_title">Tombol kembali</string>
+  <string name="hardware_keys_menu_key_title">Tombol menu</string>
+  <string name="hardware_keys_assist_key_title">Tombol cari</string>
+  <string name="hardware_keys_appswitch_key_title">Tombol Recents</string>
   <string name="hardware_keys_camera_key_title">Tombol kamera</string>
   <string name="hardware_keys_volume_keys_title">Tombol Volume</string>
   <string name="hardware_keys_short_press_title">Tindakan tekan pendek tombol</string>
@@ -469,33 +471,33 @@
   <string name="hardware_keys_double_tap_title">Tindakan dua kali ketuk tombol</string>
   <string name="hardware_keys_action_nothing">Tidak ada tindakan</string>
   <string name="hardware_keys_action_menu">Buka/Tutup menu</string>
-  <string name="hardware_keys_action_app_switch">Pengalih aplikasi terbaru</string>
-  <string name="hardware_keys_action_search">Asisten penelusuran</string>
+  <string name="hardware_keys_action_app_switch">Recent apps switcher</string>
+  <string name="hardware_keys_action_search">Asisten pencarian</string>
   <string name="hardware_keys_action_voice_search">Penelusuran suara</string>
-  <string name="hardware_keys_action_in_app_search">Penelusuran di dalam aplikasi</string>
+  <string name="hardware_keys_action_in_app_search">Penelusuran di dalam app</string>
   <string name="hardware_keys_action_launch_camera">Luncurkan Kamera</string>
   <string name="hardware_keys_action_sleep">Matikan layar</string>
   <string name="hardware_keys_action_last_app">Aplikasi terakhir</string>
   <string name="camera_sleep_on_release_title">Intip layar</string>
-  <string name="camera_sleep_on_release_summary">Tekan setengah akan menyalakan layar hanya saat tombol tertekan</string>
+  <string name="camera_sleep_on_release_summary">Menekan setengah akan menyalakan layar hanya saat tombol tertekan</string>
   <string name="camera_launch_title">Luncurkan Kamera</string>
   <string name="camera_launch_summary">Tekan lama dan lepas akan meluncurkan kamera</string>
-  <string name="volbtn_music_controls_title">Kendalikan pemutaran</string>
+  <string name="volbtn_music_controls_title">Kontrol pemutaran</string>
   <string name="volbtn_music_controls_summary">Ketika layar dimatikan, menekan dan menahan tombol volume akan menelusuri trek musik</string>
-  <string name="volbtn_cursor_control_title">Kendali kursor papan ketik</string>
-  <string name="volbtn_cursor_control_off">Dinonaktifkan</string>
+  <string name="volbtn_cursor_control_title">Kendali kursor keyboard</string>
+  <string name="volbtn_cursor_control_off">Dimatikan</string>
   <string name="volbtn_cursor_control_on">Volume atas/bawah menggerakkan kursor kiri/kanan</string>
   <string name="volbtn_cursor_control_on_reverse">Volume atas/bawah menggerakkan kursor kanan/kiri</string>
-  <string name="power_end_call_title">Akhiri panggilan</string>
+  <string name="power_end_call_title">Akhir panggilan</string>
   <string name="power_end_call_summary">Menekan tombol power akan mengakhiri panggilan aktif</string>
   <string name="swap_volume_buttons_title">Reorientasi</string>
-  <string name="swap_volume_buttons_summary">Swap tombol volume ketika layar diputar</string>
+  <string name="swap_volume_buttons_summary">Tukar fungsi tombol volume ketika layar diputar</string>
   <string name="button_wake_title">Bangunkan perangkat</string>
   <string name="home_answer_call_title">Jawab panggilan</string>
   <string name="home_answer_call_summary">Menekan tombol beranda akan menjawab panggilan masuk saat ini</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">Lampu latar adaptif</string>
-  <string name="adaptive_backlight_summary">Sesuaikan dengan dinamis kecerahan lampu latar layar untuk memaksimalkan baterai sambil mempertahankan kegunaan</string>
+  <string name="adaptive_backlight_summary">Dinamis menyesuaikan kecerahan backlight display untuk memaksimalkan masa pakai baterai dan tetap menjaga kegunaan</string>
   <!-- Sunlight readability enhancement screen -->
   <string name="sunlight_enhancement_title">Peningkatan sinar matahari</string>
   <string name="sunlight_enhancement_summary">Tingkatkan kecerahan tampilan dan keterbacaan di bawah sinar matahari cerah</string>
@@ -505,9 +507,9 @@
   <!-- Key backlight -->
   <string name="button_backlight_title">Lampu latar</string>
   <string name="button_backlight_enabled">Cahaya tombol</string>
-  <string name="keyboard_backlight_enabled">Terangi papan ketik</string>
+  <string name="keyboard_backlight_enabled">Cahaya keyboard</string>
   <string name="button_backlight_seekbar_title">Tombol kecerahan</string>
-  <string name="keyboard_backlight_seekbar_title">Kecerahan papan ketik</string>
+  <string name="keyboard_backlight_seekbar_title">Kecerahan keyboard</string>
   <string name="backlight_timeout_title">Waktu habis iluminasi</string>
   <string name="backlight_timeout_unlimited">Jangan Matikan</string>
   <string name="backlight_summary_disabled">Dinonaktifkan</string>
@@ -518,21 +520,21 @@
   <string name="gesture_settings_title">Gerakan</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menu power</string>
-  <string name="power_menu_reboot_title">Menu but ulang</string>
-  <string name="power_menu_screenshot_title">Cuplikan layar</string>
-  <string name="power_menu_airplane_title">Modus pesawat</string>
-  <string name="power_menu_users_title">Pengalih pengguna</string>
+  <string name="power_menu_reboot_title">Menu reboot</string>
+  <string name="power_menu_screenshot_title">Tangkap layar</string>
+  <string name="power_menu_airplane_title">Mode pesawat</string>
+  <string name="power_menu_users_title">Beralih pengguna</string>
   <string name="power_menu_settings_title">Pintasan pengaturan</string>
   <string name="power_menu_lockdown_title">Penguncian perangkat</string>
-  <string name="power_menu_bug_report_title">Laporan galat fungsi</string>
+  <string name="power_menu_bug_report_title">Laporan bug</string>
   <string name="power_menu_sound_title">Panel suara</string>
-  <string name="power_menu_bug_report_disabled">Pelaporan galat fungsi dinonaktifkan dalam opsi pengembang</string>
+  <string name="power_menu_bug_report_disabled">Pelaporan bug dinonaktifkan dalam opsi pengembang</string>
   <!-- Buttons - Enable navbar -->
   <string name="disable_navkeys_title">Aktifkan bilah navigasi pada layar</string>
   <string name="disable_navkeys_summary">Aktifkan layar navigasi bar dan menonaktifkan tombol pada perangkat keras</string>
   <!-- tap-to-wake -->
   <string name="double_tap_to_wake_title">Ketuk dua kali untuk bangun</string>
-  <string name="double_tap_to_wake_summary">Ketuk dua kali pada layar untuk menyalakan tampilan</string>
+  <string name="double_tap_to_wake_summary">Ketuk dua kali pada layar untuk menghidupkan layar</string>
   <!-- tap-to-sleep -->
   <string name="double_tap_to_sleep_title">Ketuk dua kali untuk tidur</string>
   <string name="double_tap_to_sleep_summary">Ketuk dua kali pada status bar untuk mematikan tampilan</string>
@@ -549,6 +551,7 @@
   <string name="volume_adjust_sounds_title">Penyesuaian volume suara</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Intensitas penggetar</string>
+  <string name="vibrator_warning">Nilai lebih tinggi dari %1$d%% tidak direkomendasikan</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kalibrasi warna</string>
   <string name="color_calibration_summary">Menyesuaikan layar warna</string>
@@ -566,7 +569,7 @@
   <string name="display_rotation_disabled">Dinonaktifkan</string>
   <string name="display_rotation_unit">derajat</string>
   <string name="display_lockscreen_rotation_title">Putar layar kunci</string>
-  <string name="display_rotation_category_title">Modus rotasi</string>
+  <string name="display_rotation_category_title">Mode rotasi</string>
   <string name="display_rotation_0_title">0 derajat</string>
   <string name="display_rotation_90_title">90 derajat</string>
   <string name="display_rotation_180_title">180 derajat</string>
@@ -600,8 +603,14 @@
   <string name="live_display_color_profile_photography_summary">Reproduksi warna yang sempurna untuk foto</string>
   <string name="live_display_color_profile_basic_title">Dasar</string>
   <string name="live_display_color_profile_basic_summary">Gunakan tampilan yang belum disesuaikan</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptif</string>
+  <string name="live_display_color_profile_adaptive_summary">Warna beradaptasi dengan kondisi sekitar</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Penyesuaian Gambar</string>
+  <string name="picture_adjustment_summary">Sesuaikan warna, saturasi, intensitas, dan kontras</string>
+  <string name="adj_hue_title">Hue</string>
   <string name="adj_saturation_title">Saturasi</string>
+  <string name="adj_intensity_title">Intensitas</string>
   <string name="adj_contrast_title">Kontras</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikon pemilih</string>
@@ -658,8 +667,8 @@
   <string name="lto_download_data_wifi_only_on">Melalui jaringan apa pun</string>
   <string name="lto_download_data_wifi_only_off">Hanya melalui jaringan Wi\u2011Fi</string>
   <string name="volume_keys_control_ring_stream_title">Kontrol volume nada dering</string>
-  <string name="volume_keys_control_ring_stream_summary_on">Tombol volume mengatur volume nada dering</string>
-  <string name="volume_keys_control_ring_stream_summary_off">Tombol volume mengatur volume media</string>
+  <string name="volume_keys_control_ring_stream_summary_on">Tombol volume mengontrol volume nada dering</string>
+  <string name="volume_keys_control_ring_stream_summary_off">Tombol volume mengontrol volume media</string>
   <string name="category_calibration">Kalibrasi</string>
   <string name="display_and_lights">Tampilan &amp; lampu</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
@@ -684,7 +693,7 @@
   <string name="status_bar_quick_qs_pulldown_summary">%1$s tepi dari bar status dapat ditarik ke bawah untuk Pengaturan Cepat</string>
   <string name="status_bar_quick_qs_pulldown_summary_left">Kiri</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">Kanan</string>
-  <string name="status_bar_quick_qs_pulldown_off">Nonaktif</string>
+  <string name="status_bar_quick_qs_pulldown_off">Mati</string>
   <string name="status_bar_quick_qs_pulldown_left">Kiri</string>
   <string name="status_bar_quick_qs_pulldown_right">Kanan</string>
   <!-- Status bar - Clock -->
@@ -711,7 +720,7 @@
   <string name="status_bar_battery_percentage_text_inside">Di dalam ikon</string>
   <string name="status_bar_battery_percentage_text_next">Di samping ikon</string>
   <!-- Status bar - icon blacklist -->
-  <string name="status_bar_icons_title">Baris Ikon status</string>
+  <string name="status_bar_icons_title">Ikon Status bar</string>
   <string name="status_bar_icons_summary">Atur baris Ikon yang ditampilkan</string>
   <!-- EdgeGesture service -->
   <string name="edge_gesture_service_title">Blokir isyarat sentuhan peristiwa</string>
@@ -723,15 +732,15 @@
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">Privasi</string>
   <!-- Privacy Guard -->
-  <string name="privacy_guard_default_title">Diaktifkan secara baku</string>
-  <string name="privacy_guard_default_summary">Mengaktifkan secara baku untuk aplikasi yang baru diinstal</string>
+  <string name="privacy_guard_default_title">Diaktifkan secara standar</string>
+  <string name="privacy_guard_default_summary">Mengaktifkan secara standar untuk aplikasi yang baru dipasang</string>
   <string name="privacy_guard_manager_title">Penjaga Privasi</string>
   <string name="privacy_guard_manager_summary">Kelola aplikasi yang memiliki akses ke data pribadi Anda</string>
-  <string name="privacy_guard_no_user_apps">Tidak ada aplikasi yang terinstal</string>
+  <string name="privacy_guard_no_user_apps">Tidak ada aplikasi yang terpasang</string>
   <string name="privacy_guard_help_title">Bantuan</string>
-  <string name="privacy_guard_reset_title">Atur kembali</string>
-  <string name="privacy_guard_reset_text">Atur ulang izin?</string>
-  <string name="privacy_guard_help_text">Di layar ini Anda dapat memilih aplikasi Privacy Guard yang harus aktif dengan mengetuk aplikasinya secara sederhana. Aplikasi yang terpilih tidak akan dapat mengakses ke data personal Anda seperti kontak, pesan, atau log telepon. Tekan dan tahan entri aplikasi dapat membuka detail app tersebut.\n\nAplikasi bawaan tidak ditampilkan secara baku tapi dapat di tampilkan dengan memilih pilihan respektif.</string>
+  <string name="privacy_guard_reset_title">Set ulang</string>
+  <string name="privacy_guard_reset_text">Setel ulang izin?</string>
+  <string name="privacy_guard_help_text">Di layar ini anda dapat memilih aplikasi Penjaga Privasi yang harus aktif dengan cara mengetuk aplikasinya. Aplikasi yang terpilih tidak akan dapat mengakses ke data pribadi anda seperti kontak, pesan, atau log telepon. Tekan dan tahan entri aplikasi dapat membuka detail app tersebut.\n\nAplikasi bawaan tidak ditampilkan secara standar tapi dapat di tampilkan dengan memilih pilihan respektif.</string>
   <string name="privacy_guard_manager_show_system_apps">Tampilkan aplikasi bawaan</string>
   <string name="privacy_guard_advanced_settings_title">Lanjutan</string>
   <string name="privacy_guard_notification_title">Tampilkan pemberitahuan</string>
@@ -761,12 +770,12 @@
   <string name="autoperf_summary">Secara otomatis pilih modus baterai yang sesuai untuk berbagai aplikasi</string>
   <string name="perf_profile_title">Modus baterai</string>
   <!-- Memory -->
-  <string name="memory_startup_apps_title">Aplikasi yang dimulai saat but</string>
+  <string name="memory_startup_apps_title">Aplikasi yang dimulai saat boot</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">Nada pemberitahuan</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">But ulang lanjutan</string>
-  <string name="advanced_reboot_summary">Ketika tidak terkunci, sertakan opsi dalam menu Daya untuk but ulang ke pemulihan, bootloader, atau melakukan but ulang cepat</string>
+  <string name="advanced_reboot_title">Mulai ulang lanjutan</string>
+  <string name="advanced_reboot_summary">Ketika tidak terkunci, sertakan opsi dalam menu power untuk memulai ulang ke recovery, bootloader, atau mulai ulang cepat</string>
   <string name="category_interface">Antarmuka</string>
   <!-- Expanded desktop -->
   <string name="power_menu_expanded_desktop">Destop yang diperluas</string>
@@ -790,7 +799,7 @@
   <string name="voice_wakeup_retrain_title">Melatih suara Anda</string>
   <string name="voice_wakeup_activity_title">Kegiatan untuk memulai</string>
   <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="voice_wakeup_needs_dial_permission_warning">Beker Bersuara perlu izin bertelepon untuk memilih kontak Sambung Langsung.</string>
+  <string name="voice_wakeup_needs_dial_permission_warning">Beker Bersuara perlu izin memanggil untuk memilih kontak Sambung Langsung.</string>
   <string name="picker_activities">Aktivitas</string>
   <string name="select_custom_app_title">Pilih aplikasi khusus</string>
   <string name="select_custom_activity_title">Pilih aktivitas khusus</string>
@@ -805,10 +814,10 @@
   <string name="blacklist_summary">Anda tidak akan menerima panggilan atau pesan dari nomor telepon yang ada di daftar penelepon yang diblokir</string>
   <string name="blacklist_notify">Tampilkan pemberitahuan</string>
   <string name="blacklist_private_numbers_title">Nomor pribadi</string>
-  <string name="blacklist_private_numbers_summary_disabled">Tidak memblokir panggilan dari nomor pribadi</string>
+  <string name="blacklist_private_numbers_summary_disabled">Jangan blokir panggilan dari nomor pribadi</string>
   <string name="blacklist_private_numbers_summary">Blokir panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor pribadi</string>
   <string name="blacklist_unknown_numbers_title">Nomor tidak diketahui</string>
-  <string name="blacklist_unknown_numbers_summary_disabled">Tidak memblokir panggilan atau pesan dari angka-angka yang tidak ada dalam daftar kontak</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">Jangan blokir panggilan atau pesan dari angka-angka yang tidak ada dalam daftar kontak</string>
   <string name="blacklist_unknown_numbers_summary">Blok panggilan masuk <xliff:g id="type">%s</xliff:g> dari nomor-nomor yang tidak ada dalam daftar kontak</string>
   <string name="blacklist_summary_type_calls_only">panggilan</string>
   <string name="blacklist_summary_type_messages_only">pesan</string>
@@ -817,7 +826,7 @@
   <string name="blacklist_regex_summary">Gunakan . sebagai wildcard dan * untuk pengulangan. Misalnya 123.* blok nomor dimulai dengan 123 dan .* 123.* blok angka yang mengandung 123</string>
   <string name="blacklist_policy_block_calls">Blokir panggilan masuk</string>
   <string name="blacklist_policy_block_messages">Blokir pesan masuk</string>
-  <string name="blacklist_bad_number_add">Tidak dapat menambahkan nomor telepon yang tidak sesuai untuk daftar penelepon yang diblokir</string>
+  <string name="blacklist_bad_number_add">Tidak dapat menambahkan nomor telepon yang tidak sesuai ke daftar penelepon yang diblokir</string>
   <!-- Blacklist management -->
   <string name="remove_blacklist_number_title">Hapus Nomor</string>
   <string name="remove_blacklist_entry">Apakah Anda ingin menghapus nomor telepon yang diblokir ini?</string>
@@ -826,13 +835,13 @@
   <string name="app_security_title">Keamanan aplikasi</string>
   <string name="sms_security_check_limit_title">Batas pesan SMS</string>
   <string name="sms_security_check_limit_summary">Aplikasi dapat mengirim %d pesan dalam 1 menit sebelum konfirmasi</string>
-  <string name="sms_security_check_limit_summary_none">Aplikasi tidak diizinkan untuk mengirim pesan tanpa konfirmasi</string>
+  <string name="sms_security_check_limit_summary_none">Aplikasi tidak diizinkan untuk mengirin pesan tanpa konfirmasi</string>
   <string name="sms_security_check_limit_none">Tidak ada</string>
   <!-- Notification spamfilter -->
   <string name="spam_added_title">Ditambahkan %1$s</string>
   <string name="spam_last_blocked_title">Terakhir diblokir %1$s</string>
   <string name="block_notifications_title">Pemberitahuan penyaringan</string>
-  <string name="block_notifications_summary">Kelola pemberitahuan yang diabaikan dan filter</string>
+  <string name="block_notifications_summary">Kelola pemberitahuan yang diabaikan dan saring</string>
   <string name="no_filters_title">Belum ada penyaring</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
@@ -854,14 +863,14 @@
   <string name="stats_collection_summary">Ketika diaktifkan, izinkan pengumpulan metrik</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">Atur kembali pola</string>
-  <string name="lockpattern_settings_reset_summary">Masukkan akun surel utama dan sandi yang terkait untuk mengatur ulang kunci pola</string>
+  <string name="lockpattern_settings_reset_summary">Masukkan email akun utama dan kata sandi yang terkait untuk mengatur kembali kunci pola</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">Atur kembali</string>
   <string name="menu_hidden_apps_reset_lock">Atur kembali pola kunci</string>
-  <string name="protected_apps">Aplikasi yang di lindungi</string>
+  <string name="protected_apps">Aplikasi dilindungi</string>
   <string name="protected_apps_summary">Kelola aplikasi yang tersembunyi dengan kunci aman</string>
   <string name="saving_protected_components">Menyimpan kondisi komponen\u2026</string>
-  <string name="pa_login_username_hint">Nama pengguna (surel)</string>
+  <string name="pa_login_username_hint">Nama pengguna (email)</string>
   <string name="pa_login_password_hint">Kata sandi</string>
   <string name="pa_login_submit_button">Masuk</string>
   <string name="pa_login_checking_password">Memeriksa akun\u2026</string>
@@ -891,18 +900,18 @@
   <string name="title_general">Umum</string>
   <string name="advanced">Lanjutan</string>
   <string name="link_volume_option_title">Hubungkan volume nada dering &amp; pemberitahuan</string>
-  <string name="lcd_density_prompt_message">Beberapa aplikasi mungkin tidak berfungsi pada DPI yang tidak standar.\n\n Ini akan menyalakan ulang ponsel Anda.</string>
+  <string name="lcd_density_prompt_message">Beberapa aplikasi mungkin tidak berfungsi pada DPI yang tidak standar.\n\n Ini akan memulai ulang perangkat anda.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Nomor telepon APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
-  <string name="duplicate_apn_error_title">Gandakan APN</string>
-  <string name="duplicate_apn_error_message">APN ini sudah ada. Membuang atau mengubah parameter.</string>
+  <string name="duplicate_apn_error_title">Duplikat APN</string>
+  <string name="duplicate_apn_error_message">APN ini sudah ada. Membuang atau ubah parameter.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> adalah <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
   <string name="sim_disabled">dinonaktifkan</string>
   <string name="sim_missing">hilang atau rusak</string>
   <string name="sim_enabler_need_disable_sim">Kartu SIM akan dinonaktifkan. Apakah Anda ingin melanjutkan?</string>
   <string name="sim_enabler_will_disable_sim_title">Perhatian</string>
-  <string name="sim_enabler_need_switch_data_service">SIM ini akan dinonaktifkan dan SIM <xliff:g id="slotid">%1$s </xliff:g> akan digunakan untuk layanan data. Apakah Anda yakin Anda ingin melanjutkan?</string>
+  <string name="sim_enabler_need_switch_data_service">SIM ini akan dinonaktifkan dan SIM <xliff:g id="slotid">%1$s </xliff:g> akan digunakan untuk layanan data. Apakah Anda yakin ingin melanjutkan?</string>
   <string name="sim_enabler_airplane_on">Tidak dapat melakukan operasi saat modus pesawat aktif.</string>
   <string name="sim_enabler_in_call">Tidak dapat melakukan operasi saat dalam panggilan.</string>
   <string name="sim_enabler_both_inactive">Tidak dapat menonaktifkan semua kartu SIM</string>
@@ -926,7 +935,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_events">kegiatan</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
-  <string name="zen_mode_summary_selected_callers">penelepon yang terpilih</string>
+  <string name="zen_mode_summary_selected_callers">penelepon terpilih</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">pesan terpilih</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
@@ -934,13 +943,13 @@
   <string name="maximum_head_level">Kepala: %1$s W/kg</string>
   <string name="maximum_body_level">Tubuh: %1$s W/kg</string>
   <!-- IC Codes -->
-  <string name="ic_code_model">Modusl: %1$s</string>
+  <string name="ic_code_model">Model: %1$s</string>
   <string name="ic_code_full">IC: %1$s</string>
   <string name="sim_ringtone_title">Nada dering SIM %d</string>
   <!-- label for application name -->
   <string name="app_name_label_cm">App:</string>
   <!-- label for last time used -->
-  <string name="last_time_used_label_cm">Terakhir kali digunakan:</string>
+  <string name="last_time_used_label_cm">Terakhir digunakan:</string>
   <!-- label for usage time -->
   <string name="usage_time_label_cm">Waktu penggunaan:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
@@ -961,22 +970,22 @@
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Lainnya</string>
   <!-- Wi-Fi tethering inactivity timeout -->
-  <string name="hotstpot_inactivity_timeout_text">Batas waktu area bersinyal Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_text">Batas akhir Wi\u2011Fi hostspot</string>
   <string name="hotstpot_inactivity_timeout_never">Tidak pernah</string>
   <string name="hotstpot_inactivity_timeout_1_minute">1 menit</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 menit</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 menit</string>
-  <string name="hotstpot_inactivity_timeout_never_summary_text">Area bersinyal Wi\u2011Fi portabel tak akan habis berlaku</string>
-  <string name="hotstpot_inactivity_timeout_summary_text">Area bersinyal Wi\u2011Fi portabel akan habis berlaku sesudah <xliff:g id="timeout">%1$s</xliff:g></string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">Portabel HosWi\u2011Fi hostspot tidak pernah berakhir</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">Portabel Wi\u2011Fi hotspot akan berkahir setelah <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
-  <string name="live_lock_screen_title">Layar kunci Hidup</string>
+  <string name="live_lock_screen_title">Layar Kunci Live</string>
   <!-- Live lock screen summary -->
-  <string name="live_lock_screen_summary">Mengaktifkan dan mengkonfigurasi layar kunci Hidup</string>
+  <string name="live_lock_screen_summary">Mengaktifkan dan mengkonfigurasi Layar Kunci Live</string>
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Pengaturan</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="live_lock_screen_settings_disabled_prompt">Untuk melihat layar kunci Hidup tersedia, Aktifkan layar kunci Hidup.</string>
+  <string name="live_lock_screen_settings_disabled_prompt">Untuk melihat Layar Kunci Live tersedia, Aktifkan Layar Kunci Live.</string>
   <string name="interruptions_ignore_while_media_title">Cegah penurunan suara</string>
   <string name="interruptions_ignore_while_media_summary">Jangan kurangi volume pemutaran media ketika ada pemberitahuan baru</string>
   <!-- CM Legal -->
@@ -1012,20 +1021,21 @@
   <string name="allow_background_both">Melalui data seluler &amp; Wi\u2011Fi</string>
   <string name="allow_background_wlan">Hanya melalui Wi\u2011Fi</string>
   <string name="allow_background_none">Tidak ada akses</string>
-  <string name="mobile_data_alert">Lansiran data seluler</string>
+  <string name="mobile_data_alert">Peringatan data selular</string>
   <string name="mobile_data_alert_summary">Beri tahu ketika aplikasi menggunakan data dalam jumlah besar</string>
-  <string name="data_usage_menu_enable_data_alerts">Aktifkan lansiran penggunaan data</string>
-  <string name="data_usage_menu_disable_data_alerts">Nonaktifkan lansiran penggunaan data</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktifkan peringatan penggunaan data</string>
+  <string name="data_usage_menu_disable_data_alerts">Nonaktifkan peringatan penggunaan data</string>
   <string name="data_usage_menu_reset_stats">Atur ulang statistik data</string>
-  <string name="reset_data_stats_msg">Ini akan menghapus semua informasi pelacakan dari dahulu sampai sekarang</string>
+  <string name="reset_data_stats_msg">Ini akan menghapus semua informasi pelacakan data dari dulu sampai sekarang</string>
   <string name="reset_stats_confirm">Konfirmasi</string>
   <string name="restrict_cellular_access_title">Batasi akses data seluler</string>
   <string name="restrict_cellular_access_summary">Nonaktifkan akses data pada jaringan seluler</string>
   <string name="restrict_cellular_access_dialog_title">Batasi akses data seluler?</string>
-  <string name="restrict_cellular_access_dialog_summary">Fitur ini dapat menyebabkan sebuah aplikasi yang bergantung pada akses jaringan untuk berhenti bekerja apabila hanya jaringan seluler yang tersedia.\n\nAnda dapat menemukan kontrol penggunaan data yang lebih tepat dalam Pengaturan yang tersedia dalam aplikasi.</string>
+  <string name="restrict_cellular_access_dialog_summary">Fitur ini dapat menyebabkan sebuah aplikasi yang bergantung pada akses jaringan berhenti bekerja ketika hanya jaringan selular yang tersedia.\n\nAnda dapat menemukan kontrol penggunaan data yang tepat dalam setelan yang tersedia dalam aplikasi.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operator jaringan</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Latar belakang kabur</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Tampilkan cuaca</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1034,9 +1044,30 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Tiadakan pemberitahuan tetap pada layar kunci</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Tidak pernah menampilkan pemberitahuan tetap dari aplikasi ini pada layar kunci</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Tingkatkan kontrol radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Matikan otomatis beban MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Hidupkan otomatis beban MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Matikan debug VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Hidupkan debug VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Matikan debug VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Hidupkan debug VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Matikan debug WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Hidupkan debug WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Matikan log radio ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">Hidupkan log radio ADB</string>
+  <string name="cm_radio_info_diag_log_on_label">Matikan log Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Hidupkan log Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Wallpaper</string>
+  <string name="not_available_with_app">Tidak tersedia dengan %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Tempatkan sensor sidik jari pada <xliff:g id="sensor_location">%1$s</xliff:g> telepon anda.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">kembali</string>
+  <string name="security_settings_fingerprint_sensor_location_front">depan</string>
+  <string name="security_settings_fingerprint_sensor_location_left">sisi kiri</string>
+  <string name="security_settings_fingerprint_sensor_location_right">sisi kanan</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Suara: <xliff:g id="voice_status">%1$s</xliff:g> / Data: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 667c072..62d4d60 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="root_access_adb">ADBのみ</string>
   <string name="root_access_all">アプリとADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">ルートアクセスを管理</string>
+  <string name="root_appops_summary">ルートの規則を表示またはコントロールする</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -549,6 +551,7 @@
   <string name="volume_adjust_sounds_title">音量調整の音</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">バイブレーションの強さ</string>
+  <string name="vibrator_warning">%1$d%%より大きい値は推奨されません</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">色の調整</string>
   <string name="color_calibration_summary">画面の色を調整する</string>
@@ -600,8 +603,14 @@
   <string name="live_display_color_profile_photography_summary">写真の完全な色再現</string>
   <string name="live_display_color_profile_basic_title">基本</string>
   <string name="live_display_color_profile_basic_summary">無調整のディスプレイを使用する</string>
+  <string name="live_display_color_profile_adaptive_title">自動</string>
+  <string name="live_display_color_profile_adaptive_summary">色を周囲の状況に適応する</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">画像調整</string>
+  <string name="picture_adjustment_summary">色彩、彩度、輝度、コントラストを調整する</string>
+  <string name="adj_hue_title">色彩</string>
   <string name="adj_saturation_title">彩度</string>
+  <string name="adj_intensity_title">輝度</string>
   <string name="adj_contrast_title">コントラスト</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">入力方法の選択のアイコン</string>
@@ -824,7 +833,7 @@
   <string name="select_contact">連絡先を選択</string>
   <!-- Sms security limit -->
   <string name="app_security_title">アプリのセキュリティ</string>
-  <string name="sms_security_check_limit_title">SMSメッセージの制限</string>
+  <string name="sms_security_check_limit_title">SMSメッセージの上限</string>
   <string name="sms_security_check_limit_summary">アプリは確認をする前に1分間に%d通のメッセージを送信することができます</string>
   <string name="sms_security_check_limit_summary_none">アプリは許可無くメッセージを送信することはできません</string>
   <string name="sms_security_check_limit_none">なし</string>
@@ -1053,11 +1062,12 @@
   <string name="lockscreen_wallpaper_title">壁紙</string>
   <string name="not_available_with_app">%1$sでは利用できません</string>
   <!-- Format string for fingerprint location message -->
-  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">携帯電話の<xliff:g id="sensor_location">%1$s</xliff:g>にある指紋センサーを探してください。</string>
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">端末の<xliff:g id="sensor_location">%1$s</xliff:g>にある指紋認証センサーを探します。</string>
   <!-- Fingerprint sensor locations -->
   <string name="security_settings_fingerprint_sensor_location_back">背面</string>
   <string name="security_settings_fingerprint_sensor_location_front">前面</string>
   <string name="security_settings_fingerprint_sensor_location_left">左側面</string>
   <string name="security_settings_fingerprint_sensor_location_right">右側面</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">音声: <xliff:g id="voice_status">%1$s</xliff:g> / データ: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 1154e41..4d1b51d 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Kun ADB</string>
   <string name="root_access_all">Apps og ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Administrer root tilganger</string>
+  <string name="root_appops_summary">Se over og endre root reglene</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -1006,7 +1008,7 @@
   <string name="privacy_guard_internet_category">Internett</string>
   <!-- Weather -->
   <string name="weather_settings_title">Vær</string>
-  <string name="weather_settings_no_services_prompt">Ingen vær leverandør tjeneste installert</string>
+  <string name="weather_settings_no_services_prompt">Ingen værleverandør tjeneste installert</string>
   <string name="weather_settings_button">Leverandørinnstillinger</string>
   <string name="weather_settings_activity_not_found">Kan ikke starte innstillingsmenyen for denne leverandøren</string>
   <string name="weather_settings_add_weather_provider">Legg til vær leverandør</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 74abd36..ecb531a 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -22,9 +22,9 @@
     <item quantity="other">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stappen verwijderd van de opties voor ontwikkelaars.</item>
   </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">U heeft de opties voor ontwikkelaars ingeschakeld.</string>
+  <string name="show_dev_on_cm">U hebt de opties voor ontwikkelaars ingeschakeld!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Niet nodig, u heeft de opties voor ontwikkelaars al ingeschakeld.</string>
+  <string name="show_dev_already_cm">Niet nodig, u hebt de opties voor ontwikkelaars al ingeschakeld.</string>
   <!-- Launch Dev Tools -->
   <string name="development_tools_title">Opties voor ontwikkelaars</string>
   <!-- Development shortcut -->
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Alleen ADB</string>
   <string name="root_access_all">Apps en ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Root-toegang beheren</string>
+  <string name="root_appops_summary">Root-instellingen bekijken en beheren</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index e6fe116..5a44d61 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -596,6 +596,7 @@
   <string name="live_display_color_profile_photography_summary">Najlepsza reprodukcja kolorów na zdjęciach</string>
   <string name="live_display_color_profile_basic_title">Podstawowe</string>
   <string name="live_display_color_profile_basic_summary">Używaj nieskalibrowanego wyświetlacza</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptacyjny</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="adj_saturation_title">Nasycenie</string>
   <string name="adj_contrast_title">Kontrast</string>
@@ -1024,6 +1025,7 @@
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatorzy sieci</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Rozmycie tła</string>
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Pokaż na ekranie blokady</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 7258eb3..8637955 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Somente ADB</string>
   <string name="root_access_all">Aplicativos e ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gerenciar acessos de superusuário</string>
+  <string name="root_appops_summary">Visualizar e controlar as regras de superusuário</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 7f728ae..8890637 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Só ADB</string>
   <string name="root_access_all">Aplicações e ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Gerir os acessos root</string>
+  <string name="root_appops_summary">Ver e controlar as regras de root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -605,7 +607,11 @@
   <string name="live_display_color_profile_adaptive_title">Adaptável</string>
   <string name="live_display_color_profile_adaptive_summary">As cores adaptam-se às condições ambientais</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Ajuste da imagem</string>
+  <string name="picture_adjustment_summary">Ajustar a tonalidade, a saturação, a intensidade e o contraste</string>
+  <string name="adj_hue_title">Tonalidade</string>
   <string name="adj_saturation_title">Saturação</string>
+  <string name="adj_intensity_title">Intensidade</string>
   <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ícone de seleção</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 2ecb17a..939912d 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -40,6 +40,8 @@
   <string name="root_access_adb">Только для ADB</string>
   <string name="root_access_all">Для приложений и ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Права суперпользователя</string>
+  <string name="root_appops_summary">Просмотр и управление разрешениями для прав суперпользователя</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -551,6 +553,7 @@
   <string name="volume_adjust_sounds_title">Звук при регулировке громкости</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Мощность вибросигнала</string>
+  <string name="vibrator_warning">Не рекомендуется устанавливать значения свыше %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Цвет</string>
   <string name="color_calibration_summary">Настройка цветопередачи экрана</string>
@@ -605,7 +608,11 @@
   <string name="live_display_color_profile_adaptive_title">Адаптивный</string>
   <string name="live_display_color_profile_adaptive_summary">Цвета адаптируются к условиям окружающей среды</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Регулировка изображения</string>
+  <string name="picture_adjustment_summary">Отрегулируйте оттенок, насыщенность, глубину и контрастность</string>
+  <string name="adj_hue_title">Оттенок</string>
   <string name="adj_saturation_title">Насыщенность</string>
+  <string name="adj_intensity_title">Насыщенность</string>
   <string name="adj_contrast_title">Контрастность</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Значок выбора метода ввода</string>
@@ -1064,4 +1071,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">левой грани</string>
   <string name="security_settings_fingerprint_sensor_location_right">правой грани</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Голосовая связь: <xliff:g id="voice_status">%1$s</xliff:g> / Передача данных: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index b6d81cd..bb86baf 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -40,6 +40,8 @@
   <string name="root_access_adb">Само ADB</string>
   <string name="root_access_all">Апликације и ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Управљај приступом руту</string>
+  <string name="root_appops_summary">Види и контролиши правила рута</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index caf4e92..6f6529c 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -879,6 +879,11 @@
         <![CDATA[<b>تۆھپىلارلار سانى:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
                  <b>تاپشۇرۇش سانى:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
                  <b>ئەڭ ئاخىرى يېڭىلاش:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">تۆھپە ئۇچۇرى</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>تۆھپىلارلار سانى:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>تاپشۇرۇش سانى:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>ئەڭ ئاخىرى يېڭىلاش:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">ئاۋازلار</string>
   <string name="notification_manager">ئۇقتۇرۇشلار</string>
   <string name="lockscreen_settings">قۇلۇپ ئېكرانى</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index c4756db..71f4dbf 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="root_access_adb">仅限于 ADB</string>
   <string name="root_access_all">应用与 ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">管理 Root 访问</string>
+  <string name="root_appops_summary">查看和控制 Root 规则</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -604,7 +606,11 @@
   <string name="live_display_color_profile_adaptive_title">自适应</string>
   <string name="live_display_color_profile_adaptive_summary">环境条件颜色自适应</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">图片调整</string>
+  <string name="picture_adjustment_summary">调整色相、饱和度、亮度和对比度</string>
+  <string name="adj_hue_title">色相</string>
   <string name="adj_saturation_title">饱和度</string>
+  <string name="adj_intensity_title">亮度</string>
   <string name="adj_contrast_title">对比度</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">选择器图标</string>
-- 
cgit v1.1

-- 
cgit v1.1


From 333ca009c5e8c1c591b2a50351f2a18841a9e7ed Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Tue, 6 Sep 2016 20:06:44 -0700
Subject: Automatic translation import

Change-Id: I8cc54b3454ed30a329787931b8d0fcff0f11bf36
Ticket: -
---
 res/values-ca/cm_strings.xml | 14 +++++++-------
 res/values-cs/cm_strings.xml |  2 +-
 res/values-hu/cm_strings.xml |  4 ++++
 res/values-it/cm_strings.xml |  2 +-
 res/values-nl/cm_strings.xml | 38 ++++++++++++++++++++++++++++++++++++++
 res/values-pl/cm_strings.xml |  3 +++
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index ce7459a..221b56b 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -70,7 +70,7 @@
   <string name="ring_mode_normal">Normal</string>
   <string name="ring_mode_vibrate">Vibració</string>
   <string name="ring_mode_mute">Silenci</string>
-  <string name="settings_reset_button">Reestableix</string>
+  <string name="settings_reset_button">Restableix</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Perfils del sistema</string>
   <string name="profiles_add">Afegeix</string>
@@ -107,7 +107,7 @@
   <string name="duplicate_appgroup_name">Duplica el nom del grup d\'aplicacions!</string>
   <string name="rename_dialog_hint">Introdueix el nom del perfil</string>
   <!-- Reset Profiles -->
-  <string name="profile_reset_title">Reseteja</string>
+  <string name="profile_reset_title">Restableix</string>
   <string name="profile_reset_message">Vols esborrar tots els perfils creats per l\'usuari i els grups d\'aplicacions i restaurar-los als ajustaments predeterminats?</string>
   <!-- Delete confimation messages -->
   <string name="profile_app_delete_confirm">Vols treure aquesta aplicació?</string>
@@ -564,7 +564,7 @@
   <string name="headset_connect_player_summary">Inicia l\'aplicació de música predeterminada quan es connectin els auriculars</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioritat automàtica</string>
-  <string name="auto_brightness_reset_button">Reseteja</string>
+  <string name="auto_brightness_reset_button">Restableix</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">Rotació</string>
   <string name="display_rotation_disabled">Desactivada</string>
@@ -740,7 +740,7 @@
   <string name="privacy_guard_no_user_apps">No hi ha aplicacions instal·lades</string>
   <string name="privacy_guard_help_title">Ajuda</string>
   <string name="privacy_guard_reset_title">Reinicia</string>
-  <string name="privacy_guard_reset_text">Reiniciar permisos?</string>
+  <string name="privacy_guard_reset_text">Vols restablir els permisos?</string>
   <string name="privacy_guard_help_text">En aquesta pantalla pots triar en quines aplicacions el Guarda de privacitat hauria d\'estar actiu picant simplement en elles. Les aplicacions seleccionades no podran accedir a les dades personals com els contactes, missatges o els registres de trucades. Fent una pulsació llarga en una entrada de l\'aplicació s\'obrirà la pantalla de detalls de l\'aplicació.\n\nLes aplicacions integrades per defecte no es mostren, però poden ser mostrades seleccionant l\'opció del menú respectiu.</string>
   <string name="privacy_guard_manager_show_system_apps">Mostra les aplicacions integrades</string>
   <string name="privacy_guard_advanced_settings_title">Avançat</string>
@@ -863,11 +863,11 @@
   <string name="stats_collection_title">Recollida d\'estadístiques</string>
   <string name="stats_collection_summary">Quan està activat, permet la recollida de mètriques</string>
   <!-- Protected apps lockpattern reset button -->
-  <string name="lockpattern_reset_button">Restaura el patró</string>
+  <string name="lockpattern_reset_button">Restableix el patró</string>
   <string name="lockpattern_settings_reset_summary">Introdueix el compte de correu electrònic principal i la contrasenya associada per restaurar el patró de bloqueig</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">Reinicia</string>
-  <string name="menu_hidden_apps_reset_lock">Reinicia el patró de bloqueig</string>
+  <string name="menu_hidden_apps_reset_lock">Restableix el patró de bloqueig</string>
   <string name="protected_apps">Aplicacions protegides</string>
   <string name="protected_apps_summary">Gestiona quines aplicacions s\'amaguen darrere el bloqueig segur</string>
   <string name="saving_protected_components">Desant l\'estat del component\u2026</string>
@@ -966,7 +966,7 @@
   <string name="factory_reset_erase_stored_content_summary_forced">Esborra la música, fotos, vídeos, i altres dades d\'usuari emmagatzemades en aquest dispositiu.\n\n<b>El contingut no es pot desar a causa del xifrat del dispositiu.</b></string>
   <string name="factory_reset_erase_sd_card">Formata la targeta SD</string>
   <string name="factory_reset_erase_sd_card_summary">Esborra totes les dades a la targeta SD, incloent-hi la música i les fotos</string>
-  <string name="factory_reset_warning_text_reset_now">RESTAURA ARA</string>
+  <string name="factory_reset_warning_text_reset_now">RESTABLEIX ARA</string>
   <string name="factory_reset_warning_text_message">S\'eliminaran tots els teus comptes, aplicacions, dades d\'aplicacions i ajustaments del sistema d\'aquest dispositiu. Això no es pot revertir.</string>
   <!-- Tethering & portable hotspot other category -->
   <string name="tethering_other_category_text">Altres</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 02687ef..c15a9b9 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -986,7 +986,7 @@
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Nastavení</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="live_lock_screen_settings_disabled_prompt">Por zobrazení dostupných živých zámků obrazovky nejprve tuto funkci zapněte.</string>
+  <string name="live_lock_screen_settings_disabled_prompt">Pro zobrazení dostupných živých zámků obrazovky nejprve tuto funkci zapněte.</string>
   <string name="interruptions_ignore_while_media_title">Zabránit potlačení hudby</string>
   <string name="interruptions_ignore_while_media_summary">Nesnižovat hlasitost přehrávané hudby při oznámení</string>
   <!-- CM Legal -->
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index b4c99d9..c945745 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -695,8 +695,12 @@
   <string name="status_bar_quick_qs_pulldown_summary_left">bal</string>
   <string name="status_bar_quick_qs_pulldown_summary_right">jobb</string>
   <string name="status_bar_quick_qs_pulldown_off">Ki</string>
+  <string name="status_bar_quick_qs_pulldown_left">Bal</string>
+  <string name="status_bar_quick_qs_pulldown_right">Jobb</string>
   <!-- Status bar - Clock -->
   <string name="status_bar_clock_style_title">Óra stílusa</string>
+  <string name="status_bar_clock_style_right">Jobb</string>
+  <string name="status_bar_clock_style_left">Bal</string>
   <string name="status_bar_clock_style_center">Középen</string>
   <string name="status_bar_clock_style_hidden">Rejtett</string>
   <string name="status_bar_am_pm_title">De/Du stílusa</string>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 3a63038..63146d2 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -1034,7 +1034,7 @@
   <string name="restrict_cellular_access_title">Limita utilizzo dati mobili</string>
   <string name="restrict_cellular_access_summary">Disattiva accesso su dati mobili</string>
   <string name="restrict_cellular_access_dialog_title">Applicare restrizione dati mobili?</string>
-  <string name="restrict_cellular_access_dialog_summary">Questa funzione potrebbe impedire ad un\'app di funzionare correttamente quando sei connesso solo con dati mobili.\n\nPotresti trovare controlli per l\'utilizzo dati pià appropriati all\'interno delle impostazioni dell\'app stessa.</string>
+  <string name="restrict_cellular_access_dialog_summary">Questa funzione potrebbe impedire ad un\'app di funzionare correttamente quando sei connesso solo con dati mobili.\n\nPotresti trovare controlli per l\'utilizzo dati più appropriati all\'interno delle impostazioni dell\'app stessa.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Operatori di rete</string>
   <!-- title for lock screen blur preference -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index ecb531a..8911f66 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -445,6 +445,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> toegestaan</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> geweigerd</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> toegestaan, <xliff:g id="count">%2$s</xliff:g> geweigerd</string>
+  <string name="app_ops_disabled_by_optimization">Uitgeschakeld door batterijoptimalisatie</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Gebruikersapps tonen</string>
   <string name="app_ops_show_system_apps">Ingebouwde apps tonen</string>
@@ -602,7 +603,10 @@
   <string name="live_display_color_profile_photography_summary">Perfecte kleurweergave voor foto\'s</string>
   <string name="live_display_color_profile_basic_title">Basis</string>
   <string name="live_display_color_profile_basic_summary">Scherm ongekalibreerd gebruiken</string>
+  <string name="live_display_color_profile_adaptive_title">Aanpasbaar</string>
+  <string name="live_display_color_profile_adaptive_summary">Kleuren passen zich aan aan de omgeving</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Beeldaanpassingen</string>
   <string name="picture_adjustment_summary">Tint, verzadiging, intensiteit en contrast aanpassen</string>
   <string name="adj_hue_title">Tint</string>
   <string name="adj_saturation_title">Verzadiging</string>
@@ -996,18 +1000,33 @@
   <string name="battery_info_status_charging_dock_ac">Opladen via dock (AC)</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <string name="battery_info_status_charging_dock_usb">Opladen via dock (USB)</string>
+  <string name="restrict_app_wlan_title">Wifi-gebruik van deze app uitschakelen</string>
+  <string name="restrict_app_wlan_summary">Voorkomen dat de app gebruik maakt van de wifi-gegevensverbinding</string>
+  <string name="restrict_app_cellular_title">Mobiel gegevensgebruik van deze app uitschakelen</string>
+  <string name="restrict_app_cellular_summary">Voorkomen dat de app gebruik maakt van de mobiele gegevensverbinding</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Weer</string>
+  <string name="weather_settings_no_services_prompt">Geen weeraanbiederservices geïnstalleerd</string>
+  <string name="weather_settings_button">Instellingen aanbieder</string>
   <string name="weather_settings_activity_not_found">Kan instellingenmenu van deze aanbieder niet openen</string>
+  <string name="weather_settings_add_weather_provider">Weeraanbieder toevoegen</string>
   <string name="weather_settings_general_settings_title">Algemeen</string>
+  <string name="weather_settings_providers_title">Aanbieders</string>
+  <string name="weather_settings_temp_units_title">Eenheid temperatuur</string>
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">weer</string>
   <string name="allow_background_wlan">Alleen via wifi</string>
   <string name="allow_background_none">Geen toegang</string>
   <string name="reset_stats_confirm">Bevestigen</string>
+  <string name="restrict_cellular_access_title">Toegang tot mobiele gegevens beperken</string>
+  <string name="restrict_cellular_access_summary">Gegevenstoegang op mobiele netwerken uitschakelen</string>
+  <string name="restrict_cellular_access_dialog_summary">Deze functie kan ervoor zorgen dat een app die internet nodig heeft stopt met werken als er alleen een mobiel netwerk beschikbaar is.\n\nU kunt meer relevante instellingen voor gegevensgebruik vinden in de instellingen van de app.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Netwerkproviders</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Achtergrond vervagen</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Weer weergeven</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1016,11 +1035,30 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Permanente meldingen op vergrendelingsscherm uitschakelen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Permanente meldingen van deze app niet weergeven op het vergrendelingsscherm</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Geavanceerde modeminstellingen</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Automatisch laden MBN uitschakelen</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Automatisch laden MBN inschakelen</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">VoLTE foutopsporing uitschakelen</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">VoLTE foutopsporing inschakelen</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">VT foutopsporing uitschakelen</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">VT foutopsporing inschakelen</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">WFC foutopsporing uitschakelen</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">WFC foutopsporing inschakelen</string>
+  <string name="cm_radio_info_adb_log_on_label">ADB radio logboek uitschakelen</string>
+  <string name="cm_radio_info_adb_log_off_label">ADB radio logboek inschakelen</string>
+  <string name="cm_radio_info_diag_log_on_label">Diag logboek uitschakelen</string>
+  <string name="cm_radio_info_diag_log_off_label">Diag logboek inschakelen</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">Achtergrond</string>
+  <string name="not_available_with_app">Niet beschikbaar met %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vind de vingerafdruksensor op de <xliff:g id="sensor_location">%1$s</xliff:g> van uw telefoon.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">achterkant</string>
+  <string name="security_settings_fingerprint_sensor_location_front">voorkant</string>
+  <string name="security_settings_fingerprint_sensor_location_left">linkerkant</string>
+  <string name="security_settings_fingerprint_sensor_location_right">rechterkant</string>
   <!-- SIM status format string -->
   <string name="sim_status_format_string">Spraak: <xliff:g id="voice_status">%1$s</xliff:g> / Gegevens: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 5a44d61..e014cea 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -597,6 +597,7 @@
   <string name="live_display_color_profile_basic_title">Podstawowe</string>
   <string name="live_display_color_profile_basic_summary">Używaj nieskalibrowanego wyświetlacza</string>
   <string name="live_display_color_profile_adaptive_title">Adaptacyjny</string>
+  <string name="live_display_color_profile_adaptive_summary">Dostosowanie kolorów do warunków otoczenia</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="adj_saturation_title">Nasycenie</string>
   <string name="adj_contrast_title">Kontrast</string>
@@ -1033,6 +1034,7 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Wyłącz trwałe powiadomienia na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Rozszerzona kontrola radiowa</string>
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">Wył. autom. ładowanie MBN</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">Wł. autom. ładowanie MBN</string>
@@ -1050,6 +1052,7 @@
   <string name="lockscreen_wallpaper_title">Tapeta</string>
   <string name="not_available_with_app">Niedostępne z %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Zlokalizuj czujnik odcisków palców na <xliff:g id="sensor_location">%1$s </xliff:g> telefonu.</string>
   <!-- Fingerprint sensor locations -->
   <string name="security_settings_fingerprint_sensor_location_back">tył</string>
   <string name="security_settings_fingerprint_sensor_location_front">przód</string>
-- 
cgit v1.1


From 31be1080addd6860b16aef708c1052f8c7d3b663 Mon Sep 17 00:00:00 2001
From: Janet Sun <jsun@cyngn.com>
Date: Fri, 5 Aug 2016 16:41:16 -0700
Subject: Settings: Hidden option to view Device ID On tapping 7 times, show
 the device ID and copy it to clipboard. CYNGNOS-3232

Change-Id: I1f18874be20671d66ccbe9132bce5d772be14dd9
---
 res/values/cm_strings.xml                        | 12 ++++++
 src/com/android/settings/DeviceInfoSettings.java | 49 +++++++++++++++++++++++-
 2 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 7f7b290..9879df7 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -15,6 +15,18 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+    <plurals name="show_device_id_countdown_cm">
+        <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from querying Device ID.</item>
+        <item quantity="other">You are now <xliff:g id="step_count">%1$d</xliff:g> steps away from querying Device ID.</item>
+    </plurals>
+    <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+    <string name="show_device_id_copied_cm">Device ID:[<xliff:g id="device_id">%1$s</xliff:g>] copied to clipboard</string>
+    <!--  Device Info screen. Confirmation that Device ID is not available -->
+    <string name="show_device_id_failed_cm">Device ID is not available on this build</string>
+    <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+    <string name="show_device_id_clipboard_label">Device ID</string>
+
     <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
     <plurals name="show_dev_countdown_cm">
         <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java
index 6a7d970..39eaa5a 100644
--- a/src/com/android/settings/DeviceInfoSettings.java
+++ b/src/com/android/settings/DeviceInfoSettings.java
@@ -17,6 +17,8 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
@@ -43,6 +45,7 @@ import android.text.format.DateFormat;
 import android.util.Log;
 import android.widget.Toast;
 
+import cyanogenmod.hardware.CMHardwareManager;
 import com.android.internal.logging.MetricsLogger;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Index;
@@ -91,10 +94,13 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
     private static final String KEY_CM_UPDATES = "cm_updates";
 
     static final int TAPS_TO_BE_A_DEVELOPER = 7;
+    static final int TAPS_TO_SHOW_DEVICEID = 7;
 
     long[] mHits = new long[3];
     int mDevHitCountdown;
+    int mDevIdCountdown;
     Toast mDevHitToast;
+    Toast mDevIdToast;
 
     @Override
     protected int getMetricsCategory() {
@@ -134,7 +140,10 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
         setStringSummary(KEY_DEVICE_MODEL, Build.MODEL);
         setStringSummary(KEY_BUILD_NUMBER, Build.DISPLAY);
         findPreference(KEY_BUILD_NUMBER).setEnabled(true);
-        findPreference(KEY_KERNEL_VERSION).setSummary(getFormattedKernelVersion());
+
+        final Preference kernelPref = findPreference(KEY_KERNEL_VERSION);
+        kernelPref.setEnabled(true);
+        kernelPref.setSummary(getFormattedKernelVersion());
         findPreference(KEY_MOD_VERSION).setSummary(
                 cyanogenmod.os.Build.CYANOGENMOD_DISPLAY_VERSION);
         findPreference(KEY_MOD_VERSION).setEnabled(true);
@@ -227,6 +236,8 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
                 Context.MODE_PRIVATE).getBoolean(DevelopmentSettings.PREF_SHOW,
                         android.os.Build.TYPE.equals("eng")) ? -1 : TAPS_TO_BE_A_DEVELOPER;
         mDevHitToast = null;
+        mDevIdCountdown = TAPS_TO_SHOW_DEVICEID;
+        mDevIdToast = null;
     }
 
     @Override
@@ -263,6 +274,42 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment implements In
                     Log.e(LOG_TAG, "Unable to start activity " + intent.toString());
                 }
             }
+        } else if (preference.getKey().equals(KEY_KERNEL_VERSION)) {
+
+            mDevIdCountdown --;
+            if (mDevIdCountdown == 0) {
+                final CMHardwareManager hwMgr = CMHardwareManager.getInstance(getActivity().getApplicationContext());
+                final String deviceID = hwMgr.getUniqueDeviceId();
+                CharSequence msg;
+                if (deviceID == null) {
+                    msg = getText(R.string.show_device_id_failed_cm);
+                }
+                else {
+                    final ClipboardManager clipboardMgr = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
+                    clipboardMgr.setPrimaryClip(ClipData.newPlainText(getResources().
+                                    getString(R.string.show_device_id_clipboard_label),
+                            deviceID));
+                    msg = getResources().getString(
+                            R.string.show_device_id_copied_cm, deviceID);
+                }
+
+                mDevIdToast = Toast.makeText(getActivity(), msg,
+                        Toast.LENGTH_LONG);
+                mDevIdToast.show();
+                mDevIdCountdown = TAPS_TO_SHOW_DEVICEID;
+            }
+            else if (mDevIdCountdown > 0
+                    && mDevIdCountdown < (TAPS_TO_SHOW_DEVICEID-2)) {
+
+                if (mDevIdToast != null) {
+                    mDevIdToast.cancel();
+                }
+                mDevIdToast = Toast.makeText(getActivity(), getResources().getQuantityString(
+                        R.plurals.show_device_id_countdown_cm, mDevIdCountdown, mDevIdCountdown),
+                        Toast.LENGTH_SHORT);
+                mDevIdToast.show();
+            }
+
         } else if (preference.getKey().equals(KEY_BUILD_NUMBER)) {
             // Don't enable developer options for secondary users.
             if (UserHandle.myUserId() != UserHandle.USER_OWNER) return true;
-- 
cgit v1.1


From 8ebe1736d53e80b55f862ab73427cf0f295d0d37 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 5 Sep 2016 09:14:26 +0200
Subject: Fix AIOOBE with root access disabled.

Page title and template array lengths got out of sync if root access was
disabled. Make sure this doesn't happen anymore by combining titles and
templates into a single list prior to filtering.

Change-Id: I069db9b9925887d6d80592eabe93b33abeaf0fe8
JIRA: CYAN-8028
---
 .../settings/applications/AppOpsSummary.java       | 63 +++++++++++-----------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index faefb65..4ec390d 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -32,6 +32,7 @@ import android.preference.PreferenceFrameLayout;
 import android.support.v13.app.FragmentPagerAdapter;
 import android.support.v4.view.PagerTabStrip;
 import android.support.v4.view.ViewPager;
+import android.util.Pair;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -62,37 +63,35 @@ public class AppOpsSummary extends InstrumentedFragment {
     private Activity mActivity;
     private SharedPreferences mPreferences;
 
-    CharSequence[] mPageNames;
-
-    int mCurPos;
-    int mPositionOffset;
-
     @Override
     protected int getMetricsCategory() {
         return MetricsLogger.APP_OPS_SUMMARY;
     }
 
-    class MyPagerAdapter extends FragmentPagerAdapter implements ViewPager.OnPageChangeListener {
-        private AppOpsState.OpsTemplate[] mPageTemplates;
+    static class MyPagerAdapter extends FragmentPagerAdapter
+            implements ViewPager.OnPageChangeListener {
+        private List<Pair<CharSequence, AppOpsState.OpsTemplate>> mPageData;
+        private int mCurPos;
 
-        public MyPagerAdapter(FragmentManager fm, AppOpsState.OpsTemplate[] templates) {
+        public MyPagerAdapter(FragmentManager fm,
+                List<Pair<CharSequence, AppOpsState.OpsTemplate>> data) {
             super(fm);
-            mPageTemplates = templates;
+            mPageData = data;
         }
 
         @Override
         public Fragment getItem(int position) {
-            return new AppOpsCategory(mPageTemplates[mPositionOffset + position]);
+            return new AppOpsCategory(mPageData.get(position).second);
         }
 
         @Override
         public int getCount() {
-            return mPageNames.length;
+            return mPageData.size();
         }
 
         @Override
         public CharSequence getPageTitle(int position) {
-            return mPageNames[position];
+            return mPageData.get(position).first;
         }
 
         @Override
@@ -134,23 +133,24 @@ public class AppOpsSummary extends InstrumentedFragment {
         mContentContainer = container;
         mRootView = rootView;
 
-        mPageNames = getResources().getTextArray(R.array.app_ops_categories_cm);
-
-        mPositionOffset = 0;
+        CharSequence[] pageNames = getResources().getTextArray(R.array.app_ops_categories_cm);
+        AppOpsState.OpsTemplate[] templates = AppOpsState.ALL_TEMPLATES;
+        assert(pageNames.length == templates.length);
 
         int specificTab = -1;
         Bundle bundle = getArguments();
         if (bundle != null) {
-            specificTab = Arrays.asList(mPageNames).indexOf(bundle.getString("appops_tab", ""));
-            if (specificTab >= 0) {
-                mPageNames = Arrays.copyOfRange(mPageNames, specificTab, specificTab + 1);
-                mPositionOffset = specificTab;
-            }
+            specificTab = Arrays.asList(pageNames).indexOf(bundle.getString("appops_tab", ""));
+        }
+
+        List<Pair<CharSequence, AppOpsState.OpsTemplate>> pageData = new ArrayList<>();
+        for (int i = 0; i < pageNames.length; i++) {
+            pageData.add(Pair.create(pageNames[i], templates[i]));
         }
+        filterPageData(pageData, specificTab);
 
         mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
-        mAdapter = new MyPagerAdapter(getChildFragmentManager(),
-                filterTemplates(AppOpsState.ALL_TEMPLATES));
+        mAdapter = new MyPagerAdapter(getChildFragmentManager(), pageData);
         mViewPager.setAdapter(mAdapter);
         mViewPager.setOnPageChangeListener(mAdapter);
         PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
@@ -174,16 +174,19 @@ public class AppOpsSummary extends InstrumentedFragment {
         return rootView;
     }
 
-    private AppOpsState.OpsTemplate[] filterTemplates(AppOpsState.OpsTemplate[] templates) {
-        List<AppOpsState.OpsTemplate> validTemplates = new ArrayList(templates.length);
-        for (AppOpsState.OpsTemplate template : templates) {
-            if (template == AppOpsState.SU_TEMPLATE
-                    && !DevelopmentSettings.isRootForAppsEnabled()) {
-                continue;
+    private void filterPageData(List<Pair<CharSequence, AppOpsState.OpsTemplate>> data, int tab) {
+        if (tab >= 0 && tab < data.size()) {
+            Pair<CharSequence, AppOpsState.OpsTemplate> item = data.get(tab);
+            data.clear();
+            data.add(item);
+        } else if (!DevelopmentSettings.isRootForAppsEnabled()) {
+            for (Pair<CharSequence, AppOpsState.OpsTemplate> item : data) {
+                if (item.second == AppOpsState.SU_TEMPLATE) {
+                    data.remove(item);
+                    return;
+                }
             }
-            validTemplates.add(template);
         }
-        return validTemplates.toArray(new AppOpsState.OpsTemplate[0]);
     }
 
     private boolean shouldShowUserApps() {
-- 
cgit v1.1


From f546f5ac58031809cffbc197f4bfabb638f8c7ca Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Sat, 10 Sep 2016 21:01:34 -0700
Subject: Automatic translation import

Change-Id: I239439318d045bb69f69cd88ee067e618d08baa4
Ticket: -
---
 res/values-af/cm_strings.xml      |  4 ++++
 res/values-am/cm_strings.xml      |  4 ++++
 res/values-ar/cm_strings.xml      |  4 ++++
 res/values-as-rIN/cm_strings.xml  |  4 ++++
 res/values-ast-rES/cm_strings.xml |  4 ++++
 res/values-az-rAZ/cm_strings.xml  |  4 ++++
 res/values-be/cm_strings.xml      |  4 ++++
 res/values-bg/cm_strings.xml      | 11 +++++++++++
 res/values-bn-rBD/cm_strings.xml  |  4 ++++
 res/values-br-rFR/cm_strings.xml  |  4 ++++
 res/values-bs-rBA/cm_strings.xml  |  4 ++++
 res/values-ca/cm_strings.xml      | 19 +++++++++++++++----
 res/values-cs/cm_strings.xml      |  4 ++++
 res/values-csb-rPL/cm_strings.xml |  4 ++++
 res/values-cy/cm_strings.xml      |  4 ++++
 res/values-da/cm_strings.xml      |  4 ++++
 res/values-de/cm_strings.xml      |  4 ++++
 res/values-el/cm_strings.xml      |  4 ++++
 res/values-en-rAU/cm_strings.xml  |  4 ++++
 res/values-en-rGB/cm_strings.xml  |  4 ++++
 res/values-en-rIN/cm_strings.xml  |  4 ++++
 res/values-en-rPT/cm_strings.xml  |  4 ++++
 res/values-eo/cm_strings.xml      |  4 ++++
 res/values-es-rCO/cm_strings.xml  |  4 ++++
 res/values-es-rMX/cm_strings.xml  |  4 ++++
 res/values-es-rUS/cm_strings.xml  |  4 ++++
 res/values-es/cm_strings.xml      |  4 ++++
 res/values-et-rEE/cm_strings.xml  |  4 ++++
 res/values-eu-rES/cm_strings.xml  | 11 +++++++++++
 res/values-fa/cm_strings.xml      |  4 ++++
 res/values-fi/cm_strings.xml      | 11 +++++++++++
 res/values-fil-rPH/cm_strings.xml |  4 ++++
 res/values-fr-rCA/cm_strings.xml  |  4 ++++
 res/values-fr/cm_strings.xml      |  4 ++++
 res/values-frp-rIT/cm_strings.xml |  4 ++++
 res/values-fy-rNL/cm_strings.xml  |  4 ++++
 res/values-ga-rIE/cm_strings.xml  |  4 ++++
 res/values-gd-rGB/cm_strings.xml  |  4 ++++
 res/values-gl-rES/cm_strings.xml  |  4 ++++
 res/values-gu-rIN/cm_strings.xml  |  4 ++++
 res/values-hi/cm_strings.xml      |  4 ++++
 res/values-hr/cm_strings.xml      | 12 ++++++++++++
 res/values-hu/cm_strings.xml      |  4 ++++
 res/values-hy-rAM/cm_strings.xml  |  4 ++++
 res/values-in/cm_strings.xml      |  4 ++++
 res/values-is-rIS/cm_strings.xml  |  4 ++++
 res/values-it/cm_strings.xml      |  4 ++++
 res/values-iw/cm_strings.xml      |  4 ++++
 res/values-ja/cm_strings.xml      |  4 ++++
 res/values-ka-rGE/cm_strings.xml  |  4 ++++
 res/values-kk-rKZ/cm_strings.xml  |  4 ++++
 res/values-km-rKH/cm_strings.xml  |  4 ++++
 res/values-kn-rIN/cm_strings.xml  |  4 ++++
 res/values-ko/cm_strings.xml      |  4 ++++
 res/values-ku/cm_strings.xml      |  4 ++++
 res/values-ky-rKG/cm_strings.xml  |  4 ++++
 res/values-lb/cm_strings.xml      |  4 ++++
 res/values-lo-rLA/cm_strings.xml  |  4 ++++
 res/values-lt/cm_strings.xml      |  4 ++++
 res/values-lv/cm_strings.xml      |  4 ++++
 res/values-mk-rMK/cm_strings.xml  |  4 ++++
 res/values-ml-rIN/cm_strings.xml  |  4 ++++
 res/values-mn-rMN/cm_strings.xml  |  4 ++++
 res/values-mr-rIN/cm_strings.xml  |  4 ++++
 res/values-ms-rMY/cm_strings.xml  |  4 ++++
 res/values-my-rMM/cm_strings.xml  |  4 ++++
 res/values-nb/cm_strings.xml      |  4 ++++
 res/values-ne-rNP/cm_strings.xml  |  4 ++++
 res/values-nl/cm_strings.xml      |  4 ++++
 res/values-oc-rFR/cm_strings.xml  |  4 ++++
 res/values-or-rIN/cm_strings.xml  |  4 ++++
 res/values-pa-rIN/cm_strings.xml  |  4 ++++
 res/values-pl/cm_strings.xml      |  4 ++++
 res/values-pt-rBR/cm_strings.xml  |  4 ++++
 res/values-pt-rPT/cm_strings.xml  |  4 ++++
 res/values-rm/cm_strings.xml      |  4 ++++
 res/values-ro/cm_strings.xml      |  4 ++++
 res/values-ru/cm_strings.xml      |  4 ++++
 res/values-si-rLK/cm_strings.xml  |  4 ++++
 res/values-sk/cm_strings.xml      |  4 ++++
 res/values-sl/cm_strings.xml      |  4 ++++
 res/values-sq-rAL/cm_strings.xml  |  4 ++++
 res/values-sr/cm_strings.xml      |  4 ++++
 res/values-sv/cm_strings.xml      |  4 ++++
 res/values-sw/cm_strings.xml      |  4 ++++
 res/values-ta-rIN/cm_strings.xml  |  4 ++++
 res/values-te-rIN/cm_strings.xml  |  4 ++++
 res/values-th/cm_strings.xml      |  4 ++++
 res/values-tr/cm_strings.xml      |  4 ++++
 res/values-ug/cm_strings.xml      |  4 ++++
 res/values-uk/cm_strings.xml      |  4 ++++
 res/values-ur-rPK/cm_strings.xml  |  4 ++++
 res/values-uz-rUZ/cm_strings.xml  |  4 ++++
 res/values-vi/cm_strings.xml      |  4 ++++
 res/values-zh-rCN/cm_strings.xml  |  4 ++++
 res/values-zh-rHK/cm_strings.xml  |  4 ++++
 res/values-zh-rTW/cm_strings.xml  |  4 ++++
 res/values-zu/cm_strings.xml      |  4 ++++
 98 files changed, 432 insertions(+), 4 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 6854f03..1582d9d 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Jy is nou <xliff:g id="step_count">%1$d</xliff:g> stap weg van bemagtigende ontwikkelaar opsies.</item>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 5353763..cc69081 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="zero">أنت الآن على بُعد <xliff:g id="step_count">%1$d</xliff:g> خطوة من تمكين خيارات المطور.</item>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index 811c6b1..c1d3c95 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">আপুনি এতিয়া ডেভেলপমেণ্ট ছেটিংচ সক্ষম কৰাৰ পৰা <xliff:g id="step_count">%1$d</xliff:g>টা পদক্ষেপ দূৰত আছে।</item>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index c873fb1..22a6da2 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Tas a <xliff:g id="step_count">%1$d</xliff:g> pasu d\'habilitar los axustes de desendolcu.</item>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index e99d6a5..f8df89c 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Tərtibatçı tənzimləmələrinin fəallaşdırılmasına <xliff:g id="step_count">%1$d</xliff:g> addım qaldı.</item>
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index ec1247d..7db746e 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Застаўся <xliff:g id="step_count">%1$d</xliff:g> крок для ўлучэння налад для распрацоўнікаў.</item>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index d75ffe3..328bfde 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -16,6 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Вече сте на <xliff:g id="step_count">%1$d </xliff:g> крачка от включването на идентификационният номер на устройството.</item>
+    <item quantity="other">Вече сте на <xliff:g id="step_count">%1$d </xliff:g> крачки от включването на идентификационният номер на устройството.</item>
+  </plurals>
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Идентификационният номер на устройството: [<xliff:g id="device_id">%1$s </xliff:g>] e копиран в клипборда</string>
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Идентификационният номер на устройството не е достъпно в тава изграждане</string>
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Идентификационният номер на устройството</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Вече сте на <xliff:g id="step_count">%1$d </xliff:g> крачка от включването на \"Опции на програмиста\".</item>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index 69e9583..cbbecb0 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-bs-rBA/cm_strings.xml
+++ b/res/values-bs-rBA/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 221b56b..58f6f1e 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -16,6 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Ara ets a <xliff:g id="step_count">%1$d</xliff:g> pas de consultar l\'ID del dispositiu.</item>
+    <item quantity="other">Ara ets a <xliff:g id="step_count">%1$d</xliff:g> passos de consultar l\'ID del dispositiu.</item>
+  </plurals>
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID del dispositiu:[<xliff:g id="device_id">%1$s</xliff:g>] copiat al portapapers</string>
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">L\'ID del dispositiu no està disponible en aquesta elaboració</string>
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID del dispositiu</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ara ets a <xliff:g id="step_count">%1$d</xliff:g> pas d\'habilitar les configuracions de desenvolupament.</item>
@@ -327,8 +338,8 @@
   <string name="app_ops_summaries_camera">càmera</string>
   <string name="app_ops_summaries_record_audio">enregistra so</string>
   <string name="app_ops_summaries_play_audio">reproduir so</string>
-  <string name="app_ops_summaries_read_clipboard">llegir portapapers</string>
-  <string name="app_ops_summaries_modify_clipboard">modificar portapapers</string>
+  <string name="app_ops_summaries_read_clipboard">llegir el portapapers</string>
+  <string name="app_ops_summaries_modify_clipboard">modificar el portapapers</string>
   <string name="app_ops_summaries_media_buttons">botons multimèdia</string>
   <string name="app_ops_summaries_audio_focus">focus del so</string>
   <string name="app_ops_summaries_master_volume">volum principal</string>
@@ -397,8 +408,8 @@
   <string name="app_ops_labels_camera">Càmera</string>
   <string name="app_ops_labels_record_audio">Enregistra so</string>
   <string name="app_ops_labels_play_audio">Reproduir so</string>
-  <string name="app_ops_labels_read_clipboard">Llegir portapapers</string>
-  <string name="app_ops_labels_modify_clipboard">Modificar portapapers</string>
+  <string name="app_ops_labels_read_clipboard">Llegir el portapapers</string>
+  <string name="app_ops_labels_modify_clipboard">Modificar el portapapers</string>
   <string name="app_ops_labels_media_buttons">Botons Multimèdia</string>
   <string name="app_ops_labels_audio_focus">Focus del so</string>
   <string name="app_ops_labels_master_volume">Volum principal</string>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index c15a9b9..835a695 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Už jste jen <xliff:g id="step_count">%1$d</xliff:g> krok od povolení vývojářských nastavení.</item>
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 76914e5..7c15463 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du er nu <xliff:g id="step_count">%1$d</xliff:g> skridt fra at aktivere Indstillinger for udviklere.</item>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 5c189ad..b333b47 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Sie sind <xliff:g id="step_count">%1$d</xliff:g> Schritt vom Aktivieren der Entwicklereinstellungen entfernt.</item>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index c18637f..92a55ed 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Απομένει <xliff:g id="step_count">%1$d</xliff:g> βήμα για να ενεργοποιήσετε τις ρυθμίσεις για προγραμματιστές.</item>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index f414205..e2d014e 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index f1e1725..068171d 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 44c35be..43e36e2 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">You are now <xliff:g id="step_count">%1$d</xliff:g> step away from enabling development settings.</item>
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 3500497..35f4e13 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Vi estas nun <xliff:g id="step_count">%1$d</xliff:g> paŝon antaŭ la aktivado de programadaj argordoj.</item>
diff --git a/res/values-es-rCO/cm_strings.xml b/res/values-es-rCO/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-es-rCO/cm_strings.xml
+++ b/res/values-es-rCO/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index b51bf2f..c71494c 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 7a978cd..7928a55 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ahora estás a <xliff:g id="step_count">%1$d </xliff:g> paso de activar las configuraciones de desarrollo.</item>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 7f4cacd..97f2718 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ahora estás a <xliff:g id="step_count">%1$d</xliff:g> paso de habilitar las opciones de desarrollo.</item>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 904e42b..9462628 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Olete <xliff:g id="step_count">%1$d</xliff:g> sammu kaugusel arendussätete lubamisest.</item>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index db46354..8ba8b25 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -16,6 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Gailuaren IDa kontsultatzeko urrats <xliff:g id="step_count">%1$d</xliff:g>era zaude.</item>
+    <item quantity="other">Gailuaren IDa kontsultatzeko <xliff:g id="step_count">%1$d</xliff:g> urratsetara zaude.</item>
+  </plurals>
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Gailuaren IDa:[<xliff:g id="device_id">%1$s</xliff:g>] arbelera kopiatu da</string>
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Gailuaren IDa ez dago eskuragarri konpilazio honetan</string>
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Gailuaren IDa</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Garapen ezarpenak gaitzeko urrats <xliff:g id="step_count">%1$d</xliff:g>era zaude.</item>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index be56a28..2600822 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">شما اکنون <xliff:g id="step_count">%1$d</xliff:g> ضربه با فعال‌سازی ابزارهای توسعه فاصله دارید.</item>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 1c0ddfb..9111f83 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -16,6 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Laitteen tunnus näytetään <xliff:g id="step_count">%1$d</xliff:g> vaiheen päästä.</item>
+    <item quantity="other">Laitteen tunnus näytetään <xliff:g id="step_count">%1$d</xliff:g> vaiheen päästä.</item>
+  </plurals>
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Laitteen tunnus:[<xliff:g id="device_id">%1$s</xliff:g>] kopioitu liitepöydälle</string>
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Laitteen tunnus ei saatavilla tässä koontiversiossa</string>
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Laitteen tunnus</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Kehittäjäasetukset otetaan käyttöön <xliff:g id="step_count">%1$d</xliff:g> vaiheen päästä.</item>
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index 4ba284e..c354662 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étape de l\'activation des paramètres de développement.
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index c908423..b4a0841 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ga-rIE/cm_strings.xml
+++ b/res/values-ga-rIE/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index d6efc97..37d4cfd 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Está a <xliff:g id="step_count">%1$d</xliff:g> paso de activar a configuración de desenvolvemento.</item>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index ea6e3d2..0d6b193 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">હવે તમે ડેવેલપમેન્ટ સેટિંગ્સ સક્ષમ કરવાથી <xliff:g id="step_count">%1$d</xliff:g> પગલા દૂર છો.</item>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index c562cde..70a8c54 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">विकास सेटिंग को सक्षम करने के लिए अब सिर्फ़ <xliff:g id="step_count">%1$d</xliff:g> चरण बाकी है।</item>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index cf70b37..d84ae3d 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -16,6 +16,18 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Sada ste <xliff:g id="step_count">%1$d</xliff:g> korak od slanja upita ID uređaja.</item>
+    <item quantity="few">Sada ste <xliff:g id="step_count">%1$d</xliff:g> koraka od slanja upita ID uređaja.</item>
+    <item quantity="other">Sada ste <xliff:g id="step_count">%1$d</xliff:g> koraka od slanja upita ID uređaja.</item>
+  </plurals>
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID uređaja: [<xliff:g id="device_id">%1$s</xliff:g>] kopiran u međuspremnik</string>
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID uređaja nije dostupan na ovoj verziji</string>
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID uređaja</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Sada ste <xliff:g id="step_count">%1$d</xliff:g> korak od omogućavanja razvojnih postavki.</item>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index c945745..d9d171a 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ön <xliff:g id="step_count">%1$d</xliff:g> lépésre van attól, hogy engedélyezze a fejlesztői beállításokat.</item>
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index d9e490f..a6e2c8e 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other"><xliff:g id="step_count">%1$d</xliff:g> langkah lagi untuk mengaktifkan opsi pengembang.</item>
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 63146d2..5419833 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ora sei ad <xliff:g id="step_count">%1$d</xliff:g> passo dall\'attivare le impostazioni di sviluppo.</item>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index 3f10d08..fe79418 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">רק עוד צעד <xliff:g id="step_count">%1$d</xliff:g> מהפעלת אפשרויות מפתח.</item>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 62d4d60..ae1fcdb 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">開発者向けオプションが有効になるまであと<xliff:g id="step_count">%1$d</xliff:g>ステップです。</item>
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 9a76f56..3bc96d6b 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">ನೀವು ಡೆವಲಪ್‍ಮೆಂಟ್ ಸೆಟ್ಟಿಂಗ್ಸ್ ಸಕ್ರಿಯಗೊಳಿಸಲು <xliff:g id="step_count">%1$d</xliff:g> ಹಂತದಷ್ತು ದೂರವಿದ್ದೀರಿ.</item>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 5c63a78..1328b83 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">개발자 설정을 활성화하려면 <xliff:g id="step_count">%1$d</xliff:g>회 더 누르십시오.</item>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 59f829a..0c9877e 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">تۆ ڕێکخستنی گەشەپێدەریت چالاککرد!</string>
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index 684487f..f1bfcb7 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du bass <xliff:g id="step_count">%1$d</xliff:g> Schrëtt dovun ewech, d\'Entwéckleroptiounen z\'aktivéieren.</item>
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index b052428..26aafcc 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Jūs esate <xliff:g id="step_count">%1$d</xliff:g> žingsniu toliau įgalinant kūrėjo parinktys.</item>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index b25abcd..93ebfc8 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index e1e9591..da7bc7d 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">ഡെവലപ്പ്മെന്റ് ക്രമീകരണങ്ങൾ പ്രാപ്തമാക്കുന്നതിന് നിങ്ങള്‍ %1$d ഘട്ടം അകലെയാണ്.</item>
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index 365ab22..fe86ace 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">विकास सेटिंग्ज सक्षम करण्यापासून तुम्ही <xliff:g id="step_count">%1$d</xliff:g> पायरी अनुपस्थित आहात.</item>
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 4d1b51d..a925a16 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du er nå <xliff:g id="step_count"> %1$d</xliff:g> skritt fra aktivering av utviklerinnstillinger.</item>
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 8911f66..63d0e43 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stap verwijderd van de opties voor ontwikkelaars.</item>
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 6f1ce99..e1844bd 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">ଉନ୍ନତି ସେଟିଂସମୂହ‍ ସଷମ କରାଯିବା ଠାରୁ ଆପଣ ବର୍ତ୍ତମାନ <xliff:g id="step_count">%1$d</xliff:g> ପର୍ଯ୍ୟାୟ ଦୂରରେ ଅଛନ୍ତି।</item>
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index e014cea..0cef5e1 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Aktywowałeś opcje programistyczne!</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 8637955..66b3313 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Você agora está a <xliff:g id="step_count">%1$d </xliff:g> passo de ativar as configurações de desenvolvimento.</item>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 8890637..5c57259 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Está agora a <xliff:g id="step_count">%1$d</xliff:g> passo de ativar as opções de programador.</item>
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index bcaaba2..e813172 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ești la <xliff:g id="step_count">%1$d</xliff:g> pas distanță de a activa opțiunile de dezvoltator.</item>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 939912d..0499570 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Нажмите ещё <xliff:g id="step_count">%1$d</xliff:g> раз, чтобы включить настройки для разработчиков.</item>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index b8c12d8..8d3fdc6 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 280e30a..525c882 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Teraz ste <xliff:g id="step_count">%1$d</xliff:g> krok od povolenia možnosti pre vývojárov.</item>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index cd6bcf4..42d6470 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> korak pred omogočanjem nastavitev za razvijalce.</item>
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index bb86baf..d4ae6ed 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Сада си <xliff:g id="step_count">%1$d</xliff:g> корак далеко од омогућавања развојних опција.</item>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index ab0af0f..a566804 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du är nu <xliff:g id="step_count">%1$d</xliff:g> steg från att aktivera utvecklingsinställningar.</item>
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 8565015..dce85e1 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">வளர்ச்சி அமைப்புகளை செயல்படுத்துவதற்கு <xliff:g id="step_count">%1$d</xliff:g>  படி தொலைவில் நீங்கள் இப்போது உள்ளீர்கள்.</item>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index 3c79d81..da78bc5 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">డెవలప్మెంట్ సెట్టింగులను ప్రారంభించడానికి ఇప్పుడు మీరు <xliff:g id="step_count">%1$d</xliff:g> అడుగు దూరంలో ఉన్నారు.</item>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 24e2cd5..f3d02a7 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">คุณเหลืออีก <xliff:g id="step_count">%1$d</xliff:g> ขั้นก่อนจะสามารถเปิดใช้งานการตั้งค่าการพัฒนา</item>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 646b3fa..096b560 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Geliştirici ayarlarının etkinleştirilmesi için <xliff:g id="step_count">%1$d</xliff:g> adım kaldı.</item>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 6f6529c..c9ddb86 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">ھازىر ئىجاتكارلار تاللانمىسىنى قوزغىتىشىڭىز ئۈچۈن <xliff:g id="step_count">%1$d</xliff:g> قەدەم قالدى.</item>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index f94f6e4..32cad28 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Залишився <xliff:g id="step_count">%1$d</xliff:g> крок для включення налаштувань для розробників.</item>
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 9425dbf..13c3db8 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">Hiện tại bạn còn <xliff:g id="step_count">%1$d</xliff:g> bước nữa để bật cài đặt nhà phát triển.</item>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 71f4dbf..0bb848d 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">还需 <xliff:g id="step_count">%1$d</xliff:g> 步就可以启用开发者选项。</item>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 9e0572f..2458a85 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 29aea03..3ce4d0a 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">剩下 <xliff:g id="step_count">%1$d</xliff:g> 個步驟啟用開發人員選項。</item>
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index 5d5b9d2..eadd497 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-- 
cgit v1.1

-- 
cgit v1.1


From 8bac7b3f128db6df21acbc8b7668d240e9bc1802 Mon Sep 17 00:00:00 2001
From: Marcos Marado <mmarado@cyngn.com>
Date: Fri, 15 Apr 2016 15:34:40 +0100
Subject: Don't crash while entering in DevelopmentSettings

...when there's no Backup Manager

Change-Id: I24261cfc7d2709d07b895899216ab38d4a757095
---
 src/com/android/settings/DevelopmentSettings.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 3666212..a30dba2 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -956,6 +956,10 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
 
     private void updatePasswordSummary() {
         try {
+            if (mBackupManager == null) {
+               Log.e(TAG, "Backup Manager is unavailable!");
+               return;
+            }
             if (mBackupManager.hasBackupPassword()) {
                 mPassword.setSummary(R.string.local_backup_password_summary_change);
             } else {
-- 
cgit v1.1


From 4a78446c3e9eab9c116e1523425d366f401ef13e Mon Sep 17 00:00:00 2001
From: Adrian DC <radian.dc@gmail.com>
Date: Mon, 9 Jun 2014 21:16:24 -0500
Subject: DevelopmentSettings: Add an opt-out for recovery updater

 * Some devices should not have this option,
    for instance all Sony devices supported on CyanogenMod
    already include the ROM's recovery inside the ramdisk
    and provide their own init_sony boot selection

 * Makes sure a user did not enable the option
    on old installations by disabling it if needed

 * Disable the recovery updater through the new overlay

 * Prevent recovery updater related features to run, and
    pass an additional context argument from BootReceiver
    to initializeUpdateRecoveryOption to access resources

 * Similar to the original CM 11.0 commit by Dan Pasanen

Change-Id: I1963e27e59353e1a7e26a4edf905bee6c9da0571
---
 res/values/config.xml                              |  3 +++
 src/com/android/settings/DevelopmentSettings.java  | 22 ++++++++++++++++++----
 .../android/settings/cyanogenmod/BootReceiver.java |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/res/values/config.xml b/res/values/config.xml
index 69707e3..aa97d3c 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -101,4 +101,7 @@
     <!-- Does the device allow for manual subscription provisioning? Only works for multi-sim devices,
          and currently depends on QC's proprietary telephony stack -->
     <bool name="config_enableManualSubProvisioning">true</bool>
+
+    <!-- Does the device allow updating the recovery. -->
+    <bool name="config_enableRecoveryUpdater">true</bool>
 </resources>
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index a30dba2..b5b89cb 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -519,6 +519,15 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
             removePreference(COLOR_TEMPERATURE_KEY);
             mColorTemperaturePreference = null;
         }
+
+        if (!getResources().getBoolean(R.bool.config_enableRecoveryUpdater)) {
+            removePreference(mUpdateRecovery);
+            mUpdateRecovery = null;
+            if (SystemProperties.getBoolean(UPDATE_RECOVERY_PROPERTY, false)) {
+                SystemProperties.set(UPDATE_RECOVERY_PROPERTY, "false");
+                pokeSystemProperties();
+            }
+        }
     }
 
     private ListPreference addListPreference(String prefKey) {
@@ -754,7 +763,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         updateRootAccessOptions();
         updateAdvancedRebootOptions();
         updateDevelopmentShortcutOptions();
-        updateUpdateRecoveryOptions();
+        if (mUpdateRecovery != null) {
+            updateUpdateRecoveryOptions();
+        }
         if (mColorTemperaturePreference != null) {
             updateColorTemperature();
         }
@@ -830,7 +841,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         resetAdbNotifyOptions();
         resetVerifyAppsOverUsbOptions();
         resetDevelopmentShortcutOptions();
-        resetUpdateRecoveryOptions();
+        if (mUpdateRecovery != null) {
+            resetUpdateRecoveryOptions();
+        }
         writeAnimationScaleOption(0, mWindowAnimationScale, null);
         writeAnimationScaleOption(1, mTransitionAnimationScale, null);
         writeAnimationScaleOption(2, mAnimatorDurationScale, null);
@@ -1855,8 +1868,9 @@ public class DevelopmentSettings extends SettingsPreferenceFragment
         }
     }
 
-    public static void initializeUpdateRecoveryOption() {
-        if (TextUtils.isEmpty(SystemProperties.get(UPDATE_RECOVERY_PROPERTY))) {
+    public static void initializeUpdateRecoveryOption(Context context) {
+        if (TextUtils.isEmpty(SystemProperties.get(UPDATE_RECOVERY_PROPERTY)) &&
+                context.getResources().getBoolean(R.bool.config_enableRecoveryUpdater)) {
             resetUpdateRecoveryOptions();
         }
     }
diff --git a/src/com/android/settings/cyanogenmod/BootReceiver.java b/src/com/android/settings/cyanogenmod/BootReceiver.java
index 20190e6..406ccb1 100644
--- a/src/com/android/settings/cyanogenmod/BootReceiver.java
+++ b/src/com/android/settings/cyanogenmod/BootReceiver.java
@@ -53,7 +53,7 @@ public class BootReceiver extends BroadcastReceiver {
         // Extract the contributors database
         ContributorsCloudFragment.extractContributorsCloudDatabase(ctx);
 
-        DevelopmentSettings.initializeUpdateRecoveryOption();
+        DevelopmentSettings.initializeUpdateRecoveryOption(ctx);
     }
 
     private boolean hasRestoredTunable(Context context) {
-- 
cgit v1.1


From e94c0727f5fa5cf95f832b9d2a457c01c1fe1b0c Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Sun, 18 Sep 2016 17:39:21 +0200
Subject: Settings: Notification light: Fix for app customization

If the list was filled with an app which gets deinstalled,
the previously introduced explanation is not shown anymore.
Make the display dependent on the real amount of added prefs,
not on the expected amount of apps in the list.

Change-Id: Id1f674d519a440e3d811d4dd565d760c045e9f84
---
 .../android/settings/notificationlight/NotificationLightSettings.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/notificationlight/NotificationLightSettings.java b/src/com/android/settings/notificationlight/NotificationLightSettings.java
index c4b55d4..b17918a 100644
--- a/src/com/android/settings/notificationlight/NotificationLightSettings.java
+++ b/src/com/android/settings/notificationlight/NotificationLightSettings.java
@@ -286,7 +286,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
             }
 
             /* Display a pref explaining how to add apps */
-            if (mPackages.size() == 0) {
+            if (mApplicationPrefList.getPreferenceCount() == 0) {
                 String summary = getResources().getString(
                         R.string.notification_light_no_apps_summary);
                 String useCustom = getResources().getString(
-- 
cgit v1.1


From 4b03da7757caf8a0dff2864ab6a2fac3afd91e39 Mon Sep 17 00:00:00 2001
From: Michael W <baddaemon87@gmail.com>
Date: Sun, 18 Sep 2016 11:17:28 +0200
Subject: Settings: Fix possible NPE

Checking applicationInfo on a null object causes a NPE
Check for null first and make the menu entry invisible in that case

Change-Id: I9c6c1156e8d809abf9f13a80eaa908317cba8bdc
Reference: BugDumps 20160909-15 L#39
---
 src/com/android/settings/applications/InstalledAppDetails.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 43c3489..ef3788c 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -413,9 +413,8 @@ public class InstalledAppDetails extends AppInfoBase
         mUpdatedSysApp = (mAppEntry.info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0;
         menu.findItem(UNINSTALL_UPDATES).setVisible(mUpdatedSysApp && !mAppControlRestricted);
 
-        if (mPackageInfo.applicationInfo != null) {
-            menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo.applicationInfo.protect);
-        }
+        menu.findItem(OPEN_PROTECTED_APPS).setVisible(mPackageInfo != null &&
+                mPackageInfo.applicationInfo != null && mPackageInfo.applicationInfo.protect);
     }
 
     @Override
-- 
cgit v1.1


From 6a9a0ba4ac871e3f25038af356df125e3fb1294c Mon Sep 17 00:00:00 2001
From: "pinky@build01" <jenkins@cyanogenmod.com>
Date: Sun, 25 Sep 2016 00:15:35 -0700
Subject: Automatic translation import

Change-Id: I351c2ff04445423b5404e6c5f610ad06bac3efc4
Ticket: -
---
 res/values-de/cm_strings.xml     |   7 +
 res/values-el/cm_strings.xml     |   7 +
 res/values-eo/arrays.xml         | 220 ++++++++++++++
 res/values-eo/cm_strings.xml     |   4 -
 res/values-eo/strings.xml        | 153 ++++++++++
 res/values-gl-rES/cm_strings.xml | 633 +++++++++++++++++++++++++++++++++++++++
 res/values-hu/cm_strings.xml     |   7 +
 res/values-it/cm_strings.xml     |   7 +
 res/values-iw/cm_strings.xml     |  11 +
 res/values-nb/cm_strings.xml     |   7 +
 res/values-nl/cm_strings.xml     |  19 +-
 res/values-pl/cm_strings.xml     |   2 +
 res/values-pt-rBR/cm_strings.xml |   7 +
 res/values-pt-rPT/cm_strings.xml |   9 +-
 res/values-ru/cm_strings.xml     |   8 +
 res/values-sl/cm_strings.xml     |   9 +
 res/values-sr/cm_strings.xml     |   7 +
 res/values-sv/cm_strings.xml     |   2 +
 res/values-zh-rCN/cm_strings.xml |   6 +
 19 files changed, 1119 insertions(+), 6 deletions(-)

diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index b333b47..fff52ff 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Sie sind <xliff:g id="step_count">%1$d</xliff:g> Schritt von der Abfrage der Geräte-ID entfernt.</item>
+    <item quantity="other">Sie sind <xliff:g id="step_count">%1$d</xliff:g> Schritte von der Abfrage der Geräte-ID entfernt.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Geräte-ID:[<xliff:g id="device_id">%1$s</xliff:g>] in die Zwischenablage kopiert</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Geräte-ID ist in diesem Build nicht verfügbar</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Geräte-ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Sie sind <xliff:g id="step_count">%1$d</xliff:g> Schritt vom Aktivieren der Entwicklereinstellungen entfernt.</item>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 92a55ed..b7f4b7d 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Απομένει <xliff:g id="step_count">%1$d</xliff:g> βήμα για να εμφανίσετε το αναγνωριστικό συσκευής.</item>
+    <item quantity="other">Απομένουν <xliff:g id="step_count">%1$d</xliff:g> βήματα για να εμφανίσετε το αναγνωριστικό συσκευής.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Το αναγνωριστικό συσκευής:[<xliff:g id="device_id">%1$s </xliff:g>] αντιγράφηκε στο πρόχειρο</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Το αναγνωριστικό συσκευής δεν είναι διαθέσιμο σε αυτό το build</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Αναγνωριστικό συσκευής</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Απομένει <xliff:g id="step_count">%1$d</xliff:g> βήμα για να ενεργοποιήσετε τις ρυθμίσεις για προγραμματιστές.</item>
diff --git a/res/values-eo/arrays.xml b/res/values-eo/arrays.xml
index 4acb887..2731296 100644
--- a/res/values-eo/arrays.xml
+++ b/res/values-eo/arrays.xml
@@ -23,18 +23,82 @@
          These values will be used as search terms for TimeZone displayName
          strings. -->
   <!-- The time zone picker screen has two levels.  The first level allows the user to choose a region. -->
+  <string-array name="timezone_filters">
+    <!-- The next level of the time zoner picker should show time zones from the Americas. -->
+    <item>Ameriko</item>
+    <!-- The next level of the time zoner picker should show time zones from Europe. -->
+    <item>Eŭropo</item>
+    <!-- The next level of the time zoner picker should show time zones from Africa. -->
+    <item>Afriko</item>
+    <!-- The next level of the time zoner picker should show time zones from Asia. -->
+    <item>Azio</item>
+    <!-- The next level of the time zoner picker should show time zones from Australia. -->
+    <item>Australia</item>
+    <!-- The next level of the time zoner picker should show time zones from Pacific. -->
+    <item>Pacific</item>
+    <!-- The next level of the time zoner picker should show time zones from ALL regions. -->
+    <item>All</item>
+  </string-array>
   <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+  <string-array name="screen_timeout_entries">
+    <item>15 sekundoj</item>
+    <item>30 sekundoj</item>
+    <item>1 minuto</item>
+    <item>2 minutoj</item>
+    <item>5 minutoj</item>
+    <item>10 minutoj</item>
+    <item>30 minutoj</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Display settings.  The delay in inactivity before the dream is shown. These are shown in a list dialog. -->
+  <string-array name="dream_timeout_entries">
+    <item>Neniam</item>
+    <item>15 sekundoj</item>
+    <item>30 sekundoj</item>
+    <item>1 minuto</item>
+    <item>2 minutoj</item>
+    <item>5 minutoj</item>
+    <item>10 minutoj</item>
+    <item>30 minutoj</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Security settings.  The delay after screen is turned off until device locks.
          These are shown in a list dialog. -->
+  <string-array name="lock_after_timeout_entries">
+    <item>Tuj</item>
+    <item>5 sekundoj</item>
+    <item>15 sekundoj</item>
+    <item>30 sekundoj</item>
+    <item>1 minuto</item>
+    <item>2 minutoj</item>
+    <item>5 minutoj</item>
+    <item>10 minutoj</item>
+    <item>30 minutoj</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- TTS settings -->
   <!-- Default speech rate choices -->
   <!-- Do not translate. -->
+  <string-array name="tts_rate_values">
+    <item>60</item>
+    <item>80</item>
+    <item>100</item>
+    <item>150</item>
+    <item>200</item>
+    <item>250</item>
+    <item>300</item>
+    <item>350</item>
+    <item>400</item>
+  </string-array>
   <!-- Default pitch choices -->
   <!-- Do not translate. -->
+  <string-array name="tts_pitch_values">
+    <item>50</item>
+    <item>80</item>
+    <item>100</item>
+    <item>120</item>
+    <item>150</item>
+  </string-array>
   <!-- Do not translate. -->
   <!-- Wi-Fi settings -->
   <!-- Match this with the order of NetworkInfo.DetailedState. -->
@@ -52,23 +116,68 @@
   <!-- Type of EAP method when EAP SIM, AKA, AKA' are not supported -->
   <!-- Wi-Fi AP band settings.  Either 2.4GHz or 5GHz. -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
+  <string-array name="wifi_ap_band_config_full">
+    <item>@string/wifi_ap_choose_2G</item>
+    <item>@string/wifi_ap_choose_5G</item>
+  </string-array>
+  <string-array name="wifi_ap_band_config_2G_only">
+    <item>@string/wifi_ap_choose_2G</item>
+  </string-array>
   <!-- Wi-Fi WPS setup for p2p connections.  -->
   <!-- Note that adding/removing/moving the items will need wifi settings code change. -->
   <!-- Match this with the order of WifiP2pDevice.Status -->
   <!-- Wi-Fi p2p settings device status message -->
   <!-- Bluetooth Settings -->
   <!-- Discoverable mode timeout options -->
+  <string-array name="bluetooth_visibility_timeout_entries">
+    <item>2 minutoj</item>
+    <item>5 minutoj</item>
+    <item>1 horo</item>
+    <item>Never time out</item>
+  </string-array>
   <!-- Match this with drawable.wifi_signal. -->
   <!-- Wi-Fi settings. The signal strength a Wi-Fi network has. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. -->
+  <string-array name="wifi_sleep_policy_entries">
+    <!-- Always keep Wi-Fi on when screen turns off. -->
+    <item>Ĉiam</item>
+    <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
+    <item>Only when plugged in</item>
+    <!-- Do not keep Wi-Fi on when screen turns off.  [CHAR LIMIT=40] -->
+    <item>Neniam</item>
+  </string-array>
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi sleep policy. Used when
          the device is Wi-Fi-only. [CHAR LIMIT=30] -->
+  <string-array name="wifi_sleep_policy_entries_wifi_only">
+    <!-- Always keep Wi-Fi on when screen turns off. -->
+    <item>Ĉiam</item>
+    <!-- Keep Wi-Fi on when screen turns off and plugged in.  When on battery, go to sleep when screen turns off. -->
+    <item>Only when plugged in</item>
+    <!-- Do not keep Wi-Fi on when screen turns off, for Wi-Fi-only devices, no other data connection -->
+    <item>Neniam</item>
+  </string-array>
   <!-- Match with wifi_sleep_policy_entries and the values of the settings in Settings class. -->
   <!-- Do not translate. -->
+  <string-array name="wifi_sleep_policy_values">
+    <!-- Do not translate. -->
+    <item>2</item>
+    <!-- Do not translate. -->
+    <item>1</item>
+    <!-- Do not translate. -->
+    <item>0</item>
+  </string-array>
   <!-- Data Usage settings. Range of data usage. -->
   <!-- Wi-Fi settings. Presented as a list dialog to the user to choose the Wi-Fi frequency band. -->
   <!-- Match with wifi_frequency_band_entries and the values of the settings in WifiManager. -->
   <!-- Do not translate. -->
+  <string-array name="wifi_frequency_band_values">
+    <!-- Do not translate. -->
+    <item>0</item>
+    <!-- Do not translate. -->
+    <item>1</item>
+    <!-- Do not translate. -->
+    <item>2</item>
+  </string-array>
   <!-- Display options for UsageStats class -->
   <!-- EAP method -->
   <!-- Phase 2 options for PEAP -->
@@ -84,8 +193,119 @@
   <!-- Apps on SD installation location options in ApplicationSettings -->
   <!-- Do not translate. -->
   <!-- Names of categories of app ops tabs -->
+  <string-array name="app_ops_categories">
+    <item>Loko</item>
+    <item>Personal</item>
+    <item>Messaging</item>
+    <item>Media</item>
+    <item>Aparato</item>
+  </string-array>
   <!-- User display names for app ops codes -->
+  <string-array name="app_ops_summaries">
+    <item>coarse location</item>
+    <item>fine location</item>
+    <item>GPS</item>
+    <item>vibrate</item>
+    <item>read contacts</item>
+    <item>modify contacts</item>
+    <item>read call log</item>
+    <item>modify call log</item>
+    <item>read calendar</item>
+    <item>modify calendar</item>
+    <item>wi-fi scan</item>
+    <item>sciigo</item>
+    <item>cell scan</item>
+    <item>call phone</item>
+    <item>read SMS</item>
+    <item>write SMS</item>
+    <item>receive SMS</item>
+    <item>receive emergency SMS</item>
+    <item>receive MMS</item>
+    <item>receive WAP push</item>
+    <item>send SMS</item>
+    <item>read ICC SMS</item>
+    <item>write ICC SMS</item>
+    <item>modify settings</item>
+    <item>draw on top</item>
+    <item>access notifications</item>
+    <item>camera</item>
+    <item>record audio</item>
+    <item>play audio</item>
+    <item>read clipboard</item>
+    <item>modify clipboard</item>
+    <item>media buttons</item>
+    <item>audio focus</item>
+    <item>master volume</item>
+    <item>voice volume</item>
+    <item>ring volume</item>
+    <item>media volume</item>
+    <item>alarm volume</item>
+    <item>notification volume</item>
+    <item>bluetooth volume</item>
+    <item>keep awake</item>
+    <item>monitor location</item>
+    <item>monitor high power location</item>
+    <item>get usage stats</item>
+    <item>mute/unmute microphone</item>
+    <item>project media</item>
+    <item>activate VPN</item>
+    <item>write wallpaper</item>
+    <item>assist structure</item>
+    <item>assist screenshot</item>
+  </string-array>
   <!-- User display names for app ops codes -->
+  <string-array name="app_ops_labels">
+    <item>Loko</item>
+    <item>Loko</item>
+    <item>Loko</item>
+    <item>Vibrate</item>
+    <item>Read contacts</item>
+    <item>Modify contacts</item>
+    <item>Read call log</item>
+    <item>Modify call log</item>
+    <item>Read calendar</item>
+    <item>Modify calendar</item>
+    <item>Loko</item>
+    <item>Post notification</item>
+    <item>Loko</item>
+    <item>Call phone</item>
+    <item>Read SMS/MMS</item>
+    <item>Write SMS/MMS</item>
+    <item>Receive SMS/MMS</item>
+    <item>Receive SMS/MMS</item>
+    <item>Receive SMS/MMS</item>
+    <item>Receive SMS/MMS</item>
+    <item>Send SMS/MMS</item>
+    <item>Read SMS/MMS</item>
+    <item>Write SMS/MMS</item>
+    <item>Modify settings</item>
+    <item>Draw on top</item>
+    <item>Access notifications</item>
+    <item>Camera</item>
+    <item>Record audio</item>
+    <item>Play audio</item>
+    <item>Read clipboard</item>
+    <item>Modify clipboard</item>
+    <item>Media buttons</item>
+    <item>Audio focus</item>
+    <item>Master volume</item>
+    <item>Voice volume</item>
+    <item>Ring volume</item>
+    <item>Media volume</item>
+    <item>Alarm volume</item>
+    <item>Notification volume</item>
+    <item>Bluetooth volume</item>
+    <item>Keep awake</item>
+    <item>Loko</item>
+    <item>Loko</item>
+    <item>Get usage stats</item>
+    <item>Mute/unmute microphone</item>
+    <item>Project media</item>
+    <item>Activate VPN</item>
+    <item>Write wallpaper</item>
+    <item>Assist structure</item>
+    <item>Assist screenshot</item>
+  </string-array>
   <!-- Titles for the list of long press timeout options. -->
   <!-- Values for the list of long press timeout options. -->
   <!-- Titles for captioning typeface preference. [CHAR LIMIT=35] -->
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 35f4e13..148d382 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -21,10 +21,6 @@
   <!--  Device Info screen. Confirmation that Device ID is not available -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
-  <plurals name="show_dev_countdown_cm">
-    <item quantity="one">Vi estas nun <xliff:g id="step_count">%1$d</xliff:g> paŝon antaŭ la aktivado de programadaj argordoj.</item>
-    <item quantity="other">Vi estas nun <xliff:g id="step_count">%1$d</xliff:g> paŝojn antaŭ la aktivado de programadaj argordoj.</item>
-  </plurals>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Vi ŝaltis la programadajn agordojn!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
diff --git a/res/values-eo/strings.xml b/res/values-eo/strings.xml
index 2216f6c..6d2c217 100644
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@ -16,7 +16,9 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- Strings for Dialog yes button -->
+  <string name="yes">"Jes"</string>
   <!-- Strings for Dialog no button -->
+  <string name="no">"Ne"</string>
   <!-- Strings for Dialog create button -->
   <!-- Strings for Dialog allow button -->
   <!-- Strings for Dialog deny button -->
@@ -24,6 +26,7 @@
   <!-- Strings for Dialog switch button [CHAR LIMIT=20] -->
   <!-- Device Info -->
   <!-- Device Info screen. Used for a status item's value when the proper value is not known -->
+  <string name="device_info_default">Nekonata</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
@@ -31,9 +34,11 @@
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Wireless and networks (Wi-Fi, Bluetooth, data usage...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Device (Sound, display, battery, applications...). [CHAR LIMIT=40] -->
+  <string name="header_category_device">Aparato</string>
   <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. Personal (Accounts, security, language, backup...). [CHAR LIMIT=40] -->
   <!-- Settings main menu category heading. System (Updates, data, accessibility, about phone). [CHAR LIMIT=40] -->
+  <string name="header_category_system">Sistemo</string>
   <!-- Phone info -->
   <!-- Phone Info screen. Button label to turn on the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
   <!-- Phone Info screen. Button label to turn off the radio . Only shown in diagnostic screen, so precise translation is not needed. -->
@@ -63,6 +68,7 @@
   <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Phone Info screen. Status label.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radioInfo_unknown">nekonata</string>
   <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Phone Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -80,7 +86,9 @@
   <!-- Button. Chosen when they want to save the chosen text size. -->
   <!-- Title for a notification shown. [CHAR LIMIT=25] -->
   <!-- Title for a notification shown. -->
+  <string name="sdcard_setting" product="default">SD-karto</string>
   <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="battery_info_status_unknown">Nekonata</string>
   <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
   <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
   <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
@@ -178,6 +186,7 @@
   <!-- HTTP proxy settings. Title for Proxy-Auto Config URL.  [CHAR LIMIT=25] -->
   <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+  <string name="radio_info_signal_location_label">Loko:</string>
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
   <!-- Radio Info screen. Label for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -237,6 +246,7 @@
   <!-- Used in setup wizard Wi-Fi screen. The button label for going to the next screen and submitting. [CHAR LIMIT=20] -->
   <!-- LocalePicker -->
   <!-- Title for the locale picker activity -->
+  <string name="language_picker_title">Lingvo</string>
   <!-- The title of the dialog to pick an activity.  This is shown when there are multiple activities that can do a particular action.  For example, suppose you click on the "Share" menu item in the Browser.  Since you can share the webpage URL via many communication methods, this dialog would come up with choices like "Email", "IM", etc.  This is a generic message, and the previous example is a single possible scenario (so please don't assume it's for the browser or anything :) ). -->
   <!-- Do not translate. -->
   <!-- The title of the activity to see random device info. -->
@@ -245,19 +255,25 @@
   <!-- The title of the activity to see phone info -->
   <!-- The title of the activity to adjust SD card settings [CHAR LIMIT=25] -->
   <!-- The title of the activity to adjust SD card settings-->
+  <string name="sd_card_settings_label" product="default">SD-karto</string>
   <!-- The title of the activity to adjust proxy settings -->
   <!-- ======================================================================================= -->
   <!-- NEW STUFF -->
   <!-- ======================================================================================= -->
   <!-- Button label for generic cancel action [CHAR LIMIT=20] -->
+  <string name="cancel">Nuligi</string>
   <!-- Button label for generic OK action [CHAR LIMIT=20] -->
   <!-- Button label for generic forget action [CHAR LIMIT=20] -->
   <!-- Button label for generic save action [CHAR LIMIT=20] -->
+  <string name="save">Konservi</string>
   <!-- Button label for generic done action [CHAR LIMIT=20] -->
   <!-- Title of the Settings activity shown within the application itself. -->
+  <string name="settings_label">Agordoj</string>
   <!-- Title of the Settings activity shown in the Launcher. [CHAR LIMIT=20] -->
+  <string name="settings_label_launcher">Agordoj</string>
   <!-- Label for option to select a settings panel as a shortcut -->
   <!-- Wireless controls settings screen, setting check box label -->
+  <string name="airplane_mode">Aviadila reĝimo</string>
   <!-- Main Settings screen settings title for things like airplane mode, tethering, NFC, VPN.  This will take you to another screen with those settings.  [CHAR LIMIT=30] -->
   <!-- Wireless Settings screen title for things like Wi-Fi, bluetooth, airplane mode. -->
   <!-- Main Settings screen settings summary text for the "Wireless controls" setting -->
@@ -296,6 +312,7 @@
   <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
   <!-- Date & time setting screen setting option title -->
   <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
+  <string name="date_time_set_timezone_title">Horzono</string>
   <!-- Date & time setting screen setting option title -->
   <!-- Date & time setting screen setting option title [CHAR LIMIT=30] -->
   <!-- Date & time setting screen setting option title -->
@@ -322,11 +339,13 @@
   <!-- Text shown for title of profile info setting [CHAR LIMIT=20]-->
   <!-- Main Settings screen setting option title for the item to take you to the Accounts screen [CHAR LIMIT=22] -->
   <!-- Main Settings screen setting option title for the item to take you to the location screen -->
+  <string name="location_settings_title">Loko</string>
   <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
   <!-- Main Settings screen setting option title for the item to take you to the security screen -->
   <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
   <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->
   <!-- In the security screen, the header title for settings related to  Passwords-->
+  <string name="security_passwords_title">Pasvortoj</string>
   <!-- Fingerprint enrollment and settings -->
   <!-- Title shown for menu item that launches fingerprint settings or enrollment [CHAR LIMIT=22] -->
   <!-- Fingerprint managment category title - configuration options for managing enrolled fingerprints [CHAR LIMIT=22] -->
@@ -347,13 +366,16 @@
   <!-- Introduction detail message shown in fingerprint enrollment dialog to warn the user [CHAR LIMIT=NONE]-->
   <!-- Link text shown bellow the warning to learn morn about fingerprint risk [CHAR LIMIT=22]-->
   <!-- Button text to cancel enrollment from the introduction [CHAR LIMIT=22] -->
+  <string name="security_settings_fingerprint_enroll_introduction_cancel">Nuligi</string>
   <!-- Button text to continue to the next screen from the introduction [CHAR LIMIT=22] -->
   <!-- Introduction title shown in fingerprint enrollment dialog to locate the sensor [CHAR LIMIT=29] -->
   <!-- Message shown in fingerprint enrollment dialog to locate the sensor -->
   <!-- Content description of graphic that shows where the fingerprint of the device is [CHAR LIMIT=NONE] -->
   <!-- Label text shown in fingerprint dialog for renaming a fingerprint template [CHAR LIMIT=22] -->
+  <string name="security_settings_fingerprint_enroll_dialog_name_label">Nomo</string>
   <!-- Button text shown in fingerprint dialog that allows the user to rename a fingerprint template [CHAR LIMIT=22] -->
   <!-- Button text shown in fingerprint dialog that allows the user to delete the fingerprint template [CHAR LIMIT=22] -->
+  <string name="security_settings_fingerprint_enroll_dialog_delete">Forigi</string>
   <!-- Title shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=29]-->
   <!-- Message shown in fingerprint enrollment dialog to begin enrollment [CHAR LIMIT=NONE] -->
   <!-- Title shown in fingerprint enrollment dialog to repeat touching the fingerprint sensor [CHAR LIMIT=29] -->
@@ -380,6 +402,7 @@
   <!-- Title shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=35]-->
   <!-- Message shown in a dialog which asks the user to confirm when the last fingerprint gets deleted by him. [CHAR LIMIT=NONE]-->
   <!-- Button to confirm the last removing the last fingerprint. [CHAR LIMIT=20]-->
+  <string name="fingerprint_last_delete_confirm">Jes, forigi</string>
   <!-- Content description for the fingerprint icon when the user is prompted to enter his credentials. Not shown on the screen. [CHAR LIMIT=NONE] -->
   <!-- Title of the preferences category for preference items to control encryption -->
   <!-- Title of the preferences item to control encryption -->
@@ -426,6 +449,7 @@
   <!-- Title for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=22] -->
   <!-- Summary for preference that guides the user through creating an unlock PIN (Personal Identification Number) [CHAR LIMIT=45] -->
   <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=22] -->
+  <string name="unlock_set_unlock_password_title">Pasvorto</string>
   <!-- Title for preference that guides the user through creating an unlock password [CHAR LIMIT=45] -->
   <!-- Summary specifying that this is the current screen lock setting [CHAR LIMIT=45] -->
   <!-- Summary for preference that has been disabled by because of the DevicePolicyAdmin, or because device encryption is enabled, or because there are credentials in the credential storage [CHAR LIMIT=50] -->
@@ -434,6 +458,7 @@
   <!-- Summary for "Configure lockscreen" when security pattern is enabled [CHAR LIMIT=45] -->
   <!-- Summary for "Configure lockscreen" when security PIN is enabled [CHAR LIMIT=45] -->
   <!-- Summary for "Configure lockscreen" when security password is enabled [CHAR LIMIT=45] -->
+  <string name="unlock_set_unlock_mode_password">Pasvorto</string>
   <!-- Footer text in when choosing screen lock type during setup wizard, telling the user that
          they can add fingerprint after they complete setup wizard. The text "Settings > Security"
          should match settings_label and security_settings_title [CHAR LIMIT=NONE] -->
@@ -473,7 +498,9 @@
   <!-- [CHAR_LIMIT=NONE] Error shown when the user tries to set an ascending or descending sequence of digits -->
   <!-- Label for ChoosePassword/PIN OK button -->
   <!-- Label for ChoosePassword/PIN OK button -->
+  <string name="lockpassword_cancel_label">Nuligi</string>
   <!-- Label for LockPatternTutorial Cancel button -->
+  <string name="lockpattern_tutorial_cancel_label">Nuligi</string>
   <!-- Label for LockPatternTutorial Continue button -->
   <!-- Toast shown when lock pattern or password successfully setup. [CHAR LIMIT=64] -->
   <!-- In the security screen, the header title for settings related to device admins -->
@@ -513,8 +540,10 @@
   <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
   <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
   <!-- Bluetooth settings: Name label [CHAR LIMIT=40] -->
+  <string name="bluetooth_preference_paired_dialog_name_label">Nomo</string>
   <!-- Bluetooth settings: Checkbox label for enable/disable internet connection.  [CHAR LIMIT=40] -->
   <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection.  [CHAR LIMIT=40] -->
+  <string name="bluetooth_preference_paired_dialog_keyboard_option">Klavaro</string>
   <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection.  [CHAR LIMIT=40] -->
   <!-- Bluetooth settings: pairing dialog title.  [CHAR LIMIT=40] -->
   <!-- Bluetooth settings: share phone book title.  [CHAR LIMIT=40] -->
@@ -524,7 +553,9 @@
   <!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Context menu item for a device.  Action will connect to all profiles on the device. -->
+  <string name="bluetooth_device_context_connect">Konekti</string>
   <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect from all profiles on the device. -->
+  <string name="bluetooth_device_context_disconnect">Malkonekti</string>
   <!-- Bluetooth settings.  Context menu item for a device.  Action will first pair, and then connect to all profiles on the device. -->
   <!-- Bluetooth settings.  Context menu item for a device.  Action will remove pairing with the device. -->
   <!-- Bluetooth settings.  Context menu item for a device.  Action will disconnect and remove pairing with the device. -->
@@ -544,6 +575,7 @@
   <!-- Bluetooth settings.  Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
   <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
   <!-- Bluetooth settings.  Connection options screen.  The title of the checkbox that controls whether the device is in "online" mode or "offline" mode.  This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
+  <string name="bluetooth_device_advanced_online_mode_title">Konekti</string>
   <!-- Bluetooth settings.  Connection options screen.  The summary of the online mode checkbox.  This describes what the setting does in the context of the screen. -->
   <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
          When a user decides what Bluetooth capabilities to use with the device.  -->
@@ -569,6 +601,7 @@
   <!-- Wifi Display settings. Options dialog.  The forget button text. [CHAR LIMIT=20] -->
   <!-- Wifi Display settings. Options dialog.  The done button text. [CHAR LIMIT=20] -->
   <!-- Wifi Display settings. Options dialog.  The name label used when prompting the user to rename the display. [CHAR LIMIT=20] -->
+  <string name="wifi_display_options_name">Nomo</string>
   <!-- Wifi Display settings. The sub heading for wireless display certification options. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. The section title for wireless display session info. [CHAR LIMIT=40] -->
   <!-- Wifi Display settings. The checkbox title for enabling listen mode during certification process. [CHAR LIMIT=40] -->
@@ -641,6 +674,7 @@
   <!-- Menu option to connect to a Wi-Fi network -->
   <!-- Menu option to remember a temporary Wi-Fi network -->
   <!-- Menu option to delete a Wi-Fi network -->
+  <string name="wifi_menu_forget">Forgesi reton</string>
   <!-- Menu option to modify a Wi-Fi network configuration -->
   <!-- Menu option to write a Wi-Fi configuration token to an NFC tag [CHAR_LIMIT=30]-->
   <!-- Wi-Fi settings. text displayed when Wi-Fi is off and network list is empty [CHAR LIMIT=50]-->
@@ -681,6 +715,7 @@
   <!-- Label for the EAP identity of the network -->
   <!-- Label for the EAP anonymous identity of the network -->
   <!-- Label for the password of the secured network -->
+  <string name="wifi_password">Pasvorto</string>
   <!-- Label for the check box to show password -->
   <!-- Label for the RadioGroup to choose wifi ap band -->
   <!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
@@ -699,12 +734,16 @@
   <!-- Wifi settings button to connect in to a Hotspot. [CHAR LIMIT=50]-->
   <!-- Dialog text to tell the user that the selected network does not have Internet access. -->
   <!-- Button label to connect to a Wi-Fi network -->
+  <string name="wifi_connect">Konekti</string>
   <!-- Failured notification for connect -->
   <!-- Button label to delete a Wi-Fi network -->
+  <string name="wifi_forget">Forgesi</string>
   <!-- Failured notification for forget -->
   <!-- Button label to save a Wi-Fi network configuration -->
+  <string name="wifi_save">Konservi</string>
   <!-- Failured notification for save -->
   <!-- Button label to dismiss the dialog -->
+  <string name="wifi_cancel">Nuligi</string>
   <!-- Button for skipping a step after having been warned of a potential concern [CHAR LIMIT=30] -->
   <!-- Button for going to the previous screen or step [CHAR LIMIT=20] -->
   <!-- Text warning about skipping Wi-Fi with a mobile connect (tablet) [CHAR LIMIT=NONE]-->
@@ -728,7 +767,9 @@
   <!-- Wifi saved access points.  Used as a label under the shortcut icon that goes to Wifi saved access points. [CHAR LIMIT=20] -->
   <!-- Wifi Advanced settings.  Used as a label under the shortcut icon that goes to Wifi advanced settings. [CHAR LIMIT=20] -->
   <!-- Menu item to save the IP settings -->
+  <string name="wifi_ip_settings_menu_save">Konservi</string>
   <!-- Menu ietm to cancel the IP settings -->
+  <string name="wifi_ip_settings_menu_cancel">Nuligi</string>
   <!-- Error message if the IP address is not valid [CHAR LIMIT=50]-->
   <!-- Error message if the gateway is not valid [CHAR LIMIT=50]-->
   <!-- Error message if the dns is not valid [CHAR LIMIT=50]-->
@@ -824,6 +865,10 @@
   <!-- Wireless networks, item title to go into the WFC settings [CHAR LIMIT=30] -->
   <!-- WFC mode [CHAR LIMIT=30] -->
   <!-- WFC mode dialog [CHAR LIMIT=30] -->
+  <string-array name="wifi_calling_mode_values">
+    <item>"2"</item>
+    <item>"1"</item>
+  </string-array>
   <!-- Wi-Fi Calling settings. Text displayed when Wi-Fi Calling is off -->
   <!-- Sound and alerts settings -->
   <!-- Main Settings screen setting option name to go into the display settings screen -->
@@ -836,6 +881,7 @@
   <!-- Sound settings screen, setting option name -->
   <!-- Sound settings screen, the title of the volume bar to adjust the incoming call volume -->
   <!-- Sound settings screen, the title of the volume bar to adjust the notification volume -->
+  <string name="notification_volume_title">Sciigo</string>
   <!-- Sound settings screen, the caption of the checkbox for having the notification volume be
          the same as the incoming call volume. -->
   <!-- Home settings screen, text indicating that a launcer does not support work profiles [CHAR LIMIT=100] -->
@@ -852,6 +898,7 @@
   <!-- Volume description for media volume -->
   <!-- Volume description for ringtone and notification volume -->
   <!-- Volume description for notification volume -->
+  <string name="volume_notification_description">Sciigoj</string>
   <!-- Volume description for alarm volume -->
   <!-- Image description for ringer volume mute button. -->
   <!-- Image description for media volume mute button. -->
@@ -881,6 +928,7 @@
   <!-- Content description for work profile details page title [CHAR LIMIT=NONE] -->
   <!-- Content description for personal profile details page title [CHAR LIMIT=NONE] -->
   <!-- Main Settings screen, setting option name to go into search settings -->
+  <string name="search_settings">Serĉi</string>
   <!-- Main Settings screen, setting option summary to go into search settings -->
   <!-- Display settings -->
   <!-- Sound & display settings screen, section header for settings related to display -->
@@ -896,6 +944,7 @@
   <!-- Sound & display settings screen, setting option summary to enable adaptive brightness [CHAR LIMIT=100] -->
   <!-- Sound & display settings screen, setting option name to change the user interface theme [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, setting option summary to change the user interface theme [CHAR LIMIT=100] -->
+  <string name="night_mode_summary">%s</string>
   <!-- Sound & display settings screen, theme setting value to prefer a light-colored user interface [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, theme setting value to prefer a dark-colored user interface [CHAR LIMIT=30] -->
   <!-- Sound & display settings screen, theme setting value to automatically switch between a light- or dark-colored user interface [CHAR LIMIT=30] -->
@@ -914,6 +963,7 @@
   <!-- Dream settings screen, action label, when to dream -->
   <!-- Dream settings screen, button label to start dreaming -->
   <!-- Dream settings screen, button label for settings for a specific screensaver -->
+  <string name="screensaver_settings_button">Agordoj</string>
   <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
   <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
   <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->
@@ -944,6 +994,7 @@
   <!-- SIM card lock settings screen, toast after not entering correct SIM PIN [CHAR LIMIT=40] -->
   <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
   <!-- SIM card lock settings screen, SIM PIN dialog button labels: [CHAR LIMIT=40] -->
+  <string name="sim_enter_cancel">Nuligi</string>
   <!-- Multiple SIMs found title.  [CHAR LIMIT=40] -->
   <!-- Multiple SIMs found summary.  [CHAR LIMIT=100] -->
   <!-- Title asking user if they wish to change the default sim for cellular data.  [CHAR LIMIT=30] -->
@@ -980,6 +1031,7 @@
   <!-- Do not translate. About phone, status item title -->
   <!-- About tablet, status item title.  The Mobile Directory Number [CHAR LIMIT=30] -->
   <!-- About phone, status item title.  The phone number of the current device [CHAR LIMIT=30] -->
+  <string name="status_number" product="default">Mia telefonnumero</string>
   <!-- About phone, status item title.  The phone MIN number of the current device.-->
   <!-- About phone, status item title.  The phone MSID number of the current device.-->
   <!-- About phone, status item title.  The phone PRL Version of the current device.-->
@@ -992,6 +1044,7 @@
   <!-- About phone, status item title. The  current cell tower signal strength -->
   <!-- About phone, status item title, The status for roaming.  For example, the value might be "Not roaming" -->
   <!-- About phone, status item title. The cell carrier that the user is connected to.  -->
+  <string name="status_operator">Reto</string>
   <!-- About phone, status item title.  The MAC address of the Wi-Fi network adapter. -->
   <!-- About phone, status item title.  The bluetooth adapter's hardware address-->
   <!-- About phone, status item title.  The hardware serial number. [CHAR LIMIT=30]-->
@@ -1001,6 +1054,7 @@
   <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the phone's internal storage  -->
   <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card [CHAR LIMIT=30] -->
   <!-- SD card & phone storage settings screen heading. This is displayed above items that pertain to the SD card -->
+  <string name="sd_memory" product="default">SD-karto</string>
   <!-- SD card & phone storage settings title. The amount of free space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section. -->
   <!-- SD card & phone storage settings title. The amount of free space for some storage partition when the volume is read-only. [CHAR LIMIT=64] -->
   <!-- SD card & phone storage settings screen heading.  The total amount of storage space for some storage partition.  For example, this is listed under both the "Internal phone storage" section and the "SD card" section -->
@@ -1086,6 +1140,7 @@
   <!-- Title of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=32]-->
   <!-- Body of dialog confirming that user wants to forget an internal storage device [CHAR LIMIT=NONE]-->
   <!-- Item title describing storage used by apps [CHAR LIMIT=48]-->
+  <string name="storage_detail_apps">Aplikaĵoj</string>
   <!-- Item title describing storage used by images [CHAR LIMIT=48]-->
   <!-- Item title describing storage used by videos [CHAR LIMIT=48]-->
   <!-- Item title describing storage used by audio [CHAR LIMIT=48]-->
@@ -1131,12 +1186,16 @@
   <!-- Screen title after user selects APNs setting option -->
   <!-- Edit access point label summary text when no value has been set -->
   <!-- Edit access point labels: A label the user can give to the APN to allow him to differentiate it from the others -->
+  <string name="apn_name">Nomo</string>
   <!-- Edit access point labels: The actual access point name-->
   <!-- Edit access point labels: The addess of the proxy to use for this APN -->
   <!-- Edit access point labels: The port number of the proxy to use for this APN -->
   <!-- Edit access point labels: The username that will be used when conencting to this APN-->
+  <string name="apn_user">Uzantnomo</string>
   <!-- Edit access point labels: The password that will be used when connecting to this APN -->
+  <string name="apn_password">Pasvorto</string>
   <!-- Edit access point labels: The server address to conenct to for this APN -->
+  <string name="apn_server">Servilo</string>
   <!-- Edit access point labels: -->
   <!-- Edit access point labels: The proxy to use for MMS (multimedia messages)-->
   <!-- Edit access point labels: The port on the proxy used for MMS-->
@@ -1157,6 +1216,7 @@
   <!-- Edit access point screen menu option to delete this APN -->
   <!-- APNs screen menu option to create a brand spanking new APN -->
   <!-- Edit access point screen menu option to save the user's changes for this APN to the persistent storage -->
+  <string name="menu_save">Konservi</string>
   <!-- Edit access point screen menu option to discard the user's changes for this APN -->
   <!-- APN error dialog title -->
   <!-- APN error dialog messages: -->
@@ -1362,6 +1422,7 @@
   <!-- Applications settings screen, setting option name for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings screen, setting option summary for the user to go to the screen to manage installed applications  -->
   <!-- Applications settings title, on main settings screen. If clicked, the user is taken to a settings screen full of application settings-->
+  <string name="applications_settings">Aplikaĵoj</string>
   <!-- Applications settings summary, on main settings screen. The summary for the "Applications" item on the main settings screen. Describes what settings are accessible from the "Applications" screen. -->
   <!-- Applications settings screen heading. The header for the Application settings screen. -->
   <!-- Applications settings screen, setting check box title. If checked, the system allows installation of applications that are downloaded from random places, such as web sites.  -->
@@ -1389,9 +1450,12 @@
   <!-- Manage applications, individual application info screen, label under Storage heading.  The amount of sapce taken up by the app's data (for example, downloaded emails or something like that) -->
   <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on USB storage [CHARSIZE=40] -->
   <!--  Manage applications, individual application info screen, label under Storage heading.  The amount of space taken up by the app's data on the SD card [CHARSIZE=40] -->
+  <string name="external_data_size_label" product="default">SD-karto</string>
   <!-- Manage applications, individual application info screen, button label under Storage heading. Button to remove the application from the system. -->
+  <string name="uninstall_text">Malinstali</string>
   <!-- Manage applications, individual application info screen, menu item to uninstall an application for all users. -->
   <!-- [CHAR LIMIT=NONE] Manage applications, individual application info screen, button label under Storage heading. Button to install an application for the user. -->
+  <string name="install_text">Instali</string>
   <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to disable an existing application. -->
   <!-- [CHAR LIMIT=25] Manage applications, individual application info screen, button label under Storage heading. Button to re-enable an existing application. -->
   <!-- Manage applications, individual application info screen, button label under Storage heading. Button to clear all data associated with tis app (for exampel, remove all cached emails for an Email app) -->
@@ -1405,6 +1469,7 @@
   <!-- Manage applications, individual application screen, checkbox to control compatibility mode.  -->
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <string name="unknown">Nekonata</string>
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Sorts all of the apps in the list alphabetically. -->
   <!-- Manage applications screen, menu item. Sorts all of the apps in the list based on their file size.  This is used to uninstall when space is getting low. -->
   <!-- [CHAR LIMIT=25] Manage applications screen, menu item.  Show running services. -->
@@ -1440,6 +1505,7 @@
   <!-- Manage applications, individual application screen, confirmation dialog message. Displays when user selects to "Clear data". It warns the user of the consequences of clearing the data for an app. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". Goes through with the clearing of the data. -->
   <!-- Manage applications, individual application screen, confirmation dialog button. Displays when user selects to "Clear data". -->
+  <string name="dlg_cancel">Nuligi</string>
   <!-- Manage applications, individual application dialog box title. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when the user somehow got into a state where it wants to manage some app that isn't found. -->
   <!-- Manage applications, individual application dialog box message. Shown when there was an error trying to clear the data. -->
@@ -1459,6 +1525,7 @@
   <!-- [CHAR_LIMIT=NONE] Format to put the last item at the end of a series of 3 or more items in a list -->
   <!-- [CHAR_LIMIT=NONE] Format to put the first item at the start of a series of 3 or more items in a list -->
   <!-- [CHAR_LIMIT=NONE] Format to put the middle items together in a series of 4 or more items in a list -->
+  <string name="join_many_items_middle"><xliff:g id="added_item">%1$s</xliff:g>, <xliff:g id="rest_of_items">%2$s</xliff:g></string>
   <!-- Manage applications, individual application info screen, text that appears under the "Permissions" heading after the app has tried to send to a premium SMS. [CHAR LIMIT=50] -->
   <!-- Manage applications, text for permission to send to premium SMS short codes. [CHAR LIMIT=40] -->
   <!-- String displayed when list is empty -->
@@ -1497,6 +1564,7 @@
   <!-- [CHAR LIMIT=25] Text shown when there are no services running -->
   <!-- Running services, description for a service in the started state -->
   <!-- Running services, description for a service in the started state -->
+  <string name="service_client_name"><xliff:g id="client_name">%1$s</xliff:g></string>
   <!-- [CHAR LIMIT=10] Running services, summary of background processes -->
   <!-- [CHAR LIMIT=10] Running services, summary of foreground processes -->
   <!-- [CHAR LIMIT=10] Running services, label for chart showing memory use. -->
@@ -1504,6 +1572,7 @@
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
   <!-- [CHAR LIMIT=NONE] Label of a running process that represents a removed -->
+  <string name="running_process_item_removed_user_label">Forigita uzanto</string>
   <!-- Descriptive text of a running process: singular process, singular service. -->
   <!-- Descriptive text of a running process: singular process, plural service. -->
   <!-- Descriptive text of a running process: plural process, singular service. -->
@@ -1513,8 +1582,10 @@
          processes/services list. -->
   <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          used by system. -->
+  <string name="running_processes_header_system_prefix">Sistemo</string>
   <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          used by apps. -->
+  <string name="running_processes_header_apps_prefix">Aplikaĵoj</string>
   <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing RAM
          that is free. -->
   <!-- [CHAR LIMIT=20] Running processes/services header: prefix for line showing total RAM
@@ -1528,6 +1599,7 @@
   <!-- Title for list of services. -->
   <!-- Running service details, stop a service that has started itself. -->
   <!-- Running service details, manage a service that is running for some other reason. -->
+  <string name="service_manage">Agordoj</string>
   <!-- Running service details, default description for services that are started. -->
   <!-- Running service details, description for running heavy-weight process. -->
   <!-- Running service details, description for background process. -->
@@ -1544,6 +1616,7 @@
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to language (select the system language, user dictionary for the language). -->
   <!-- On Language & keyboard settings screen, heading. Inside the "Language & keyboard settings" screen, this is the header for settings that relate to keyboard (enable/disable each keyboard, settings for each keyboard). -->
   <!-- On Text & language settings screen, setting option name. title of the setting to take the user to a screen to select the locale. -->
+  <string name="phone_language">Lingvo</string>
   <!-- On Text & language settings screen, setting option name. summary of the setting to take the user to a screen to select the locale. -->
   <!-- On Text & language settings screen, setting option name. title of the setting to enable autoreplace of entered text. auto replace is a feature that will automatically correct mistyped words. -->
   <!-- On Text & language settings screen, setting summary.  This is the summary for the "Auto-replace" setting. -->
@@ -1558,7 +1631,9 @@
   <!-- Warning message about security implications of enabling a spell checker, displayed as a dialog
          message when the user selects to enable a spell checker. -->
   <!-- Image button description for spell checker quick settings. -->
+  <string name="spellchecker_quick_settings">Agordoj</string>
   <!-- Image button description for spell checker language. -->
+  <string name="spellchecker_language">Lingvo</string>
   <!-- Toast that settings for an application is failed to open. -->
   <!-- On Language & input settings screen, heading. Inside the "Language & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
   <!-- On Language & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
@@ -1576,6 +1651,7 @@
   <!-- User dictionary settings. The title of the list item to go into the Personal dictionary settings screen. [CHAR LIMIT=35] -->
   <!-- User dictionary settings.  The summary of the list item to go into the Personal dictionary settings screen. -->
   <!-- User dictionary settings. The title of the menu item to add a new word to the user dictionary. -->
+  <string name="user_dict_settings_add_menu_title">Aldoni</string>
   <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
   <!-- User dictionary settings. The title of the screen to add/edit a new word to the user dictionary; it describes the phrase that will be added to the user dictionary. [CHAR LIMIT=25] -->
   <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=16] -->
@@ -1584,13 +1660,17 @@
   <!-- User dictionary settings. Label to put before the word field (that's the word that will actually be added to the user dictionary when OK is pressed). [CHAR LIMIT=20] -->
   <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=20] -->
   <!-- User dictionary settings. Label to put before the language field. [CHAR LIMIT=20] -->
+  <string name="user_dict_settings_add_locale_option_name">Lingvo:</string>
   <!-- User dictionary settings. Hint for the text field to type the word to add to the user dictionary. [CHAR LIMIT=35] -->
   <!-- User dictionary settings. Hint for the text field to type the optional shortcut to add to the user dictionary. [CHAR LIMIT=35] -->
   <!-- User dictionary settings. The title of the dialog to edit an existing word in the user dictionary. -->
   <!-- User dictionary settings. The title of the context menu item to edit the current word -->
+  <string name="user_dict_settings_context_menu_edit_title">Redakti</string>
   <!-- User dictionary settings. The title of the context menu item to delete the current word -->
+  <string name="user_dict_settings_context_menu_delete_title">Forigi</string>
   <!-- User dictionary settings. The text to show when there are no user-defined words in the dictionary  [CHAR LIMIT=200] -->
   <!-- User dictionary settings. The list item to choose to insert a word into the user dictionary for all languages -->
+  <string name="user_dict_settings_all_languages">Por ĉiuj lingvoj</string>
   <!-- User dictionary settings. The text to show for the option that shows the entire list of supported locales to choose one [CHAR LIMIT=30] -->
   <!-- This is for diagnostics screen. The title of a screen with various items realted to launching screens that will giev the user info. For example, it contains "Phone information" and "Battery information" -->
   <!-- In the Testing screen.  The item title of the activity that shows a bunch of phone-related information.  -->
@@ -1605,7 +1685,9 @@
   <!-- An option to always hide input method selector [CHAR LIMIT=25] -->
   <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
   <!-- Title for settings of each IME [CHAR LIMIT=25] -->
+  <string name="input_method_settings">Agordoj</string>
   <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
+  <string name="input_method_settings_button">Agordoj</string>
   <!-- Title for settings of active input methods in each IME [CHAR LIMIT=35] -->
   <!-- Title for settings whether or not the framework will select input methods in an IME based on the current system locale. [CHAR LIMIT=35] -->
   <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
@@ -1699,9 +1781,11 @@
   <!-- label for usage time -->
   <!-- Accessibility settings -->
   <!-- Settings title in main settings screen for accessibility settings -->
+  <string name="accessibility_settings">Alirebleco</string>
   <!-- Settings title for accessibility settings screen -->
   <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
   <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
+  <string name="accessibility_system_title">Sistemo</string>
   <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
   <!-- Title for the accessibility preference screen to enable video captioning. [CHAR LIMIT=35] -->
   <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->
@@ -1731,12 +1815,14 @@
   <!-- Label for protanomaly (red-green color blindness) [CHAR LIMIT=45] -->
   <!-- Label for tritanomaly (blue-yellow color blindness) [CHAR LIMIT=45] -->
   <!-- Title for accessibility menu item to lauch a settings activity. [CHAR LIMIT=15] -->
+  <string name="accessibility_menu_item_settings">Agordoj</string>
   <!-- Summary for the enabled state of an accessibility feature. [CHAR LIMIT=10] -->
   <!-- Summary for the disabled state of an accessibility feature. [CHAR LIMIT=10] -->
   <!-- Summary when an accessibility feature or ime is not permitted. [CHAR LIMIT=40] -->
   <!-- Title for the preference category containing the video caption preview. [CHAR LIMIT=35] -->
   <!-- Title for the preference catgeory containing standard video caption options. [CHAR LIMIT=35] -->
   <!-- Title for the preference to change video caption locale. [CHAR LIMIT=35] -->
+  <string name="captioning_locale">Lingvo</string>
   <!-- Title for the preference to change video caption text size. [CHAR LIMIT=35] -->
   <!-- Title for the preference category containing video caption property presets. [CHAR LIMIT=35] -->
   <!-- Title for the preference catgeory containing custom video caption properties. [CHAR LIMIT=35] -->
@@ -1785,6 +1871,7 @@
   <!-- Title for the prompt shown as a placeholder if no accessibility serivices are installed. [CHAR LIMIT=50] -->
   <!-- Default description for an accessibility serivice if the latter doesn't provide one. [CHAR LIMIT=NONE] -->
   <!-- Accessibility settings: button for lauching settings for an accessibility service -->
+  <string name="settings_button">Agordoj</string>
   <!-- Printing settings -->
   <!-- Title in main settings screen for printing settings [CHAR LIMIT=15] -->
   <!-- Title for print service settings screen [CHAR LIMIT=25] -->
@@ -1795,19 +1882,25 @@
   <!-- Title for the prompt shown as a placeholder if no print serivices are installed. [CHAR LIMIT=50] -->
   <!-- Title for the prompt shown as a placeholder if no printers are found while searching. [CHAR LIMIT=50] -->
   <!-- Title for print menu item to launch a settings activity. [CHAR LIMIT=25] -->
+  <string name="print_menu_item_settings">Agordoj</string>
   <!-- Title for print menu item to launch the add printers activity. [CHAR LIMIT=25] -->
+  <string name="print_menu_item_add_printers">Aldoni presilojn</string>
   <!-- Summary for the enabled state of a print feature. [CHAR LIMIT=10] -->
   <!-- Summary for the disabled state of a print feature. [CHAR LIMIT=10] -->
   <!-- Title of the action bar button to got to Play Store to download a print service. [CHAR LIMIT=25] -->
   <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <string name="print_menu_item_add_printer">Aldoni presilon</string>
   <!-- Title for the search action bar menu item. [CHAR LIMIT=20] -->
+  <string name="print_menu_item_search">Serĉi</string>
   <!-- Title for the prompt if no printers are available and the system is searching for such. [CHAR LIMIT=50] -->
   <!-- Title for the prompt if no printers are available because the print service is disabled. [CHAR LIMIT=50] -->
   <!-- Title for the menu item to open the print jobs screen. [CHAR LIMIT=25] -->
   <!-- Title for the print job settings screen. [CHAR LIMIT=25] -->
   <!-- Title for the button to restart a print job. [CHAR LIMIT=25] -->
   <!-- Title for the button to cancel a print job. [CHAR LIMIT=25] -->
+  <string name="print_cancel">Nuligi</string>
   <!-- Template for the summary of a print job. [CHAR LIMIT=25] -->
+  <string name="print_job_summary"><xliff:g id="printer">%1$s</xliff:g>\n<xliff:g id="time">%2$s</xliff:g></string>
   <!-- Template for the label of the state for a ongoing print job. [CHAR LIMIT=25] -->
   <!-- Template for the label for a cancelling print job. [CHAR LIMIT=25] -->
   <!-- Template for the label of the state for a failed print job. [CHAR LIMIT=25] -->
@@ -1922,6 +2015,7 @@
   <!-- [CHAR_LIMIT=40] Battery saver: Label for feature, title + menu item -->
   <!-- [CHAR_LIMIT=40] Battery saver: Title for automatic entry option -->
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: Never -->
+  <string name="battery_saver_turn_on_automatically_never">Neniam</string>
   <!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
   <!-- Process Stats strings -->
   <!-- [CHAR LIMIT=NONE] Activity title for Process Stats summary -->
@@ -1955,9 +2049,13 @@
   <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
   <!-- [CHAR LIMIT=NONE] Total of all memory use -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <string name="menu_duration_3h">3 horoj</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <string name="menu_duration_6h">6 horoj</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <string name="menu_duration_12h">12 horoj</string>
   <!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
+  <string name="menu_duration_1d">1 tago</string>
   <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are shown -->
   <!-- [CHAR LIMIT=NONE] Menu for manage apps to control whether system processes are hidden -->
   <!-- [CHAR LIMIT=NONE] Menu for process stats to control whether stats are shown
@@ -2003,6 +2101,7 @@
   <!-- On main TTS Settings screen, in default settings section, setting default pitch for synthesized voice -->
   <!-- On main TTS Settings screen, summary for default pitch for synthesized voice -->
   <!-- On main TTS Settings screen, in default settings section, setting default language for synthesized voice -->
+  <string name="tts_default_lang_title">Lingvo</string>
   <!-- Entry in the TTS engine language/locale picker, when selected will try to default to the system language [CHAR LIMIT=50] -->
   <!-- On main TTS Settings screen, language summary if it can't default to system language [CHAR LIMIT=50] -->
   <!-- On main TTS Settings screen, summary for default language for synthesized voice -->
@@ -2064,6 +2163,7 @@
   <!-- Spoken description for the Wi-Fi power control gadget. -->
   <!-- Spoken description for the Bluetooth power control gadget. -->
   <!-- Spoken description for the Location power control gadget. -->
+  <string name="gadget_location">Loko</string>
   <!-- Spoken description for the data synchronization gadget. -->
   <!-- Template for brightness gadget toggle button description. -->
   <!-- Brightness gadget value used to describe automatic brightness state. -->
@@ -2140,10 +2240,12 @@
   <!-- Title for screen to set a profile owner [CHAR LIMIT=40] -->
   <!-- Warning when trying to add a profile owner admin after setup has completed. [CHAR LIMIT=none] -->
   <!-- Name to assign to a Network Access Point that was saved without a name -->
+  <string name="untitled_apn">Sentitola</string>
   <!-- Category title for phone call's ringtone and vibration settings in the Sound Setting.
          [CHAR LIMIT=40] -->
   <!-- Category title for system-wide notification and feedback settings in the Sound Setting.
          [CHAR LIMIT=40] -->
+  <string name="sound_category_system_title">Sistemo</string>
   <!-- Wifi Setup For Setup Wizard with XL screen -->
   <!-- Title shown in Wifi Setup Wizard with XL screen -->
   <!-- Title shown in Wifi Setup Wizard with XL screen when
@@ -2177,12 +2279,16 @@
          Used in SetupWizard for XLarge screen [CHAR LIMIT=20] -->
   <!-- Button label to connect to a Wi-Fi network.
          Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <string name="wifi_setup_connect">Konekti</string>
   <!-- Button label to delete a Wi-Fi network.
          Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <string name="wifi_setup_forget">Forgesi</string>
   <!-- Button label to save a Wi-Fi network configuration.
          Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <string name="wifi_setup_save">Konservi</string>
   <!-- Button label to dismiss the dialog.
          Used in SetupWizard for XLarge screen [CHAR LIMIT=10] -->
+  <string name="wifi_setup_cancel">Nuligi</string>
   <!-- The message shown above available networks when the device is scanning
          available networks [CHAR LIMIT=35] -->
   <!-- Message shown above available network when there's no connected network.
@@ -2244,12 +2350,15 @@
   <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Gmail should be synced.  Should use "Gmail" to refer to this app.-->
   <!-- Data synchronization settings screen, checkbox setting option name. Controls whether Calendar shoudl be synced. -->
   <!-- Data synchronization settings screen, checkbox setting option name -->
+  <string name="sync_contacts">Kontaktoj</string>
   <!-- Message introducing the user to Google Sync. -->
   <!-- Header title for those settings relating to application syncing. -->
   <!-- Header for data and synchronization -->
   <!-- Preference item that lets the user change password -->
+  <string name="preference_change_password_title">Ŝanĝi pasvorton</string>
   <!-- Header that appears at the top of Account Settings screen -->
   <!-- Button label to remove current account -->
+  <string name="remove_account_label">Forigi konton</string>
   <!-- Title shown in AddAccount -->
   <!-- Button shown when this activity is run from SetupWizard -->
   <!-- Title of remove message for remove account dialog -->
@@ -2270,6 +2379,7 @@
   <!-- Shown when password is correct, and we're starting Android -->
   <!-- the following are for Settings Storage screen -->
   <!-- Menu item/button 'delete' -->
+  <string name="delete">Forigi</string>
   <!-- Misc files [CHAR LIMIT=25] -->
   <!-- number of misc files selected [CHAR LIMIT=40] -->
   <!-- number of bytes represented by the selected misc files [CHAR LIMIT=40] -->
@@ -2409,8 +2519,10 @@
   <!-- Label displaying current network data usage limit threshold. [CHAR LIMIT=18] -->
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps">Forigitaj aplikaĵoj</string>
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps_users">Forigitaj aplikaĵoj kaj uzantoj</string>
   <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
   <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
   <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
@@ -2424,6 +2536,7 @@
   <!-- Button at the bottom of the CryptKeeper screen to make an emergency call. -->
   <!-- Button at the bottom of the CryptKeeper screen that lets the user return to a call -->
   <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_name">Nomo</string>
   <!-- Input label for the type of a VPN profile. [CHAR LIMIT=40] -->
   <!-- Input label for the server address of a VPN profile. [CHAR LIMIT=40] -->
   <!-- Checkbox label to enable PPP encryption for a VPN profile. [CHAR LIMIT=40] -->
@@ -2438,20 +2551,25 @@
   <!-- Input label for the DNS servers of a VPN profile. [CHAR LIMIT=40] -->
   <!-- Input label for the forwarding routes of a VPN profile. [CHAR LIMIT=40] -->
   <!-- Input label for the username of a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_username">Uzantnomo</string>
   <!-- Input label for the password of a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_password">Pasvorto</string>
   <!-- Checkbox label to save the username and the password in a VPN profile. [CHAR LIMIT=40] -->
   <!-- Hint for not using an optional feature in a VPN profile. [CHAR LIMIT=40] -->
   <!-- Option to not use a CA certificate to verify the VPN server. [CHAR LIMIT=40] -->
   <!-- Option to use the server certificate received from the VPN server. [CHAR LIMIT=40] -->
   <!-- Button label to cancel changing a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_cancel">Nuligi</string>
   <!-- Button label to finish editing a VPN profile. [CHAR LIMIT=40] -->
   <!-- Button label to save a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_save">Konservi</string>
   <!-- Button label to connect to a VPN profile. [CHAR LIMIT=40] -->
   <!-- Dialog title to edit a VPN profile. [CHAR LIMIT=40] -->
   <!-- Button label to forget a VPN profile. [CHAR LIMIT=40] -->
   <!-- Dialog title to connect to a VPN profile. [CHAR LIMIT=40] -->
   <!-- Dialog message body to disconnect from a VPN profile. -->
   <!-- Button label to disconnect from a VPN profile. [CHAR LIMIT=40] -->
+  <string name="vpn_disconnect">Malkonekti</string>
   <!-- Field label to show the version number for a VPN app. [CHAR LIMIT=40] -->
   <!-- Preference title for VPN settings. [CHAR LIMIT=40] -->
   <!-- Preference title to create a new VPN profile. [CHAR LIMIT=40] -->
@@ -2464,10 +2582,13 @@
   <!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
   <!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
   <!-- Tab label for built-in system CA certificates. -->
+  <string name="trusted_credentials_system_tab">Sistemo</string>
   <!-- Tab label for user added CA certificates. -->
+  <string name="trusted_credentials_user_tab">Uzanto</string>
   <!-- Button label for disabling a system CA certificate. -->
   <!-- Button label for enabling a system CA certificate. -->
   <!-- Button label for removing a user CA certificate. -->
+  <string name="trusted_credentials_remove_label">Forigi</string>
   <!-- Alert dialog confirmation when enabling a system CA certificate. -->
   <!-- Alert dialog confirmation when disabling a system CA certificate. -->
   <!-- Alert dialog confirmation when removing a user CA certificate. -->
@@ -2477,6 +2598,7 @@
   <!-- Prompt for the user to confirm the new full-backup password by re-entering it -->
   <!-- Button label for setting the user's new full-backup password -->
   <!-- Button label for cancelling the new-password operation and retaining the user's previous full-backup password -->
+  <string name="backup_pw_cancel_button_text">Nuligi</string>
   <!-- A menu item in "About phone" that allows the user to update the phone with settings
     from their cell phone carrier. The use of the string is similar to the string
     "system_update_settings_list_item_title" in this project. [CHAR LIMIT=25] -->
@@ -2492,6 +2614,7 @@
   <!-- Label on button that will take the user to the Trusted Credentials settings page.  [CHAR LIMIT=NONE]-->
   <!-- User settings -->
   <!-- User settings screen title [CHAR LIMIT=25] -->
+  <string name="user_settings_title">Uzantoj</string>
   <!-- User settings header for list of users and profiles [CHAR LIMIT=40] -->
   <!-- User settings add user or restricted profile menu [CHAR LIMIT=35] -->
   <!-- User settings add user menu [CHAR LIMIT=35] -->
@@ -2502,13 +2625,16 @@
   <!-- User summary to indicate that restricted profile is currently not set up [CHAR LIMIT=100] -->
   <!-- User summary to indicate that a work profile is currently not set up [CHAR LIMIT=100] -->
   <!-- User information string to represent the owner of the device [CHAR LIMIT=25] -->
+  <string name="user_owner">Posedanto</string>
   <!-- User settings title for current user entry "You" user. [CHAR LIMIT=30] -->
   <!-- Title for the preference to enter the nickname of the userto display in the user switcher [CHAR LIMIT=25]-->
   <!-- Title for add user type dialog [CHAR LIMIT=45] -->
+  <string name="user_add_user_type_title">Aldoni</string>
   <!-- Summary for add user action, when it's disabled [CHAR LIMIT=100] -->
   <!-- Summary for add user entry in the choice dialog [CHAR LIMIT=none] -->
   <!-- Summary for add restricted profile entry in the choice dialog [CHAR LIMIT=none] -->
   <!-- Button text for adding a regular user [CHAR LIMIT=25] -->
+  <string name="user_add_user_item_title">Uzanto</string>
   <!-- Button text for adding a restricted profile [CHAR LIMIT=25] -->
   <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
   <!-- Message for add user confirmation dialog - long version. [CHAR LIMIT=none] -->
@@ -2536,16 +2662,22 @@
   <!-- User profile removal confirmation message [CHAR LIMIT=none] -->
   <!-- Setting label to show that a new user is being added [CHAR LIMIT=30] -->
   <!-- Spoken content description for delete icon beside a user [CHAR LIMIT=none] -->
+  <string name="user_delete_user_description">Forigi uzanton</string>
   <!-- Delete button text [CHAR LIMIT=25] -->
+  <string name="user_delete_button">Forigi</string>
   <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
   <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <string name="user_guest">Gasto</string>
   <!-- Label for item to exit guest mode [CHAR LIMIT=35] -->
+  <string name="user_exit_guest_title">Forigi gaston</string>
   <!-- Title of dialog to user to confirm exiting guest. [CHAR LIMIT=50] -->
   <!-- Message to user to confirm exiting guest. [CHAR LIMIT=none] -->
   <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <string name="user_exit_guest_dialog_remove">Forigi</string>
   <!-- Title of preference to enable calling[CHAR LIMIT=40] -->
   <!-- Title of preference to enable calling and SMS [CHAR LIMIT=45] -->
   <!-- Title of preference to remove the user [CHAR LIMIT=35] -->
+  <string name="user_remove_user">Forigi uzanton</string>
   <!-- Title for confirmation of turning on calls [CHAR LIMIT=40] -->
   <!-- Message for confirmation of turning on calls [CHAR LIMIT=none] -->
   <!-- Title for confirmation of turning on calls and SMS [CHAR LIMIT=45] -->
@@ -2567,6 +2699,7 @@
   <!-- String indicating the label of the default payment app and a description of its state; eg Google Wallet - MasterCard 1234 -->
   <!-- Header for what to do when the open app supports TapPay: use the default set app, or the open app -->
   <!-- Always use the default app (independent of what app is open) -->
+  <string name="nfc_payment_favor_default">Ĉiam</string>
   <!-- If open app supports TapPay, use that app instead of the default -->
   <!-- Header for a dialog asking the user which payment app to use -->
   <!-- Header for text explaning how to pay at a payment terminal in a store -->
@@ -2650,6 +2783,7 @@
   <!-- Restrictions summary for allowing NFC transfers (tablet) [CHAR LIMIT=100] -->
   <!-- Restrictions summary for allowing NFC transfers (phone) [CHAR LIMIT=100] -->
   <!-- Restrictions title for allowing location sharing [CHAR LIMIT=35] -->
+  <string name="restriction_location_enable_title">Loko</string>
   <!-- Restrictions summary for allowing location sharing [CHAR LIMIT=100] -->
   <!-- Wizard back button label [CHAR LIMIT=25] -->
   <!-- Wizard next button label [CHAR LIMIT=25] -->
@@ -2698,14 +2832,17 @@
   <!-- When a SIM preference hasn't been selected yet, this string is displayed as the pref summary until the user chooses a SIM subscription from the preference list [CHAR LIMIT=50] -->
   <!--Dashboard strings-->
   <!-- Text to describe the dashboard fragment title [CHAR LIMIT=16] -->
+  <string name="dashboard_title">Agordoj</string>
   <!-- Search strings -->
   <!-- Text to describe the search results fragment title [CHAR LIMIT=16] -->
+  <string name="search_results_title">Agordoj</string>
   <!-- Text used as a search hint into the search box -->
   <!-- Text used as a search hint into the search box -->
   <!-- Text used to identify the search query suggestions / recent searches -->
   <!-- Text used to identify the search results -->
   <!--Search Keywords [CHAR LIMIT=NONE]-->
   <!-- Search keywords for display light/dark theme: dark theme, night mode, dim screen, invert brightness [CHAR LIMIT=NONE] -->
+  <string name="keywords_printing">presilo</string>
   <!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
   <!-- NFC Wi-Fi pairing/setup strings-->
   <!-- Write NFC tag for Wi-Fi pairing/setup title [CHAR_LIMIT=30]-->
@@ -2733,6 +2870,7 @@
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Sound section: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
   <!-- Sound & notification: Notification section header [CHAR LIMIT=30] -->
+  <string name="notification_section_header">Sciigo</string>
   <!-- Sound & notification: Advanced section header [CHAR LIMIT=30] -->
   <!-- Sound & notification > Notification section: Title for the pulse notification light option. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Notification section: Title for the option controlling notifications on the lockscreen. [CHAR LIMIT=30] -->
@@ -2746,6 +2884,7 @@
          [CHAR LIMIT=50] -->
   <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Message asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=NONE] -->
   <!-- Security > Choose PIN/PW/Pattern > Notification redaction interstitial: Title for the screen asking the user how they want their notifications to appear when the device is locked [CHAR LIMIT=30] -->
+  <string name="lock_screen_notifications_interstitial_title">Sciigoj</string>
   <!-- Sound & notification > Notification section: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Sound section: Title for the other sounds option and associated settings page. [CHAR LIMIT=30] -->
   <!-- Sound & notification > Other sounds: Title for the option enabling touch sounds for dial pad tones. [CHAR LIMIT=30] -->
@@ -2791,8 +2930,10 @@
   <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule menu option name -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog confirmation message -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Delete rule dialog button caption -->
+  <string name="zen_mode_delete_rule_button">Forigi</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: External rule type -->
   <!-- [CHAR LIMIT=40] Zen mode settings: External rule type name if unknown -->
+  <string name="zen_mode_rule_type_unknown">Nekonata</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Configure external rule -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Schedule rule type name -->
   <!-- [CHAR LIMIT=NONE] Zen mode settings: Schedule rule toast hint when enabled -->
@@ -2807,16 +2948,20 @@
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes, Maybe, or Not replied -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes or Maybe -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Event-based rule reply option value: Yes -->
+  <string name="zen_mode_event_rule_reply_yes">Jes</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Text to display if rule isn't found -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Rule summary template (when enabled) -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Time-based rule days option title -->
+  <string name="zen_mode_schedule_rule_days">Tagoj</string>
   <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, no days set -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Downtime days option value, all days set -->
   <!-- [CHAR LIMIT=40] General divider text when concatenating multiple items in a text summary -->
+  <string name="summary_divider_text">,\u0020</string>
   <!-- [CHAR LIMIT=40] General template for a symbolic start - end range in a text summary -->
   <!-- [CHAR LIMIT=40] General template for a verbal start to end range in a text summary -->
   <!-- [CHAR LIMIT=20] Zen mode settings: Calls option -->
   <!-- [CHAR LIMIT=20] Zen mode settings: Messages option -->
+  <string name="zen_mode_messages">Mesaĝoj</string>
   <!-- [CHAR LIMIT=50] Zen mode settings: Selected messages summary -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From anyone -->
   <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From contacts only -->
@@ -2825,11 +2970,13 @@
   <!-- [CHAR LIMIT=50] Zen mode settings: Alarms option -->
   <!-- [CHAR LIMIT=50] Zen mode settings: Reminders option -->
   <!-- [CHAR LIMIT=50] Zen mode settings: Events option -->
+  <string name="zen_mode_events">Eventoj</string>
   <!-- [CHAR LIMIT=50] Zen mode settings: Selected callers summary -->
   <!-- [CHAR LIMIT=50] Zen mode settings: Repeat callers option -->
   <!-- [CHAR LIMIT=200] Zen mode settings: Repeat callers option summary -->
   <!-- [CHAR LIMIT=20] Zen mode settings: When option -->
   <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Never -->
+  <string name="zen_mode_when_never">Neniam</string>
   <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Every night -->
   <!-- [CHAR LIMIT=20] Zen mode settings: When option value: Weeknights -->
   <!-- [CHAR LIMIT=20] Zen mode settings: Start time option -->
@@ -2901,6 +3048,7 @@
   <!-- Title of button to change storage [CHAR LIMIT=25] -->
   <!-- Title of dialog to change storage [CHAR LIMIT=25] -->
   <!-- Label for notification settings for an specific app [CHAR LIMIT=40] -->
+  <string name="notifications_label">Sciigoj</string>
   <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
   <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
   <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
@@ -3064,6 +3212,7 @@
   <!-- Title of draw overlay screen [CHAR LIMIT=30] -->
   <!-- Settings title in main settings screen for SYSTEM_ALERT_WINDOW [CHAR LIMIT=45] -->
   <!-- Title for the apps with SYSTEM_ALERT_WINDOW permission/privilege [CHAR LIMIT=20] -->
+  <string name="system_alert_window_apps_title">Aplikaĵoj</string>
   <!-- Title for the apps that are allowed to draw on top of other apps [CHAR LIMIT=60] -->
   <!-- Label for setting which controls whether app can draw overlays [CHAR LIMIT=45] -->
   <!-- Link to the apps page for SYSTEM_ALERT_WINDOW settings [CHAR LIMIT=45] -->
@@ -3073,7 +3222,9 @@
   <!-- Summary of number of apps currently can draw overlays [CHAR LIMIT=60] -->
   <!-- Label for showing apps that can draw overlays [CHAR LIMIT=45] -->
   <!-- Summary of app allowed to draw overlay [CHAR LIMIT=60] -->
+  <string name="system_alert_window_on">Jes</string>
   <!-- Summary of app not allowed to draw overlay [CHAR LIMIT=60] -->
+  <string name="system_alert_window_off">Ne</string>
   <!-- Write Settings settings -->
   <!-- Settings title in main settings screen for WRITE_SETTINGS [CHAR LIMIT=30] -->
   <!-- Keyword for WRITE_SETTINGS -->
@@ -3085,7 +3236,9 @@
   <!-- Label for setting which controls whether app can write system settings [CHAR LIMIT=45] -->
   <!-- Description of the write system settings [CHAR LIMIT=NONE] -->
   <!-- Summary of app allowed to write system settings [CHAR LIMIT=45] -->
+  <string name="write_settings_on">Jes</string>
   <!-- Summary of app not allowed to write system settings [CHAR LIMIT=45] -->
+  <string name="write_settings_off">Ne</string>
   <!-- Title of setting that controls gesture to open camera [CHAR LIMIT=40] -->
   <!-- Description of setting that controls gesture to open camera [CHAR LIMIT=NONE] -->
   <!-- Title of setting that controls gesture to open camera by double tapping the power button [CHAR LIMIT=40] -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 37d4cfd..88c9731 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Estás a <xliff:g id="step_count">%1$d</xliff:g> paso de consultar o ID do dispositivo.</item>
+    <item quantity="other">Estás a <xliff:g id="step_count">%1$d</xliff:g> pasos de consultar o ID do dispositivo.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">O ID do dispositivo: [<xliff:g id="device_id">%1$s</xliff:g>] copiouse ao portarretallos</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">O ID do dispositivo non está dispoñíbel nesta compilación</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID do dispositivo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Está a <xliff:g id="step_count">%1$d</xliff:g> paso de activar a configuración de desenvolvemento.</item>
@@ -32,6 +39,8 @@
   <!-- Launch Dev Tools -->
   <string name="development_tools_title">Ferramentas de desenvolvemento</string>
   <!-- Development shortcut -->
+  <string name="development_shortcut_title">Atallo de desenvolvemento</string>
+  <string name="development_shortcut_summary">Activa atallos de xestión das aplicacións na lista de aplciacións recentes</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">Acceso root</string>
   <string name="root_access_warning_title">Permitir acceso root?</string>
@@ -41,13 +50,22 @@
   <string name="root_access_adb">Só ADB</string>
   <string name="root_access_all">Aplicacións e ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Xestionar accesos root</string>
+  <string name="root_appops_summary">Ver e xestionar as regras de root</string>
   <!-- NFC PreferenceCategory title -->
+  <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
+  <string name="mod_version">Versión de CyanogenMod</string>
+  <string name="mod_version_default">Descoñecido</string>
   <!-- About phone screen, Device model -->
+  <string name="device_model">Modelo do dispositivo</string>
   <!-- About phone screen, Device name -->
+  <string name="device_name">Nome do dispositivo</string>
   <!-- About phone screen, CyanogenMod Api Level -->
   <string name="mod_api_level">Nivel API CyanogenMod</string>
+  <string name="mod_api_level_default">Descoñecido</string>
   <!-- About phone screen, build date -->
+  <string name="build_date">Data de compilación</string>
   <!-- CM Updater -->
   <string name="cmupdate_settings_title">Actualizacións de CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
@@ -57,14 +75,17 @@
   <string name="update_recovery_off_warning">AVISO: Con esta funcionalidade desactivada, a recuperación instalada non se actualizará coas actualizacións do sistema.\n\nAs futuras actualizacións do sistema poderían non instalarse con versións de recuperación non actualizadas ou personalizadas.\n\nConfirma a desactivación desta funcionalidade?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
+  <string name="themes_settings_title">Temas</string>
   <!-- Sound settings screen -->
   <string name="ring_mode_title">Modo de chamada</string>
   <string name="ring_mode_normal">Normal</string>
   <string name="ring_mode_vibrate">Vibrar</string>
   <string name="ring_mode_mute">Silenciar</string>
+  <string name="settings_reset_button">Resetear</string>
   <!-- Profiles settings  -->
   <string name="profiles_settings_title">Perfís do sistema</string>
   <string name="profiles_add">Engadir</string>
+  <string name="profile_menu_delete">Eliminar</string>
   <string name="profile_settings_title">Perfil</string>
   <string name="profile_empty_list_profiles_off">Para configurar e empregar os perfís do sistema, actívaos.</string>
   <string name="profile_trigger_configure">Configurar un disparador</string>
@@ -94,11 +115,13 @@
   <!-- Rename Dialog  -->
   <string name="rename_dialog_title">Renomear</string>
   <string name="rename_dialog_message">Escribir un novo nome</string>
+  <string name="duplicate_appgroup_name">Ese nome de grupo de aplicacións xa existe!</string>
   <string name="rename_dialog_hint">Escribir un nome de perfil</string>
   <!-- Reset Profiles -->
   <string name="profile_reset_title">Restabelecer</string>
   <string name="profile_reset_message">Eliminar todos os perfís de usuario creados e os grupos de aplicacións e restaurar os predeterminados?</string>
   <!-- Delete confimation messages -->
+  <string name="profile_app_delete_confirm">Quere borrar esta aplicación?</string>
   <!-- Profile network mode -->
   <string name="profile_networkmode_2g">2G</string>
   <string name="profile_networkmode_3g">3G</string>
@@ -107,20 +130,35 @@
   <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
   <string name="profile_volumeoverrides_title">Modificacións do volume</string>
+  <string name="connection_state_enabled">Activar</string>
   <string name="volume_override_summary">Estabelecer como %1$s%2$s</string>
   <string name="profile_volume_override_checkbox_label">Modificar o volume</string>
   <!-- Menu item for managing profiles -->
   <string name="profile_profiles_manage">Perfís</string>
   <string name="profile_profile_manage">Xestionar o perfil</string>
+  <string name="profile_appgroups_manage">Grupos de aplicacións</string>
+  <string name="profile_appgroup_manage">Xestionar o grupo de aplicacións</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
   <string name="profile_settings">Configuración do perfil</string>
   <string name="profile_trigger_connect">Ao conectar</string>
   <string name="profile_trigger_disconnect">Ao desconectar</string>
   <string name="profile_trigger_notrigger">Sen activador</string>
   <!-- Profile Settings sound modes labels -->
+  <string name="sound_mode">Modo de notificación</string>
+  <string name="ringer_mode">Modo de chamada</string>
+  <string name="lights_mode">Modo de luces</string>
+  <string name="vibrate_mode">Modo de vibración</string>
+  <string name="choose_soundtone">Escoller ton de notificación</string>
+  <string name="choose_ringtone">Escoller ton de chamada</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
+  <string name="soundtone_title">Ton de notificación</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupo de aplicacións</string>
   <string name="profile_applist_title">Aplicacións</string>
+  <string name="profile_new_appgroup">Novo grupo de aplicacións</string>
+  <string name="profile_delete_appgroup">Quere borrar este grupo de aplicacións?</string>
+  <string name="profile_appgroup_name_prompt">Introducir un nombre para o novo grupo de aplicacións</string>
+  <string name="profile_appgroup_name_title">Nome</string>
   <!-- Add application dialog box title -->
   <string name="profile_choose_app">Escoller aplicación</string>
   <!-- Profiles - system settings -->
@@ -141,31 +179,184 @@
   <string name="toggleData">Conexión de datos</string>
   <string name="toggleSync">Sincronización automática dos datos</string>
   <string name="toggle2g3g4g">Tipo de rede preferido</string>
+  <string name="toggle2g3g4g_msim">Tipo de rede preferida (%1$s)</string>
   <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
+  <string name="wifi_setting_countrycode_title">Código de rexión Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
+  <string name="wifi_setting_countrycode_summary">Especificar o código de rexión para o Wi\u2011Fi</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
+  <string name="wifi_setting_countrycode_error">Produciuse un problema ao definir o código de rexión.</string>
+  <string name="wifi_countrycode_us">Estados Unidos</string>
+  <string name="wifi_countrycode_ca">Canadá, Taiwan</string>
+  <string name="wifi_countrycode_de">Alemaña</string>
+  <string name="wifi_countrycode_gb">Europa</string>
+  <string name="wifi_countrycode_jp">Xapón, Rusia</string>
+  <string name="wifi_countrycode_au">Australia</string>
+  <string name="wifi_countrycode_cn">China</string>
+  <string name="wifi_countrycode_kr">Corea</string>
+  <string name="wifi_countrycode_tr">Sudáfrica, Turquía</string>
+  <string name="wifi_countrycode_sg">Israel, Singapur</string>
+  <string name="wifi_countrycode_br">Brasil</string>
+  <string name="wifi_countrycode_in">India</string>
   <!-- Profiles -->
+  <string name="profile_menu_delete_title">Eliminar</string>
+  <string name="profile_action_none">Deixar sen cambiar</string>
+  <string name="profile_action_system">Predefinida do sistema</string>
+  <string name="profile_action_disable">Apagar</string>
+  <string name="profile_action_enable">Acender</string>
+  <string name="profile_trigger_a2dp_connect">Ao conectar A2DP</string>
+  <string name="profile_trigger_a2dp_disconnect">Ao desconectar A2DP</string>
+  <string name="profile_tabs_wifi">Wi\u2011Fi</string>
+  <string name="profile_tabs_bluetooth">Bluetooth</string>
+  <string name="profile_tabs_nfc">NFC</string>
+  <string name="profile_triggers_header">Eventos que activarán este perfil</string>
+  <string name="profile_setup_setup_triggers_title">Paso 1: Engadir eventos</string>
+  <string name="profile_setup_setup_triggers_title_config">Modificar eventos: <xliff:g id="profile_name">%1$s</xliff:g></string>
+  <string name="profile_setup_actions_title">Paso 2: Configurar accións</string>
+  <string name="profile_setup_actions_title_config">Reconfigurar accións</string>
+  <string name="profile_appgroups_manage">Grupos de aplicacións</string>
+  <string name="profile_appgroup_manage">Xestionar o grupo de aplicacións</string>
   <!-- Title for application group setting screen -->
+  <string name="profile_appgroups_title">Grupo de aplicacións</string>
+  <string name="profile_new_appgroup">Novo grupo de aplicacións</string>
+  <string name="profile_delete_appgroup">Quere borrar este grupo de aplicacións?</string>
+  <string name="profile_appgroup_name_prompt">Introducir un nombre para o novo grupo de aplicacións</string>
+  <string name="profile_appgroup_name_title">Nome</string>
+  <string name="duplicate_appgroup_name">Ese nome de grupo de aplicacións xa existe!</string>
+  <string name="profile_app_delete_confirm">Quere borrar esta aplicación?</string>
+  <string name="no_bluetooth_triggers">Non hai dispositivos Bluetooth aparellados.\nToque para emparellar o dispositivo Bluetooth antes de configurar activadores.</string>
+  <string name="no_wifi_triggers">Non hai pontos de acesso wi\u2011fi configurados.\nToque para conectar o Wi\u2011Fi antes de configurar os activadores.</string>
+  <string name="no_triggers_configured">Non hai activadores configurados. Toque para engadir.</string>
+  <string name="no_triggers_configured_nfc">Toque para estabelecer un novo activador NFC.</string>
+  <string name="profile_setup_setup_triggers_description">Seleccione os activadores que activarán este perfil</string>
+  <string name="profile_setup_actions_description">Agora configure o que sucederá cando se active o perfil</string>
   <!-- Navigation Bar -->
+  <string name="navigation_bar_category">Barra de navegación</string>
+  <string name="navigation_bar_left_title">Modo para zurdo</string>
+  <string name="navigation_bar_left_summary">Colocar a barra de navegación no lado esquerdo da pantalla cando estea en modo horizontal</string>
+  <string name="navigation_bar_title">Botóns e disposición</string>
+  <string name="navigation_bar_help_text">Para comezar, toque a icona de editar para abrir a barra de navegación en modo de edición.\n\nPode tocar a icona para cambiar o seu acceso directo, ou manter pulsada unha icona para volver a organizar a súa disposición.\n\nToque sobre \"Gardar\" para gardar os cambios, ou \"Restaurar\" para volver á disposición predefinida.</string>
+  <string name="navigation_restore_button_text">Restaurar\npadrón</string>
+  <string name="navigation_edit_button_text">Editar</string>
+  <string name="navigation_save_button_text">Gardar</string>
+  <string name="navigation_bar_reset_message">Eliminar a configuración actual e restaurar a disposición predefinida?</string>
+  <string name="navigation_bar_arrow_keys_title">Amosar as frechas ao escribir</string>
+  <string name="navigation_bar_arrow_keys_summary">Amosar os cursores esquerda e dereita ao escribir. Substitúe ao selector IME.</string>
+  <string name="navigation_bar_recents_title">Toque un tempo en aplicacións recentes</string>
   <!-- Notification light dialogs -->
+  <string name="edit_light_settings">Editar a configuración da luz</string>
+  <string name="pulse_speed_title">Duración e velocidade ao pestanexar</string>
+  <string name="default_time">Normal</string>
+  <string name="custom_time">Personalizado</string>
+  <string name="dialog_delete_title">Eliminar</string>
+  <string name="dialog_delete_message">Eliminar o elemento seleccionado?</string>
   <!-- Values for the notification light pulse spinners -->
+  <string name="pulse_length_always_on">Sempre acendida</string>
+  <string name="pulse_length_very_short">Moi curta</string>
+  <string name="pulse_length_short">Curta</string>
+  <string name="pulse_length_normal">Normal</string>
+  <string name="pulse_length_long">Longa</string>
+  <string name="pulse_length_very_long">Moi longa</string>
+  <string name="pulse_speed_very_fast">Moi rápida</string>
+  <string name="pulse_speed_fast">Rápida</string>
+  <string name="pulse_speed_normal">Normal</string>
+  <string name="pulse_speed_slow">Lenta</string>
+  <string name="pulse_speed_very_slow">Moi lenta</string>
   <!-- Battery light settings -->
+  <string name="battery_light_title">Luz da batería</string>
+  <string name="battery_low_pulse_title">Parpadear se hai pouca batería</string>
+  <string name="battery_light_list_title">Cores</string>
+  <string name="battery_light_low_color_title">Batería baixa</string>
+  <string name="battery_light_medium_color_title">A cargar</string>
+  <string name="battery_light_full_color_title">Completamente cargada</string>
   <!-- Lights settings screen, notification light settings -->
+  <string name="notification_light_title">Luz de notificación</string>
+  <string name="notification_light_general_title">Xeral</string>
+  <string name="notification_light_applist_title">Aplicacións</string>
+  <string name="notification_light_phonelist_title">Teléfono</string>
+  <string name="notification_light_use_custom">Utilizar valores personalizados</string>
+  <string name="notification_light_default_value">Predefinido</string>
+  <string name="notification_light_missed_call_title">Chamada perdida</string>
+  <string name="notification_light_voicemail_title">Caixa de voz</string>
+  <string name="notification_light_screen_on">Luces coa pantalla acesa</string>
+  <string name="notification_light_zen_mode">Luces no modo non molestar</string>
+  <string name="notification_light_use_multiple_leds">Múltiples LEDs</string>
+  <string name="keywords_lights_brightness_level">atenuar o brillo dos leds</string>
+  <string name="notification_light_automagic">Escoller cores automaticamente</string>
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Configuración de luz</string>
   <string name="led_notification_text">Luz do LED activada pola configuración</string>
+  <string name="notification_light_no_apps_summary">Para engadir control por aplicación, active \'%1$s\' e prema \'\u002b\' na barra de menús</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
+  <string name="enable_adb_cm">Depuración de Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
+  <string name="enable_adb_summary_cm">Activa a interface de depuración Android Debug Bridge (ADB)</string>
   <!-- Android debugging over WiFi -->
+  <string name="adb_over_network">ADB na rede</string>
+  <string name="adb_over_network_summary">Activar a depuración TCP/IP sobre as interfaces de rede (Wi\u2011FI, redes USB). Esta configuración restabelecese ao reiniciar</string>
   <!-- Warning for Adb over Network -->
+  <string name="adb_over_network_warning">AVISO: Cando está habilitado ADB sobre red, o dispositivo está aberto a intrusións en tódalas redes conectadas.\n\nUtilice esta función tan só cando estea conectado a redes de confianza.\n\nDe verdade desexa activar esta función?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
+  <string name="adb_notify">Notificar de depuración</string>
+  <string name="adb_notify_summary">Notifica cando está activada a depuración da rede ou o dispositivo USB</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
+  <string name="app_ops_categories_location">Lugar</string>
+  <string name="app_ops_categories_personal">Persoal</string>
+  <string name="app_ops_categories_messaging">Mensaxes</string>
+  <string name="app_ops_categories_media">Multimedia</string>
+  <string name="app_ops_categories_device">Dispositivo</string>
+  <string name="app_ops_categories_bootup">Execución</string>
+  <string name="app_ops_categories_su">Acceso de superusuario</string>
   <!-- User display names for app ops codes - extension of AOSP -->
+  <string name="app_ops_summaries_coarse_location">ubicación aproximada</string>
+  <string name="app_ops_summaries_fine_location">ubicación exacta</string>
+  <string name="app_ops_summaries_gps">GPS</string>
+  <string name="app_ops_summaries_vibrate">vibrar</string>
+  <string name="app_ops_summaries_read_contacts">ler os contactos</string>
+  <string name="app_ops_summaries_modify_contacts">modificar os contactos</string>
+  <string name="app_ops_summaries_read_call_log">ler o rexistro de chamadas</string>
+  <string name="app_ops_summaries_modify_call_log">modificar o rexistro de chamadas</string>
+  <string name="app_ops_summaries_read_calendar">ler o calendario</string>
+  <string name="app_ops_summaries_modify_calendar">modificar o calendario</string>
   <string name="app_ops_summaries_wifi_scan">Varrido wifi</string>
   <string name="app_ops_summaries_notification">notificación/emerxente</string>
+  <string name="app_ops_summaries_cell_scan">buscando conexiones de rede</string>
+  <string name="app_ops_summaries_call_phone">facer chamadas de teléfono</string>
+  <string name="app_ops_summaries_read_sms">ler SMS</string>
+  <string name="app_ops_summaries_write_sms">escribir SMS</string>
+  <string name="app_ops_summaries_receive_sms">recibir SMS</string>
+  <string name="app_ops_summaries_receive_emergency_sms">recibir SMS de emerxencia</string>
+  <string name="app_ops_summaries_receive_mms">recibir MMS</string>
+  <string name="app_ops_summaries_receive_wap_push">recibir mensajes WAP Push</string>
+  <string name="app_ops_summaries_send_sms">enviar SMS</string>
+  <string name="app_ops_summaries_read_icc_sms">ler ICC SMS</string>
+  <string name="app_ops_summaries_write_icc_sms">escribir ICC SMS</string>
+  <string name="app_ops_summaries_modify_settings">modificar a configuración</string>
+  <string name="app_ops_summaries_draw_on_top">debuxar na zona superior</string>
+  <string name="app_ops_summaries_access_notifications">acceder ás notificacións</string>
+  <string name="app_ops_summaries_camera">cámara</string>
+  <string name="app_ops_summaries_record_audio">gravar son</string>
+  <string name="app_ops_summaries_play_audio">reproducir son</string>
+  <string name="app_ops_summaries_read_clipboard">ler o portarretallos</string>
+  <string name="app_ops_summaries_modify_clipboard">modificar o portapapeis</string>
+  <string name="app_ops_summaries_media_buttons">botóns de multimedia</string>
+  <string name="app_ops_summaries_audio_focus">focus audio</string>
+  <string name="app_ops_summaries_master_volume">volume global</string>
+  <string name="app_ops_summaries_voice_volume">volume da voz</string>
+  <string name="app_ops_summaries_ring_volume">volume das chamadas</string>
+  <string name="app_ops_summaries_media_volume">volume de multimedia</string>
+  <string name="app_ops_summaries_alarm_volume">volume das alarmas</string>
+  <string name="app_ops_summaries_notification_volume">volume das notificacións</string>
   <string name="app_ops_summaries_bluetooth_volume">volume do Bluetooth</string>
+  <string name="app_ops_summaries_keep_awake">manter esperto</string>
+  <string name="app_ops_summaries_monitor_location">consultar ubicación aproximada</string>
+  <string name="app_ops_summaries_monitor_high_power_location">consultar ubicación exacta</string>
   <string name="app_ops_summaries_get_usage_stats">obter estatísticas de utilización</string>
+  <string name="app_ops_summaries_mute_unmute_microphone">activar/desactivar o micrófono</string>
+  <string name="app_ops_summaries_toast_window">amosar notificacións emerxentes</string>
+  <string name="app_ops_summaries_project_media">visualizar recursos multimedia</string>
+  <string name="app_ops_summaries_activate_vpn">activar VPN</string>
   <string name="app_ops_summaries_write_wallpaper">escribir fondo de pantalla</string>
   <string name="app_ops_summaries_assist_structure">asistente de estrutura</string>
   <string name="app_ops_summaries_assist_screenshot">asistente de captura de pantalla</string>
@@ -185,21 +376,57 @@
   <string name="app_ops_summaries_toggle_bluetooth">trocar bluetooh</string>
   <string name="app_ops_summaries_start_at_boot">iniciar co arranque</string>
   <string name="app_ops_summaries_toggle_nfc">trocar NFC</string>
+  <string name="app_ops_summaries_toggle_mobile_data">mudar os datos móbeis</string>
+  <string name="app_ops_summaries_superuser">acceso de superusuario</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Localización imprecisa</string>
   <string name="app_ops_labels_fine_location">Localización precisa</string>
   <string name="app_ops_labels_gps">GPS</string>
+  <string name="app_ops_labels_vibrate">Vibrar</string>
+  <string name="app_ops_labels_read_contacts">Ler os contactos</string>
+  <string name="app_ops_labels_modify_contacts">Modificar os contactos</string>
+  <string name="app_ops_labels_read_call_log">Ler o rexistro de chamadas</string>
+  <string name="app_ops_labels_modify_call_log">Modificar o rexistro de chamadas</string>
+  <string name="app_ops_labels_read_calendar">Ler o calendario</string>
+  <string name="app_ops_labels_modify_calendar">Modificar o calendario</string>
   <string name="app_ops_labels_wifi_scan">Varrido wifi</string>
+  <string name="app_ops_labels_notification">Notificación/Notificación emerxente</string>
   <string name="app_ops_labels_cell_scan">Varrido de célula</string>
+  <string name="app_ops_labels_call_phone">Chamar</string>
   <string name="app_ops_labels_read_sms">Ler SMS</string>
   <string name="app_ops_labels_write_sms">Escribir SMS</string>
+  <string name="app_ops_labels_receive_sms">Recibir SMS</string>
   <string name="app_ops_labels_receive_emergency_sms">Recibir SMS de emerxencia</string>
+  <string name="app_ops_labels_receive_mms">Recibir MMS</string>
   <string name="app_ops_labels_receive_wap_push">Recibir push WAP</string>
+  <string name="app_ops_labels_send_sms">Enviar SMS</string>
   <string name="app_ops_labels_read_icc_sms">Ler SMS ICC</string>
   <string name="app_ops_labels_write_icc_sms">Escribir SMS ICC</string>
+  <string name="app_ops_labels_modify_settings">Modificar configuración</string>
+  <string name="app_ops_labels_draw_on_top">Amosar enriba</string>
+  <string name="app_ops_labels_access_notifications">Acceso ás notificacións</string>
+  <string name="app_ops_labels_camera">Cámara</string>
+  <string name="app_ops_labels_record_audio">Gravar son</string>
+  <string name="app_ops_labels_play_audio">Reproducir son</string>
+  <string name="app_ops_labels_read_clipboard">Ler o portarretallos</string>
+  <string name="app_ops_labels_modify_clipboard">Modificar o portarretallos</string>
+  <string name="app_ops_labels_media_buttons">Botóns de multimedia</string>
+  <string name="app_ops_labels_audio_focus">Focus audio</string>
+  <string name="app_ops_labels_master_volume">Volume global</string>
+  <string name="app_ops_labels_voice_volume">Volume da voz</string>
+  <string name="app_ops_labels_ring_volume">Volume das chamadas</string>
+  <string name="app_ops_labels_media_volume">Volume de multimedia</string>
+  <string name="app_ops_labels_alarm_volume">Volume das alarmas</string>
+  <string name="app_ops_labels_notification_volume">Volume das notificacións</string>
+  <string name="app_ops_labels_bluetooth_volume">Volume do Bluetooth</string>
+  <string name="app_ops_labels_keep_awake">Manter esperto</string>
   <string name="app_ops_labels_monitor_location">Monitor de localización</string>
   <string name="app_ops_labels_monitor_high_power_location">Monitor de localización de alta precisión</string>
   <string name="app_ops_labels_get_usage_stats">Obter estatísticas de uso</string>
+  <string name="app_ops_labels_mute_unmute_microphone">Activar/Desactivar micrófono</string>
+  <string name="app_ops_labels_toast_window">Amosar notificacións emerxentes</string>
+  <string name="app_ops_labels_project_media">Visualizar recursos multimedia</string>
+  <string name="app_ops_labels_activate_vpn">Activar VPN</string>
   <string name="app_ops_labels_write_wallpaper">Escribir fondo de pantalla</string>
   <string name="app_ops_labels_assist_structure">Asistente de estrutura</string>
   <string name="app_ops_labels_assist_screenshot">Asistente de captura de pantalla</string>
@@ -219,11 +446,29 @@
   <string name="app_ops_labels_toggle_bluetooth">Trocar bluetooh</string>
   <string name="app_ops_labels_start_at_boot">Iniciar co arranque</string>
   <string name="app_ops_labels_toggle_nfc">Trocar NFC</string>
+  <string name="app_ops_labels_toggle_mobile_data">Mudar os datos móbeis</string>
   <string name="app_ops_labels_superuser">Acceso root</string>
   <!-- App ops permissions -->
+  <string name="app_ops_permissions_allowed">Permitido</string>
+  <string name="app_ops_permissions_ignored">Non permitido</string>
+  <string name="app_ops_permissions_always_ask">Preguntar sempre</string>
   <!-- App ops detail -->
+  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (usados <xliff:g id="count">%2$s</xliff:g>)</string>
+  <string name="app_ops_allowed_count">Permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_ignored_count">Non permitido <xliff:g id="count" example="2 times">%s</xliff:g></string>
+  <string name="app_ops_both_count">Permitido <xliff:g id="count">%1$s</xliff:g>, non permitido <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Desactivado polo optimizador de batería</string>
   <!-- App ops menu options -->
+  <string name="app_ops_show_user_apps">Amosar aplicacións do usuario</string>
+  <string name="app_ops_show_system_apps">Amosar aplicacións do sistema</string>
+  <string name="app_ops_reset_counters">Reiniciar os contadores de permitidos/non permitidos</string>
+  <string name="app_ops_reset_confirm_title">Confirmar o reinicio de contadores</string>
+  <string name="app_ops_reset_confirm_mesg">Está seguro de querer reiniciar os contadores?</string>
+  <string name="ok">Aceptar</string>
   <!-- Hostname setting -->
+  <string name="device_hostname">Nome do dispositivo</string>
+  <string name="unlock_scramble_pin_layout_title">Disposición aleatoria</string>
+  <string name="unlock_scramble_pin_layout_summary">Cambiar a disposición dos números do PIN para desbloquear o dispositivo</string>
   <string name="button_pref_title">Botóns</string>
   <string name="hardware_keys_power_key_title">Botón de acendido</string>
   <string name="hardware_keys_home_key_title">Botón Inicio</string>
@@ -248,6 +493,7 @@
   <string name="camera_sleep_on_release_title">Vista rápida</string>
   <string name="camera_sleep_on_release_summary">Unha leve pulsación manterá a pantalla acendida ata que se solte o botón</string>
   <string name="camera_launch_title">Iniciar a cámara</string>
+  <string name="camera_launch_summary">Unha pulsación longa activará a cámara</string>
   <string name="volbtn_music_controls_title">Control de reprodución</string>
   <string name="volbtn_music_controls_summary">Cando a pantalla estea apagada, se preme as teclas de volume, buscaranse pistas de música</string>
   <string name="volbtn_cursor_control_title">Control do cursor</string>
@@ -262,8 +508,14 @@
   <string name="home_answer_call_title">Coller chamada</string>
   <string name="home_answer_call_summary">Ao premer o botón de inicio, collerase a chamada entrante</string>
   <!-- Backlight brightness settings screen -->
+  <string name="adaptive_backlight_title">Retroiluminación adaptable</string>
+  <string name="adaptive_backlight_summary">Axusta de forma intelixente o brillo da retroiluminación da pantalla, axudando así á duración da batería</string>
   <!-- Sunlight readability enhancement screen -->
+  <string name="sunlight_enhancement_title">Mellora baixo luz solar</string>
+  <string name="sunlight_enhancement_summary">Aumentar a luminosidade e lexibilidade da pantalla baixo luz solar brillante</string>
   <!-- Color enhancement settings screen -->
+  <string name="color_enhancement_title">Realce da cor</string>
+  <string name="color_enhancement_summary">Realzar dinamicamente a cor da pantalla</string>
   <!-- Key backlight -->
   <string name="button_backlight_title">Contraluz</string>
   <string name="button_backlight_enabled">Iluminar os botóns</string>
@@ -277,21 +529,52 @@
   <string name="backlight_summary_enabled">Activado</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
+  <string name="gesture_settings_title">Xestos</string>
   <!-- Power menu -->
   <string name="power_menu_title">Menú de apagado</string>
   <string name="power_menu_reboot_title">Menú de reinicio</string>
+  <string name="power_menu_screenshot_title">Captura de pantalla</string>
+  <string name="power_menu_airplane_title">Modo avión</string>
+  <string name="power_menu_users_title">Selector de usuario</string>
+  <string name="power_menu_settings_title">Atallos da configuración</string>
+  <string name="power_menu_lockdown_title">Bloqueo de dispositivo</string>
+  <string name="power_menu_bug_report_title">Informe de erros</string>
+  <string name="power_menu_sound_title">Panel de sonido</string>
+  <string name="power_menu_bug_report_disabled">O informe de erros está desativado nas opcións de desenvolvemento</string>
   <!-- Buttons - Enable navbar -->
+  <string name="disable_navkeys_title">Habilitar barra de navegación</string>
+  <string name="disable_navkeys_summary">Habilitar a barra de navegación na pantalla e deshabilitar os botóns físicos</string>
   <!-- tap-to-wake -->
+  <string name="double_tap_to_wake_title">Tocar dúas veces para acender</string>
+  <string name="double_tap_to_wake_summary">Toque dúas veces a pantalla para acendela</string>
   <!-- tap-to-sleep -->
+  <string name="double_tap_to_sleep_title">Doble toque para apagar a pantalla</string>
+  <string name="double_tap_to_sleep_summary">Toque dúas veces na barra de estado para apagar a visualización</string>
   <!-- Proximity wake -->
+  <string name="proximity_wake_title">Previr acender de forma accidental</string>
+  <string name="proximity_wake_summary">Comprobar o sensor de proximidade antes de acender a pantalla</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
+  <string name="wake_when_plugged_or_unplugged_title">Acender ao enchufar</string>
+  <string name="wake_when_plugged_or_unplugged_summary">Acende a pantalla ao contectarse e desconectarse dunha fonte de enerxía</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
+  <string name="font_size_sample">Mostra</string>
   <!-- Volume settings - Volume adjustment sound -->
+  <string name="volume_adjust_sounds_title">Sonidos de axuste de volume</string>
   <!-- Hardware tunables - Vibrator intensity -->
+  <string name="vibrator_intensity_title">Intensidade da vibración</string>
+  <string name="vibrator_warning">Non se recomendan valores maiores de %1$d%%</string>
   <!-- Hardware tunables - Color calibration -->
+  <string name="color_calibration_title">Calibración da cor</string>
+  <string name="color_calibration_summary">Calibrar as cores da pantalla</string>
+  <string name="color_red_title">Vermello</string>
+  <string name="color_green_title">Verde</string>
+  <string name="color_blue_title">Azul</string>
   <!-- Launch music player when headset is connected -->
+  <string name="headset_connect_player_title">Iniciar aplicación de música</string>
+  <string name="headset_connect_player_summary">Iniciar a aplicación de música por defecto ao conectar auriculares</string>
   <!-- WiFi auto-configure priorities -->
+  <string name="wifi_auto_config_priorities">Prioridade automática</string>
   <string name="auto_brightness_reset_button">Restabelecer</string>
   <!-- Display : Rotation  -->
   <string name="display_rotation_title">Rotación</string>
@@ -304,68 +587,262 @@
   <string name="display_rotation_180_title">180 graos</string>
   <string name="display_rotation_270_title">270 graos</string>
   <!-- LiveDisplay -->
+  <string name="live_display_summary">Optimizar a súa pantalla baseandose na hora do día e as condicións ambientais para mellorar a lexibilidade e reducir o cansanzo visual</string>
+  <string name="live_display_mode">Modo de visualización</string>
+  <string name="live_display_color_temperature_title">Temperatura da cor</string>
+  <string name="live_display_color_temperature_summary">Día: <xliff:g id="day_temperature">%1$d</xliff:g>K Noite:<xliff:g id="night_temperature">%2$d</xliff:g>K</string>
+  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
+  <string name="live_display_day">Día</string>
+  <string name="live_display_night">Noite</string>
+  <string name="live_display_outdoor_mode_title">Modo exterior automático</string>
+  <string name="live_display_outdoor_mode_summary">Aumenta o brillo e saturación automáticamente ao estar baixo luz solar intensa</string>
+  <string name="live_display_low_power_title">Reducir o consumo de enerxía</string>
+  <string name="live_display_low_power_summary">Axusta a pantalla ata o mínimo consumo de nergía sen perda de calidade</string>
+  <string name="live_display_enhance_color_title">Mellorar cores</string>
+  <string name="live_display_enhance_color_summary">Mellora a viveza dos tons da pel, entorno e outras imaxes</string>
+  <string name="live_display_color_profile_title">Pefil de cor</string>
+  <string name="live_display_color_profile_standard_title">Estándar</string>
+  <string name="live_display_color_profile_standard_summary">Cores precisas e brancos brillantes</string>
+  <string name="live_display_color_profile_natural_title">Natural</string>
+  <string name="live_display_color_profile_natural_summary">Cores realistas e tons da pel</string>
+  <string name="live_display_color_profile_dynamic_title">Dinámico</string>
+  <string name="live_display_color_profile_dynamic_summary">Cores melloradas e brancos brillantes</string>
+  <string name="live_display_color_profile_cinema_title">Cine</string>
   <string name="live_display_color_profile_cinema_summary">Reprodución perfecta da cor para os vídeos</string>
+  <string name="live_display_color_profile_astronomy_title">Astronomía</string>
+  <string name="live_display_color_profile_astronomy_summary">Vermello profundo para preservar a visión noturna</string>
   <string name="live_display_color_profile_photography_title">Fotografía</string>
   <string name="live_display_color_profile_photography_summary">Reprodución da cor perfecta para as fotos</string>
   <string name="live_display_color_profile_basic_title">Básico</string>
   <string name="live_display_color_profile_basic_summary">Empregar a pantalla sen calibrar</string>
+  <string name="live_display_color_profile_adaptive_title">Adaptable</string>
+  <string name="live_display_color_profile_adaptive_summary">As cores adáptanse ás condicións ambientais</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Axustes de imaxe</string>
+  <string name="picture_adjustment_summary">Axustar tonalidade, saturación, intensidade e contraste</string>
+  <string name="adj_hue_title">Tonalidade</string>
+  <string name="adj_saturation_title">Saturación</string>
+  <string name="adj_intensity_title">Intensidade</string>
+  <string name="adj_contrast_title">Contraste</string>
   <!-- Whether to display IME switcher notifcation -->
+  <string name="ime_switcher_notify">Icona de selección</string>
+  <string name="ime_switcher_notify_summary">Amosa a icona de selección do método de entrada</string>
   <!-- Heads up -->
+  <string name="heads_up_notifications">Notificacións emerxentes</string>
+  <string name="summary_heads_up_enabled">Activáronse as notificacións emerxentes</string>
+  <string name="summary_heads_up_disabled">Desactiváronse as notificacións emerxentes</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
+  <string name="bluetooth_accept_all_files">Aceptar tódolos tipos de ficheiros</string>
   <!-- High touch sensitivity -->
+  <string name="high_touch_sensitivity_title">Alta sensibilidade</string>
+  <string name="high_touch_sensitivity_summary">Aumentar a sensibilidade da pantalla para poder utilizalo con luvas</string>
   <!-- Display & Lights screen, setting options for LCD density -->
+  <string name="lcd_density">Densidade LCD</string>
+  <string name="dialog_title_lcd_density">Densidade LCD</string>
+  <string name="lcd_density_value_format">%d DPI</string>
+  <string name="lcd_density_default_value_format">%d DPI (predefinido)</string>
+  <string name="restarting_ui">Reiniciando UI\u2026</string>
   <!-- Stylus Icon -->
+  <string name="stylus_icon_enabled_title">Amosar iconas ao usar o lápis</string>
+  <string name="stylus_icon_enabled_summary">Amosar o cursor ao arrastrar ou diseñar co lápis</string>
   <!-- Stylus Gestures -->
+  <string name="gestures_settings_title">Xestos co lápis</string>
+  <string name="category_spen_title">Xestos co lápis</string>
+  <string name="enable_subcat_title">Lápis</string>
+  <string name="enable_spen_title_head">Habilitar xestos</string>
+  <string name="enable_spen_summary_head">Use xestos de arrastre mantendo o botón do lápis premido</string>
+  <string name="gestures_subcat_title">Xestos</string>
+  <string name="gestures_left_spen_title_head">Arrastrar á esquerda</string>
+  <string name="gestures_right_spen_title_head">Arrastrar á dereita</string>
+  <string name="gestures_up_spen_title_head">Arrastrar cara arriba</string>
+  <string name="gestures_down_spen_title_head">Arrastrar cara abaixo</string>
+  <string name="gestures_long_spen_title_head">Premer un tempo</string>
+  <string name="gestures_double_spen_title_head">Tocar dúas veces</string>
   <!-- Gestures Options -->
+  <string name="gestures_action_empty">Ningunha acción</string>
+  <string name="gestures_action_home">Inicio</string>
+  <string name="gestures_action_back">Volver</string>
+  <string name="gestures_action_menu">Menú</string>
+  <string name="gestures_action_search">Iniciar busca</string>
+  <string name="gestures_action_recent">Aplicacións recentes</string>
   <!-- Stylus gestures -->
+  <string name="stylus_app_not_installed">%s non está instalada</string>
   <!-- Touchscreen hovering -->
+  <string name="touchscreen_hovering_title">Pantalla táctil deslizante</string>
+  <string name="touchscreen_hovering_summary">Permítelle utilizar o dedo coma un rato ao deslizalo en navegadores web, escritorios remotos, etc.</string>
   <!-- Increasing ring tone volume -->
+  <string name="increasing_ring_volume_option_title">Aumentando o volume de chamada</string>
+  <string name="increasing_ring_min_volume_title">Volume inicial</string>
+  <string name="increasing_ring_ramp_up_time_title">Intervalo de aumento</string>
   <!-- LTO download data over wi-fi only -->
+  <string name="lto_download_data_wifi_only">Descarga de datos por GPS</string>
+  <string name="lto_download_data_wifi_only_on">En ningunha rede</string>
+  <string name="lto_download_data_wifi_only_off">Só através de redes Wi\u2011Fi</string>
   <string name="volume_keys_control_ring_stream_title">Control do volume do ton</string>
   <string name="volume_keys_control_ring_stream_summary_on">As teclas de volume controlan o volume do ton de chamada</string>
   <string name="volume_keys_control_ring_stream_summary_off">As teclas de volume controlan o volume multimedia</string>
+  <string name="category_calibration">Calibración</string>
+  <string name="display_and_lights">Visualización e luces</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
+  <string name="power_notifications_category_title">Sons de carga</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
+  <string name="power_notifications_enable_title">Activar</string>
+  <string name="power_notifications_enable_summary">Reproducir un son ao conectar e desconectar a fonte de alimentación</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
+  <string name="power_notifications_vibrate_title">Vibrar</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
+  <string name="power_notifications_ringtone_title">Son de notificación</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
+  <string name="power_notifications_ringtone_silent">Silencio</string>
   <!-- Status bar -->
+  <string name="status_bar_title">Barra de estado</string>
+  <string name="status_bar_toggle_brightness">Control de brillo</string>
+  <string name="status_bar_toggle_brightness_summary">Axustar o brillo arrastrando pola barra de estado</string>
+  <string name="status_bar_notif_count_title">Amosar contador de notificacións</string>
+  <string name="status_bar_notif_count_summary">Amosar o número de notificacións pendentes</string>
+  <string name="status_bar_quick_qs_pulldown_title">Tirar para abaixo</string>
+  <string name="status_bar_quick_qs_pulldown_summary">%1$s na esquina da barra de estado abre a Configuración rápida</string>
+  <string name="status_bar_quick_qs_pulldown_summary_left">Esquerda</string>
+  <string name="status_bar_quick_qs_pulldown_summary_right">Dereita</string>
   <string name="status_bar_quick_qs_pulldown_off">Apagado</string>
+  <string name="status_bar_quick_qs_pulldown_left">Esquerda</string>
+  <string name="status_bar_quick_qs_pulldown_right">Dereita</string>
   <!-- Status bar - Clock -->
+  <string name="status_bar_clock_style_title">Estilo do reloxo</string>
+  <string name="status_bar_clock_style_right">Dereita</string>
+  <string name="status_bar_clock_style_left">Esquerda</string>
+  <string name="status_bar_clock_style_center">Centro</string>
+  <string name="status_bar_clock_style_hidden">Agochado</string>
+  <string name="status_bar_am_pm_title">Estilo AM/PM</string>
+  <string name="status_bar_am_pm_info">O formato de 24 horas está ativo</string>
+  <string name="status_bar_am_pm_normal">Normal</string>
+  <string name="status_bar_am_pm_small">Pequeno</string>
+  <string name="status_bar_am_pm_hidden">Agochado</string>
   <!-- Status bar - Battery -->
+  <string name="status_bar_battery_style_title">Estilo do estado da batería</string>
+  <string name="status_bar_battery_style_icon_portrait">Icona vertical</string>
+  <string name="status_bar_battery_style_icon_landscape">Icona horizontal</string>
+  <string name="status_bar_battery_style_circle">Círculo</string>
+  <string name="status_bar_battery_style_text">Texto</string>
+  <string name="status_bar_battery_style_hidden">Agochado</string>
   <!-- Status bar - Battery percentage -->
+  <string name="status_bar_battery_percentage_title">Porcentaxe de batería</string>
+  <string name="status_bar_battery_percentage_default">Agochado</string>
+  <string name="status_bar_battery_percentage_text_inside">Dentro da icona</string>
+  <string name="status_bar_battery_percentage_text_next">Ao carón da icona</string>
   <!-- Status bar - icon blacklist -->
   <string name="status_bar_icons_title">Iconas da barra de estado</string>
   <string name="status_bar_icons_summary">Controlar que iconas se amosan na barra de estado</string>
   <!-- EdgeGesture service -->
+  <string name="edge_gesture_service_title">Bloquear eventos de xestos</string>
+  <string name="edge_gesture_service_summary">Non enviar eventos táctiles para as navegación e a barra de estado ás aplicacións</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">Nunca</string>
+  <string name="keep_screen_on_debugging">Durante a depuración USB</string>
+  <string name="keep_screen_on_charging">Ao cargar</string>
   <!-- Privacy Settings Header item -->
+  <string name="privacy_settings_cyanogenmod_title">Privacidade</string>
   <!-- Privacy Guard -->
+  <string name="privacy_guard_default_title">Activo por omisión</string>
+  <string name="privacy_guard_default_summary">Activar por defecto para as aplicacións recén instaladas</string>
+  <string name="privacy_guard_manager_title">Protección da privacidade</string>
+  <string name="privacy_guard_manager_summary">Xestionar qué aplicacións poden acceder aos seus datos persoais</string>
+  <string name="privacy_guard_no_user_apps">Non hai aplicaciones instaladas</string>
+  <string name="privacy_guard_help_title">Axuda</string>
+  <string name="privacy_guard_reset_title">Restablecer</string>
+  <string name="privacy_guard_reset_text">Restabelecer os permisos?</string>
+  <string name="privacy_guard_help_text">Nesta pantalla pode escoller que aplicacións deben ter a Protección de Privacidade activada tan só con tocalas. As aplicacións seleccionadas non poderán acceder aos seus datos persoais como contactos, mensaxes ou rexistros de chamadas. Se mantén pulsada a entrada dunha aplicación, abrirase a pantalla de detalles da aplicación.\n\nAs aplicación do sistema por defecto non se amosan, pero pódense amosar con seleccionar a opción correspondente do menú.</string>
+  <string name="privacy_guard_manager_show_system_apps">Amosar aplicacións do sistema</string>
+  <string name="privacy_guard_advanced_settings_title">Avanzado</string>
+  <string name="privacy_guard_notification_title">Amosar notificacións</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
+  <string name="lockpattern_settings_enable_error_path_title">Mostrar erro do padrón</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
+  <string name="lockpattern_settings_enable_dots_title">Mostrar puntos do padrón</string>
   <!-- Whether the keyguard will directly pass to password entry -->
+  <string name="lock_directly_show_password">Amosar directamente o contrasinal</string>
   <!-- Whether the keyguard will directly pass to pattern view -->
+  <string name="lock_directly_show_pattern">Amosar directamente o patrón</string>
   <!-- Whether the keyguard will directly pass to PIN entry -->
+  <string name="lock_directly_show_pin">Amosar directamente o PIN</string>
   <!-- lock screen visualizer -->
+  <string name="lockscreen_visualizer_title">Amosar visualizador de música</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Desactivado pola tesela de configuración rápida</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Toque para activar a pantalla de bloqueo</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Activouse a pantalla de bloqueo!</string>
   <!-- Battery saver -->
+  <string name="battery_saver_threshold">Límite do aforro de enerxía</string>
+  <string name="battery_saver_summary">Reduce o rendemento e o límite de datos de fondo</string>
+  <string name="battery_saver_summary_unavailable">Non está dispoñíbel ao cargar</string>
   <!-- Battery : Automatic performance profiles -->
+  <string name="autoperf_title">Activar perfís por aplicación</string>
+  <string name="autoperf_summary">Escolle automaticamente o modo da batería apropiado para varias aplicacións</string>
+  <string name="perf_profile_title">Modo da batería</string>
   <!-- Memory -->
+  <string name="memory_startup_apps_title">Aplicacións que se inician no arranque</string>
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
+  <string name="notification_ringtone_title_cm">Ton de notificación</string>
   <!-- Advanced reboot options -->
+  <string name="advanced_reboot_title">Reinicio avanzado</string>
+  <string name="advanced_reboot_summary">Ao desbloquear, inclúe opcións do menú de apagado para reiniciar en modo recuperación, cargador de arranque ou reinicio do sistema</string>
+  <string name="category_interface">Interface</string>
   <!-- Expanded desktop -->
+  <string name="power_menu_expanded_desktop">Escritorio estendido</string>
+  <string name="expanded_hide_nothing">Non agochar nada</string>
+  <string name="expanded_hide_status">Agochar barra de estado</string>
+  <string name="expanded_hide_navigation">Agochar barra de navegación</string>
+  <string name="expanded_hide_both">Agochar ámbalas dúas</string>
+  <string name="expanded_nothing_to_show">Para engadir unha configuración personalizada por aplicación para estado espandido, desactive \"Desactivado para todos\"</string>
+  <string name="expanded_enabled_for_all">Desactivar para todos</string>
+  <string name="expanded_desktop_style">Estilo do escritorio expandido</string>
+  <string name="expanded_desktop_style_description">Escolla un estilo de escritorio predefinido expandido</string>
+  <string name="expanded_desktop_title">Opcións de escritorio expandido</string>
   <!-- Kill app long-press back -->
+  <string name="kill_app_longpress_back">Terminar aplicación co botón Atrás</string>
+  <string name="kill_app_longpress_back_summary">Peche a aplicación en primeiro plano mantendo presionado o botón Atrás</string>
   <!-- Show/Hide Search Bar -->
+  <string name="recents_show_searchbar">Amosar a barra de busca no menú de recentes</string>
+  <string name="keywords_recents_show_searchbar">recente recentes desactivar activar amosar agochar buscar barra barra de busca</string>
   <!-- Voice Wakeup -->
+  <string name="voice_wakeup_settings_title">Activación coa voz</string>
+  <string name="voice_wakeup_retrain_title">Entrenar a súa voz</string>
+  <string name="voice_wakeup_activity_title">Actividade a executar</string>
+  <string name="voice_wakeup_default_activity">Google Now</string>
   <string name="voice_wakeup_needs_dial_permission_warning">Espertar por voz necesita ter permiso sobre as chamadas de móbil para seleccionar un contacto de marcación directa.</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividade personalizada</string>
   <!-- Blacklist preferences -->
+  <string name="blacklist_title">Lista de números bloqueados</string>
+  <string name="blacklist_edit_dialog_title">Editar número de telefono bloqueado</string>
+  <string name="blacklist_prefs">Axustes</string>
+  <string name="blacklist_button_delete">Eliminar</string>
+  <string name="blacklist_empty_text">Non hay números na lista de números bloqueados. Engade un novo tocando o botón de Engadir (+).</string>
+  <string name="blacklist_disabled_empty_text">Para evitar que o chamen ou envíen mensaxes algúns números de teléfono, active a lista de bloqueo.</string>
+  <string name="blacklist_summary_disabled">Desactivada</string>
+  <string name="blacklist_summary">Non recibirá chamadas nin mensaxes dos números incluídos na lista de números bloqueados</string>
+  <string name="blacklist_notify">Amosar notificacións</string>
+  <string name="blacklist_private_numbers_title">Números privados</string>
+  <string name="blacklist_private_numbers_summary_disabled">Non bloquear as chamadas feitas dende números privados</string>
+  <string name="blacklist_private_numbers_summary">Bloquear <xliff:g id="type">%s</xliff:g> recibidas de números privados</string>
+  <string name="blacklist_unknown_numbers_title">Números descoñecidos</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">Non bloquear chamadas ou mensaxes de números que non estean na lista de contactos</string>
+  <string name="blacklist_unknown_numbers_summary">Bloquear <xliff:g id="type">%s</xliff:g> de números que non estean na lista de contactos</string>
+  <string name="blacklist_summary_type_calls_only">chamadas</string>
+  <string name="blacklist_summary_type_messages_only">mensaxes</string>
+  <string name="blacklist_summary_type_calls_and_messages">chamadas e mensaxes</string>
+  <string name="blacklist_regex_title">Empregar comodíns</string>
+  <string name="blacklist_regex_summary">Empregar . como comodín e * para repetición. Por exemplo, 123.* bloquea números que comecen por 123 e .*123*. bloquea números que comecen por 123</string>
+  <string name="blacklist_policy_block_calls">Bloquear as chamadas entrantes</string>
+  <string name="blacklist_policy_block_messages">Bloquear as mensaxes entrantes</string>
+  <string name="blacklist_bad_number_add">Non é posíbel engadir o número de teléfono inválido na lista de números bloqueados</string>
   <!-- Blacklist management -->
+  <string name="remove_blacklist_number_title">Retirar número</string>
+  <string name="remove_blacklist_entry">Quere eliminar este número de teléfono bloqueado?</string>
+  <string name="select_contact">Seleccionar contacto</string>
   <!-- Sms security limit -->
   <string name="app_security_title">Seguranza das aplicacións</string>
   <string name="sms_security_check_limit_title">Límite de mensaxes SMS</string>
@@ -380,33 +857,90 @@
   <string name="no_filters_title">Non se estabeleceron filtros</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
+  <string name="anonymous_statistics_title">Estatísticas CyanogenMod</string>
+  <string name="anonymous_statistics_summary">Axude a mellorar Cyanogen enviando informes de estatísiticas anónimas</string>
+  <string name="anonymous_statistics_warning_title">Acerca de</string>
+  <string name="anonymous_statistics_warning">Optar polo envío de estatísticas CyanogenMod permitirá que se transmitan datos non personais aos desenvolvedores de CyanogenMod para rastrear intalacións únicas através dos dispositivos. Os datos transmitidos teñen un identificador único, que non compromete a súa privacidade ou datos persoais. Os datos serán enviados cada vez que se inicie.\n\nPara ver un exemplo dos datos van ser enviados, toque en Previsualizar datos.</string>
+  <string name="enable_reporting_title">Activar envío de estatísticas</string>
+  <string name="preview_data_title">Previsualizar datos</string>
+  <string name="view_stats_title">Ver as estatísticas</string>
+  <string name="anonymous_learn_more">Saber máis</string>
   <!-- Anonymous Statistics - Preview -->
+  <string name="preview_id_title">Identificador único</string>
+  <string name="preview_device_title">Dispositivo</string>
+  <string name="preview_version_title">Versión</string>
+  <string name="preview_country_title">País</string>
+  <string name="preview_carrier_title">Operadora móvil</string>
+  <string name="stats_collection_title">Recollida de estatísticas</string>
+  <string name="stats_collection_summary">Cando está activado, permite recoller métricas</string>
   <!-- Protected apps lockpattern reset button -->
+  <string name="lockpattern_reset_button">Restaurar padrón</string>
+  <string name="lockpattern_settings_reset_summary">Introduza a conta de correo principal e o contrasinal asociado para restaurar o padrón de bloqueo</string>
   <!-- Protected Apps -->
+  <string name="menu_hidden_apps_delete">Resetear</string>
+  <string name="menu_hidden_apps_reset_lock">Restaurar padrón de bloqueo</string>
+  <string name="protected_apps">Aplicacións protexidas</string>
+  <string name="protected_apps_summary">Xestiona que aplicacións están protexidas por un bloqueo de seguridade</string>
+  <string name="saving_protected_components">Gardando o estado dos componentes\u2026</string>
+  <string name="pa_login_username_hint">Nome de usuario (correo)</string>
   <string name="pa_login_password_hint">Contrasinal</string>
   <string name="pa_login_submit_button">Acceder</string>
   <string name="pa_login_checking_password">Comprobando a conta\u2026</string>
   <string name="pa_login_incorrect_login">O inicio de sesión era incorrecto</string>
+  <string name="pa_pattern_or_fingerprint_header">Tes que debuxar un patrón ou empregar a pegada dixital para desbloquear</string>
   <!-- Contributors cloud activity -->
+  <string name="contributors_cloud_fragment_title">Colaboradores</string>
+  <string name="contributors_cloud_loading_message">Cargando datos dos colaboradores\u2026</string>
+  <string name="contributors_cloud_failed_message">Non se poden cargar os datos dos colaboradores</string>
+  <string name="contributor_info_menu">Información do colaborador</string>
   <string name="contributor_info_msg">
         <![CDATA[<b>Nome:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Alcume:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Remisións:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
+  <string name="contributions_info_menu">Información das contribucións</string>
+  <string name="contributions_info_msg">
+        <![CDATA[<b>Colaboradores totais:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
+                 <b>Envíos totais:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
+                 <b>Última actualización:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
+  <string name="category_sounds">Sons</string>
+  <string name="notification_manager">Notificacións</string>
+  <string name="lockscreen_settings">Pantalla de bloqueo</string>
+  <string name="category_lights">Luces</string>
+  <string name="category_volume">Volume</string>
+  <string name="category_vibrate">Vibrar</string>
+  <string name="category_misc">Varios</string>
+  <string name="title_general">Xeral</string>
+  <string name="advanced">Avanzado</string>
+  <string name="link_volume_option_title">Asociar volumes de chamada e notificacións</string>
   <string name="lcd_density_prompt_message">Algunhas aplicacións poden non funcionar cunha DPI non estándar.\n\nIsto vai reiniciar o seu dispositivo.</string>
   <!-- Edit access point labels: PPP number -->
   <string name="apn_ppp_number">Número telefónico APN PPP</string>
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
+  <string name="duplicate_apn_error_title">APN Duplicado</string>
+  <string name="duplicate_apn_error_message">Este APN xa existe. Descarte ou altere os seus parámetros.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s </xliff:g> é <xliff:g id="status" example="disabled">%2$s </xliff:g></string>
+  <string name="sim_disabled">desactivada</string>
+  <string name="sim_missing">ausente ou defectuosa</string>
   <string name="sim_enabler_need_disable_sim">Desactivarase a tarxeta SIM. Quere continuar?</string>
   <string name="sim_enabler_will_disable_sim_title">Atención</string>
+  <string name="sim_enabler_need_switch_data_service">Bloquearase este SIM e o SIM <xliff:g id="slotid">%1$s</xliff:g> empregarase para os servizos de datos. Tes a certeza de querer continuar?</string>
+  <string name="sim_enabler_airplane_on">Non se pode realizar a operación co modo avión activado.</string>
+  <string name="sim_enabler_in_call">Non se pode realizar a operación durante unha chamada.</string>
+  <string name="sim_enabler_both_inactive">Non se poden deshabilitar todas as tarxetas SIM</string>
   <string name="sim_enabler_enabling">Activando\u2026</string>
   <string name="sim_enabler_disabling">Desactivando\u2026</string>
   <string name="sub_activate_success">SIM activada.</string>
   <string name="sub_activate_failed">Fallou a activación.</string>
   <string name="sub_deactivate_success">SIM desactivada.</string>
   <string name="sub_deactivate_failed">Fallou a desactivación.</string>
+  <string name="primary_sub_select_title">Suscripción 3G/LTE predeterminada</string>
   <string name="select_sim_card">Seleccionar tarxeta SIM</string>
   <!-- MSIM SIM status -->
+  <string name="sim_card_status_title">Estado da SIM %d</string>
+  <string name="sim_card_lock_settings_title">Configuración do bloquedo da SIM %d</string>
+  <string name="sim_card_summary_empty">SIM non inserida</string>
+  <string name="sim_mobile_network_settings_category_title">Axustes da rede móbil</string>
+  <string name="sim_mobile_network_settings_title">Configuración da SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
   <string name="zen_mode_summary_reminders">recordatorios</string>
@@ -418,35 +952,134 @@
   <string name="zen_mode_summary_selected_messages">mensaxes seleccionadas</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
+  <string name="maximum_head_level">Testa: %1$s W/kg</string>
+  <string name="maximum_body_level">Corpo: %1$s W/kg</string>
   <!-- IC Codes -->
+  <string name="ic_code_model">Modelo: %1$s</string>
+  <string name="ic_code_full">IC: %1$s</string>
+  <string name="sim_ringtone_title">Ton de chamada da SIM %d</string>
   <!-- label for application name -->
+  <string name="app_name_label_cm">Aplicación:</string>
   <!-- label for last time used -->
+  <string name="last_time_used_label_cm">Empregada por última vez:</string>
   <!-- label for usage time -->
+  <string name="usage_time_label_cm">Tempo de uso:</string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="tablet">Con isto borraranse tódolos datos do <b>almacenamento interno</b> da súa tableta, o que inclúe:\n\n<li>As contas do seu dispositivo</li>\n<li>A configuración do sistema e de datos das aplicacións</li>\n<li>As aplicacións descargadas</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
+  <string name="master_clear_desc_cm" product="default">Con isto borraranse tódolos datos do <b>almacenamento interno</b> do seu teléfono, o que inclúe:\n\n<li>As contas do seu dispositivo</li>\n<li>A configuración do sistema e de datos das aplicacións</li>\n<li>As aplicacións descargadas</li></string>
   <!-- Factory reset strings -->
+  <string name="factory_reset_instructions_title">Datos personais e aplicacións</string>
+  <string name="factory_reset_instructions_summary">Borrará tódalas contas, aplicacións, datos de aplicacións e configuracións de sistema deste dispositivo</string>
+  <string name="factory_reset_personal_content">Contido persoal</string>
+  <string name="factory_reset_erase_stored_content">Borrar contido almacenado</string>
+  <string name="factory_reset_erase_stored_content_summary">Borrar música, fotos, vídeos e outros datos de usuario almacenados neste dispositivo</string>
+  <string name="factory_reset_erase_stored_content_summary_forced">Borra música, fotos, vídeos e outros datos de usuario almacenados neste dispositivo.\n\n<b>Non se pode gardar contido debido ao encriptamento do dispositivo.</b></string>
+  <string name="factory_reset_erase_sd_card">Formatar tarxeta SD</string>
+  <string name="factory_reset_erase_sd_card_summary">Borrar tódolos datos da tarxeta SD, o que inclúe música e fotos</string>
+  <string name="factory_reset_warning_text_reset_now">RESTAURAR AGORA</string>
+  <string name="factory_reset_warning_text_message">Vanse eliminar todas as contas, aplicacións, datos de aplicacións e configuracións do sistema deste dispositivo. Esta acción non se pode desfacer.</string>
   <!-- Tethering & portable hotspot other category -->
+  <string name="tethering_other_category_text">Outros</string>
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_text">Tempo de espera para o punto de acceso Wi\u2011Fi</string>
+  <string name="hotstpot_inactivity_timeout_never">Nunca</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minuto</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutos</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutos</string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">O punto de aceso portable Wi\u2011Fi non se apagará nunca</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">O punto de aceso portable Wi\u2011Fi apagaráse despois de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
+  <string name="live_lock_screen_title">Pantalla de bloqueo animada</string>
   <!-- Live lock screen summary -->
+  <string name="live_lock_screen_summary">Activar e configurar a pantalla de bloqueo animada</string>
   <!-- Live lock screen settings content description -->
+  <string name="live_lock_screen_settings_button">Axustes</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
+  <string name="live_lock_screen_settings_disabled_prompt">Para ver as pantallas de bloqueo animadas dispoñíbeis, actívaas.</string>
+  <string name="interruptions_ignore_while_media_title">Previr a reducción de audio</string>
+  <string name="interruptions_ignore_while_media_summary">Non reducir o volume de reprodución ao chegar unha notificación</string>
   <!-- CM Legal -->
+  <string name="cmlicense_title">Licenza de CyanogenMod</string>
   <!-- Menu label for reset the battery stats -->
+  <string name="menu_stats_reset">Reiniciar estatísticas</string>
   <!-- Reset stats confirmation dialog's message -->
+  <string name="reset_stats_msg">Vanse reiniciar as estatítiscas da historia da batería</string>
   <!-- Dock battery not present message -->
+  <string name="dock_battery_not_present">Non se atopa a base da batería</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
+  <string name="battery_info_status_charging_dock_ac">Cargando en conector en CA</string>
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
+  <string name="battery_info_status_charging_dock_usb">Cargando en conector por USB</string>
+  <string name="restrict_app_wlan_title">Desactivar o uso do Wi\u2011Fi para esta aplicación</string>
+  <string name="restrict_app_wlan_summary">Evitar que a aplicación utilice a conexión Wi\u2011Fi</string>
+  <string name="restrict_app_cellular_title">Incapacitar do uso de datos móviles a esta aplicación</string>
+  <string name="restrict_app_cellular_summary">Evitar o uso de datos móviles de esta aplicación</string>
+  <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Tempo</string>
+  <string name="weather_settings_no_services_prompt">Non instalouse ningun probeedor do tempo</string>
+  <string name="weather_settings_button">Axustes do fornecedor</string>
+  <string name="weather_settings_activity_not_found">Non se puido iniciar o menú de configuración deste provedor</string>
+  <string name="weather_settings_add_weather_provider">Engadir fornecedor de clima</string>
+  <string name="weather_settings_general_settings_title">Xeral</string>
+  <string name="weather_settings_providers_title">Fornecedores</string>
+  <string name="weather_settings_temp_units_title">Unidade de temperatura</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">clima</string>
+  <string name="background_data_access">Acceso a datos en segundo plano</string>
+  <string name="allow_background_both">Sobre datos móbiles &amp; Wi-Fi</string>
+  <string name="allow_background_wlan">Só por Wi-Fi</string>
+  <string name="allow_background_none">Sen acceso</string>
+  <string name="mobile_data_alert">Alerta de uso de datos móbiles</string>
+  <string name="mobile_data_alert_summary">Notificar cando o aplicativo utilice unha cantidade significativa de datos</string>
+  <string name="data_usage_menu_enable_data_alerts">Activar as alertas de uso de datos</string>
+  <string name="data_usage_menu_disable_data_alerts">Desactivar as alertas de uso de datos</string>
+  <string name="data_usage_menu_reset_stats">Restablecer os datos estatísticos</string>
+  <string name="reset_data_stats_msg">Isto borrará todos os datos da información de seguemento</string>
+  <string name="reset_stats_confirm">Confirmar</string>
+  <string name="restrict_cellular_access_title">Restrinxir o acceso a datos móbiles</string>
+  <string name="restrict_cellular_access_summary">Desactivar o acceso de datos en redes móbiles</string>
+  <string name="restrict_cellular_access_dialog_title">Restrinxir o acceso de datos móbiles?</string>
+  <string name="restrict_cellular_access_dialog_summary">Esta función pode causar que unha aplicación que depende do acceso á rede deixe de funcionar cando só haxa redes móbiles dispoñíbles.\n\nPode atopar os controles de uso de datos máis axeitados na configuración dispoñíble dentro da aplicación.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Operadores de rede</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Desenfocar o fondo</string>
   <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Amosar o tempo</string>
   <!-- Per app controls for LP keyguard notifications -->
+  <string name="app_notification_show_on_keyguard_title">Amosar na pantalla de bloqueo</string>
+  <string name="app_notification_show_on_keyguard_summary">Amosar notificacións desta aplicación na pantalla de bloqueo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar as notificacións persistentes na pantalla de bloqueo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca amosar notificacións persistentes deste aplicación na pantalla de bloqueo</string>
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Control mellorado da radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Desactivar a carga automática do MBN</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Activar a carga automática do MBN</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Desactiva o depurador VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Activa o depurador VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Desactivar o depurador VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Activar o depurador VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Desactivar o depurador de WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Activar o depurador de WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">Desactivar o rexistro en ADB da radio</string>
+  <string name="cm_radio_info_adb_log_off_label">Activar o rexistro en ADB da radio</string>
+  <string name="cm_radio_info_diag_log_on_label">Desactivar o rexistro Diag</string>
+  <string name="cm_radio_info_diag_log_off_label">Activar o rexistro Diag</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Fondo de pantalla</string>
+  <string name="not_available_with_app">Non dispoñible con %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Localiza o sensor de pegadas dixitais na <xliff:g id="sensor_location">%1$s</xliff:g> do teu móbil.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">parte posterior</string>
+  <string name="security_settings_fingerprint_sensor_location_front">parte frontal</string>
+  <string name="security_settings_fingerprint_sensor_location_left">cara esquerda</string>
+  <string name="security_settings_fingerprint_sensor_location_right">cara dereita</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Voz: <xliff:g id="voice_status">%1$s</xliff:g> / Datos: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index d9d171a..8384fca 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one"><xliff:g id="step_count">%1$d</xliff:g> lépésre van attól, hogy lekérdezze az eszköz azonosítót.</item>
+    <item quantity="other"><xliff:g id="step_count">%1$d</xliff:g> lépésre van attól, hogy lekérdezze az eszköz azonosítót.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Eszköz azonosító: [<xliff:g id="device_id">%1$s </xliff:g>] vágólapra másolva</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Az eszköz azonosító nem érhető el ezen a kiadáson</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Eszköz azonosító</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ön <xliff:g id="step_count">%1$d</xliff:g> lépésre van attól, hogy engedélyezze a fejlesztői beállításokat.</item>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 5419833..a4c9f10 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Ora sei a <xliff:g id="step_count">%1$d</xliff:g> passo dalla visualizzazione del Device ID.</item>
+    <item quantity="other">Ora sei a <xliff:g id="step_count">%1$d</xliff:g> passi dalla visualizzazione del Device ID.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Device ID:[<xliff:g id="device_id">%1$s</xliff:g>] copiato negli appunti</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Il Device ID non è disponibile su questa build</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Device ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Ora sei ad <xliff:g id="step_count">%1$d</xliff:g> passo dall\'attivare le impostazioni di sviluppo.</item>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index fe79418..e18f152 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -17,9 +17,18 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">אתה במרחק של צעד <xliff:g id="step_count">%1$d</xliff:g> מחשיפת מזהה ההתקן.</item>
+    <item quantity="two">אתה במרחק של <xliff:g id="step_count">%1$d</xliff:g> צעדים מחשיפת מזהה ההתקן.</item>
+    <item quantity="many">אתה במרחק של <xliff:g id="step_count">%1$d</xliff:g> צעדים מחשיפת מזהה ההתקן.</item>
+    <item quantity="other">אתה במרחק של <xliff:g id="step_count">%1$d</xliff:g> צעדים מחשיפת מזהה ההתקן.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">מזהה התקן:[<xliff:g id="device_id">%1$s</xliff:g>] הועתק ללוח</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">מזהה התקן אינו זמין בגרסה זאת</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">מזהה התקן</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">רק עוד צעד <xliff:g id="step_count">%1$d</xliff:g> מהפעלת אפשרויות מפתח.</item>
@@ -610,6 +619,8 @@
   <string name="live_display_color_profile_basic_summary">השתמש בתצוגה ללא כיול</string>
   <string name="live_display_color_profile_adaptive_title">מסתגל</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">התאמת תמונה</string>
+  <string name="adj_hue_title">גוון</string>
   <string name="adj_saturation_title">רוויה</string>
   <string name="adj_contrast_title">ניגודיות</string>
   <!-- Whether to display IME switcher notifcation -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index a925a16..6c2f61a 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Du er nå <xliff:g id="step_count">%1$d</xliff:g> skritt unna å vise Device ID.</item>
+    <item quantity="other">Du er nå <xliff:g id="step_count">%1$d</xliff:g> skritt unna å vise Device ID.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Device ID:[<xliff:g id="device_id">%1$s</xliff:g>] kopiert til utklippstavle</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Device ID er ikke tilgjengelig på denne versjonen</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Device ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du er nå <xliff:g id="step_count"> %1$d</xliff:g> skritt fra aktivering av utviklerinnstillinger.</item>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 63d0e43..e41c901 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stap verwijderd van het opvragen van het apparaat-ID.</item>
+    <item quantity="other">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stappen verwijderd van het opvragen van het apparaat-ID.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Apparaat-ID:[<xliff:g id="device_id">%1$s</xliff:g>] naar klembord gekopieerd</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Apparaat-ID is niet beschikbaar in deze versie</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Apparaat-ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">U bent nog <xliff:g id="step_count">%1$d</xliff:g> stap verwijderd van de opties voor ontwikkelaars.</item>
@@ -280,6 +287,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Verlichtingsinstellingen</string>
   <string name="led_notification_text">LED-verlichting ingeschakeld door instellingen</string>
+  <string name="notification_light_no_apps_summary">Om controle per app toe te voegen, activeer %1$s en klik \'\u002b\' op de menubalk</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android-foutopsporing</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -449,7 +457,7 @@
   <string name="app_ops_allowed_count"><xliff:g id="count" example="2 times">%s</xliff:g> toegestaan</string>
   <string name="app_ops_ignored_count"><xliff:g id="count" example="2 times">%s</xliff:g> geweigerd</string>
   <string name="app_ops_both_count"><xliff:g id="count">%1$s</xliff:g> toegestaan, <xliff:g id="count">%2$s</xliff:g> geweigerd</string>
-  <string name="app_ops_disabled_by_optimization">Uitgeschakeld door batterijoptimalisatie</string>
+  <string name="app_ops_disabled_by_optimization">Uitgeschakeld door accuoptimalisatie</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Gebruikersapps tonen</string>
   <string name="app_ops_show_system_apps">Ingebouwde apps tonen</string>
@@ -1021,11 +1029,20 @@
   <string name="weather_settings_temp_celsius">Celsius</string>
   <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
   <string name="weather_settings_keyword">weer</string>
+  <string name="background_data_access">Toegang tot achtergrondgegevens</string>
+  <string name="allow_background_both">Via mobiele gegevens &amp; wifi</string>
   <string name="allow_background_wlan">Alleen via wifi</string>
   <string name="allow_background_none">Geen toegang</string>
+  <string name="mobile_data_alert">Waarschuwing mobiele gegevens</string>
+  <string name="mobile_data_alert_summary">Waarschuwen als de app een grote hoeveelheid gegevens gebruikt</string>
+  <string name="data_usage_menu_enable_data_alerts">Waarschuwingen voor gegevensgebruik inschakelen</string>
+  <string name="data_usage_menu_disable_data_alerts">Waarschuwingen voor gegevensgebruik uitschakelen</string>
+  <string name="data_usage_menu_reset_stats">Gegevensstatistieken opnieuw instellen</string>
+  <string name="reset_data_stats_msg">Dit zal alle oude en huidige gegevensgeschiedenis verwijderen</string>
   <string name="reset_stats_confirm">Bevestigen</string>
   <string name="restrict_cellular_access_title">Toegang tot mobiele gegevens beperken</string>
   <string name="restrict_cellular_access_summary">Gegevenstoegang op mobiele netwerken uitschakelen</string>
+  <string name="restrict_cellular_access_dialog_title">Mobiele gegevenstoegang beperken?</string>
   <string name="restrict_cellular_access_dialog_summary">Deze functie kan ervoor zorgen dat een app die internet nodig heeft stopt met werken als er alleen een mobiel netwerk beschikbaar is.\n\nU kunt meer relevante instellingen voor gegevensgebruik vinden in de instellingen van de app.</string>
   <!-- Label for settings shortcut: carrier selection -->
   <string name="shortcut_carrier_title">Netwerkproviders</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 0cef5e1..d7c8de2 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -39,6 +39,8 @@
   <string name="root_access_adb">Tylko ADB</string>
   <string name="root_access_all">Aplikacje i ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Zarządzaj dostępem do roota</string>
+  <string name="root_appops_summary">Przeglądaj i kontroluj zasady roota</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 66b3313..57a26e4 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Você agora está a <xliff:g id="step_count">%1$d</xliff:g> passo de consultar o ID do dispositivo.</item>
+    <item quantity="other">Você agora está a <xliff:g id="step_count">%1$d</xliff:g> passos de consultar o ID do dispositivo.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID do dispositivo: [<xliff:g id="device_id">%1$s</xliff:g>] copiado para a área de transferência</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID do dispositivo não está disponível nesta versão</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID do dispositivo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Você agora está a <xliff:g id="step_count">%1$d </xliff:g> passo de ativar as configurações de desenvolvimento.</item>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 5c57259..c16f788 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Está agora a <xliff:g id="step_count">%1$d</xliff:g> passo de obter o ID do dispositivo.</item>
+    <item quantity="other">Está agora a <xliff:g id="step_count">%1$d</xliff:g> passos de obter o ID do dispositivo.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID do dispositivo:[<xliff:g id="device_id">%1$s</xliff:g>] copiado para a área de transferência</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">O ID do dispositivo não está disponível nesta compilação</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID do dispositivo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Está agora a <xliff:g id="step_count">%1$d</xliff:g> passo de ativar as opções de programador.</item>
@@ -767,7 +774,7 @@
   <string name="lockscreen_disabled_by_qs_tile_summary">Toque para ativar o ecrã de bloqueio</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Ecrã de bloqueio ativado!</string>
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">Limite da poupança de energia</string>
+  <string name="battery_saver_threshold">Limite para a poupança de bateria</string>
   <string name="battery_saver_summary">Reduzir o desempenho e limitar os dados em segundo plano</string>
   <string name="battery_saver_summary_unavailable">Indisponível enquanto estiver a carregar</string>
   <!-- Battery : Automatic performance profiles -->
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 0499570..9a4e242 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -17,9 +17,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Нажмите ещё <xliff:g id="step_count">%1$d</xliff:g> раз, чтобы просмотреть идентификатор устройства.</item>
+    <item quantity="few">Нажмите ещё <xliff:g id="step_count">%1$d</xliff:g> раза, чтобы просмотреть идентификатор устройства.</item>
+    <item quantity="other">Нажмите ещё <xliff:g id="step_count">%1$d</xliff:g> раз, чтобы просмотреть идентификатор устройства.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Идентификатор устройства: [<xliff:g id="device_id">%1$s</xliff:g>] скопирован в буфер обмена</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Идентификатор устройства недоступен на этой сборке</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Идентификатор устройства</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Нажмите ещё <xliff:g id="step_count">%1$d</xliff:g> раз, чтобы включить настройки для разработчиков.</item>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 42d6470..11618b5 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -17,9 +17,18 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> korak pred poizvedovanjem za ID naprave.</item>
+    <item quantity="two">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> koraka pred poizvedovanjem za ID naprave.</item>
+    <item quantity="few">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> korake pred poizvedovanjem za ID naprave.</item>
+    <item quantity="other">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> korakov pred poizvedovanjem za ID naprave.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID naprave: [<xliff:g id="device_id">%1$s</xliff:g>] kopiran na odložišče</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID naprave v tej izgradnji ni na voljo</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID naprave</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Zdaj ste <xliff:g id="step_count">%1$d</xliff:g> korak pred omogočanjem nastavitev za razvijalce.</item>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index d4ae6ed..413b29d 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -557,6 +557,7 @@
   <string name="volume_adjust_sounds_title">Регулисање јачине звука</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Интензитет вибрације</string>
+  <string name="vibrator_warning">Вредности веће од %1$d%% нису препоручене</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Калибрација боје</string>
   <string name="color_calibration_summary">Калибрација боја на екрану</string>
@@ -608,8 +609,13 @@
   <string name="live_display_color_profile_photography_summary">Савршена репродукција боје за фотографије</string>
   <string name="live_display_color_profile_basic_title">Основно</string>
   <string name="live_display_color_profile_basic_summary">Користи дисплеј неподешен</string>
+  <string name="live_display_color_profile_adaptive_summary">Боје прилагођене амбиенталним условима</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Корекција слике</string>
+  <string name="picture_adjustment_summary">Прилагоди нијансе, засићеност, интензитет и контраст</string>
+  <string name="adj_hue_title">Нијанса</string>
   <string name="adj_saturation_title">Засићење</string>
+  <string name="adj_intensity_title">Интензитет</string>
   <string name="adj_contrast_title">Контраст</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Селектор икона</string>
@@ -1068,4 +1074,5 @@
   <string name="security_settings_fingerprint_sensor_location_left">на левој страни</string>
   <string name="security_settings_fingerprint_sensor_location_right">на десној страни</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Глас: <xliff:g id="voice_status">%1$s</xliff:g> / Податак: <xliff:g id="data_status">%2$s</xliff:g></string>
 </resources>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index a566804..63a604a 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -43,6 +43,7 @@
   <string name="root_access_adb">Endast ADB</string>
   <string name="root_access_all">Appar och ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Hantera root-åtkomster</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -604,6 +605,7 @@
   <string name="live_display_color_profile_basic_title">Grundläggande</string>
   <string name="live_display_color_profile_basic_summary">Använd skärmen okalibrerad</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="adj_hue_title">Nyans</string>
   <string name="adj_saturation_title">Mättnad</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 0bb848d..a1bb2b3 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="other">您现在距离查询设备 ID 还有 <xliff:g id="step_count">%1$d</xliff:g> 步距离。</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">设备 ID ：[<xliff:g id="device_id">%1$s</xliff:g>] 已复制到剪切板</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">设备 ID 在此编译中不可用</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">设备 ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">还需 <xliff:g id="step_count">%1$d</xliff:g> 步就可以启用开发者选项。</item>
-- 
cgit v1.1


From 094752f5a1257d77fc9454dad63f87dbe0dbc5be Mon Sep 17 00:00:00 2001
From: Maurice Lam <yukl@google.com>
Date: Fri, 2 Sep 2016 16:34:38 -0700
Subject: [Fingerprint] Remove learn more link if not provisioned. DO NOT MERGE

Remove the learn more link during setup wizard, because HelpUtils is
returning null for the intent while the device is not provisioned.

Bug: 31246856
Change-Id: I4cf5c282f170188aef98a02d3b96af5e63ea7f39
(cherry picked from commit c94f2b93afa2db9d87f9d8e0dc0c8709f16a326d)
---
 .../settings/fingerprint/FingerprintEnrollIntroduction.java   | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index beb1a8f..bc2757a 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -20,6 +20,7 @@ import android.app.admin.DevicePolicyManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.provider.Settings.Global;
 import android.view.View;
 
 import com.android.internal.logging.MetricsLogger;
@@ -40,7 +41,11 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
         setContentView(R.layout.fingerprint_enroll_introduction);
         setHeaderText(R.string.security_settings_fingerprint_enroll_introduction_title);
         findViewById(R.id.cancel_button).setOnClickListener(this);
-        findViewById(R.id.learn_more_button).setOnClickListener(this);
+        final View learnMoreButton = findViewById(R.id.learn_more_button);
+        learnMoreButton.setOnClickListener(this);
+        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+            learnMoreButton.setVisibility(View.GONE);
+        }
         final int passwordQuality = new ChooseLockSettingsHelper(this).utils()
                 .getActivePasswordQuality(UserHandle.myUserId());
         mHasPassword = passwordQuality != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED;
@@ -91,7 +96,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
     private void launchFingerprintHelp() {
         Intent helpIntent = HelpUtils.getHelpIntent(this,
                 getString(R.string.help_url_fingerprint), getClass().getName());
-        startActivity(helpIntent);
+        if (helpIntent != null) {
+            startActivity(helpIntent);
+        }
     }
 
     @Override
-- 
cgit v1.1


From 5369e1434a792c91202c3a0f7bd66dd9db970a37 Mon Sep 17 00:00:00 2001
From: Michael Bestas <mikeioannina@cyanogenmod.org>
Date: Fri, 7 Oct 2016 18:45:19 +0300
Subject: Settings: Update contributors cloud DB

Change-Id: I28f0d64aa19ec46c8819c70174b3633684898e28
---
 assets/contributors.db | Bin 276480 -> 304128 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/contributors.db b/assets/contributors.db
index 0bda60d..845bcd9 100644
Binary files a/assets/contributors.db and b/assets/contributors.db differ
-- 
cgit v1.1


From 345b425f13e4d0912d39b1e1e5dcb2fd44f32fa1 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Sat, 8 Oct 2016 12:58:56 +0800
Subject: Settings: display: Fix search indexing of high touch sensitivity

Mark the feature as non-indexable if it is *unsupported*,
not if it is supported.

Change-Id: Ia1388044ec5944e1782f894ed0c6abe4b3e0c9e8
---
 src/com/android/settings/DisplaySettings.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index a434e97..47efd2f 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -854,7 +854,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements
                     if (!isCameraGestureAvailable(context.getResources())) {
                         result.add(KEY_CAMERA_GESTURE);
                     }
-                    if (hardware.isSupported(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
+                    if (!hardware.isSupported(CMHardwareManager.FEATURE_HIGH_TOUCH_SENSITIVITY)) {
                         result.add(KEY_HIGH_TOUCH_SENSITIVITY);
                     }
                     return result;
-- 
cgit v1.1


From 8d5925b2d977570fdf6e065ebe51ca90c66d97a5 Mon Sep 17 00:00:00 2001
From: Diogo Ferreira <diogo@underdev.org>
Date: Thu, 15 Sep 2016 14:55:04 +0100
Subject: Settings: Apn: Don't dereference a null mSubscriptionInfo

When switching sims mSubscriptionInfo can be temporarily null, don't
dereference it in those cases. The interface will be updated afterwards
when the subscription status changes.

Change-Id: I1011a10434fad8fd911164217b9fb2d0dfb82b2a
Ticket: CYNGNOS-3291
---
 src/com/android/settings/ApnSettings.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 4bb836a..b36ab1c 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -430,7 +430,8 @@ public class ApnSettings extends SettingsPreferenceFragment implements
         String key = null;
 
         Uri uri;
-        if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null)  {
+        if (TelephonyManager.getDefault().getPhoneCount() > 1 && mImsi != null
+                && mSubscriptionInfo != null)  {
             uri = Uri.withAppendedPath(PREFERRED_MSIM_APN_URI,
                     String.valueOf(mSubscriptionInfo.getSubscriptionId()));
             uri = Uri.withAppendedPath(uri, mImsi);
-- 
cgit v1.1


From 046fc5c488de05cdfe6dc3a979c2d94d007b8b0b Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Mon, 17 Oct 2016 16:42:20 +0200
Subject: Allow selecting vibration mode during zen priority mode.

Change-Id: I4e80e920e4d8f42b0255fd3f528c464b7f094d0e
---
 res/values/cm_strings.xml                               |  6 ++++++
 res/xml/zen_mode_priority_settings.xml                  |  5 +++++
 .../settings/notification/ZenModePrioritySettings.java  | 17 +++++++++++++++++
 3 files changed, 28 insertions(+)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 9879df7..a28a772 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1103,6 +1103,12 @@
     <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
     <string name="zen_mode_summary_selected_messages">selected messages</string>
 
+    <!-- Allow vibration in zen mode -->
+    <string name="zen_mode_vibration">Vibration</string>
+    <string name="zen_mode_vibration_never">Don\'t vibrate</string>
+    <string name="zen_mode_vibration_calls_only">Only vibrate for calls</string>
+    <string name="zen_mode_vibration_calls_and_notifications">Vibrate for calls and notifications</string>
+
     <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
     <string name="regulatory_information_dialog_title" translatable="false">@string/regulatory_information</string>
 
diff --git a/res/xml/zen_mode_priority_settings.xml b/res/xml/zen_mode_priority_settings.xml
index 37ec317..567b9e7 100644
--- a/res/xml/zen_mode_priority_settings.xml
+++ b/res/xml/zen_mode_priority_settings.xml
@@ -57,6 +57,11 @@
         android:title="@string/zen_mode_repeat_callers"
         android:persistent="false"/>
 
+	<com.android.settings.DropDownPreference
+        android:key="vibration"
+        android:title="@string/zen_mode_vibration"
+        android:persistent="false" />
+
     <com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
         android:key="zen_priority_allow_lights"
         android:title="@string/notification_light_title"
diff --git a/src/com/android/settings/notification/ZenModePrioritySettings.java b/src/com/android/settings/notification/ZenModePrioritySettings.java
index e8a8bb1..08e0350 100644
--- a/src/com/android/settings/notification/ZenModePrioritySettings.java
+++ b/src/com/android/settings/notification/ZenModePrioritySettings.java
@@ -28,6 +28,7 @@ import com.android.internal.logging.MetricsLogger;
 import com.android.settings.DropDownPreference;
 import com.android.settings.R;
 import com.android.settings.search.Indexable;
+import cyanogenmod.providers.CMSettings;
 
 public class ZenModePrioritySettings extends ZenModeSettingsBase implements Indexable {
     private static final String KEY_REMINDERS = "reminders";
@@ -35,6 +36,7 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde
     private static final String KEY_MESSAGES = "messages";
     private static final String KEY_CALLS = "calls";
     private static final String KEY_REPEAT_CALLERS = "repeat_callers";
+    private static final String KEY_VIBRATION = "vibration";
     private static final String KEY_ALLOW_LIGHTS = "zen_priority_allow_lights";
 
     private static final int SOURCE_NONE = -1;
@@ -146,6 +148,21 @@ public class ZenModePrioritySettings extends ZenModeSettingsBase implements Inde
             }
         });
 
+        DropDownPreference vibration = (DropDownPreference) root.findPreference(KEY_VIBRATION);
+        vibration.addItem(R.string.zen_mode_vibration_never, null);
+        vibration.addItem(R.string.zen_mode_vibration_calls_only, null);
+        vibration.addItem(R.string.zen_mode_vibration_calls_and_notifications, null);
+        vibration.setSelectedItem(CMSettings.System.getInt(getContentResolver(),
+                    CMSettings.System.ZEN_PRIORITY_VIBRATION_MODE, 0));
+        vibration.setCallback(new DropDownPreference.Callback() {
+            @Override
+            public boolean onItemSelected(int pos, Object newValue) {
+                CMSettings.System.putInt(getContentResolver(),
+                        CMSettings.System.ZEN_PRIORITY_VIBRATION_MODE, pos);
+                return true;
+            }
+        });
+
         // Remove of the "Allow notification light" setting if LED is not supported
         if (!getResources().getBoolean(
                 com.android.internal.R.bool.config_intrusiveNotificationLed)) {
-- 
cgit v1.1


From a12c0a3ff1fdaecf15813de454a5db2de966d5e5 Mon Sep 17 00:00:00 2001
From: Danny Baumann <dannybaumann@web.de>
Date: Wed, 19 Oct 2016 13:39:33 +0200
Subject: Add setup UI for minimum delay between an app's notification sounds.

Change-Id: I70e9cc308b4f7c7681457a0b09dd73e5d1aebb73
---
 res/values/cm_arrays.xml                           | 21 ++++++++++++
 res/values/cm_strings.xml                          | 11 +++++++
 res/xml/app_notification_settings.xml              | 10 +++++-
 .../notification/AppNotificationSettings.java      | 37 ++++++++++++++++++++++
 .../settings/notification/NotificationBackend.java | 21 ++++++++++++
 5 files changed, 99 insertions(+), 1 deletion(-)

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 35b2bf7..57375d9 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -589,4 +589,25 @@
         <item>@string/security_settings_fingerprint_sensor_location_right</item>
     </string-array>
 
+    <!-- Display settings.  The delay in inactivity before the screen is turned off. These are shown in a list dialog. -->
+    <string-array name="app_notification_sound_timeout_entries" translatable="false">
+        <item>@string/app_notification_sound_timeout_value_none</item>
+        <item>@string/app_notification_sound_timeout_value_10_seconds</item>
+        <item>@string/app_notification_sound_timeout_value_30_seconds</item>
+        <item>@string/app_notification_sound_timeout_value_1_minute</item>
+        <item>@string/app_notification_sound_timeout_value_5_minutes</item>
+        <item>@string/app_notification_sound_timeout_value_15_minutes</item>
+        <item>@string/app_notification_sound_timeout_value_30_minutes</item>
+    </string-array>
+
+    <!-- Do not translate. -->
+    <string-array name="app_notification_sound_timeout_values" translatable="false">
+        <item>0</item>
+        <item>10000</item>
+        <item>30000</item>
+        <item>60000</item>
+        <item>300000</item>
+        <item>900000</item>
+        <item>1800000</item>
+    </string-array>
 </resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index a28a772..4ef248c 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -1238,6 +1238,17 @@
     <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
     <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
 
+    <!-- Notification sound timeout -->
+    <string name="app_notification_sound_timeout_title">Minimum time between notification sounds</string>
+    <string name="app_notification_sound_timeout_summary_template">Allow sounds or vibration no more than once every <xliff:g id="duration">%1$s</xliff:g></string>
+    <string name="app_notification_sound_timeout_value_none">No restriction</string>
+    <string name="app_notification_sound_timeout_value_10_seconds">10 seconds</string>
+    <string name="app_notification_sound_timeout_value_30_seconds">30 seconds</string>
+    <string name="app_notification_sound_timeout_value_1_minute">1 minute</string>
+    <string name="app_notification_sound_timeout_value_5_minutes">5 minutes</string>
+    <string name="app_notification_sound_timeout_value_15_minutes">10 minutes</string>
+    <string name="app_notification_sound_timeout_value_30_minutes">30 minutes</string>
+
     <!-- CmRadioInfo -->
     <string name="cm_radio_info_label">Enhanced radio control</string>
 
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index f438e2f..11057f3 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -66,11 +66,19 @@
             android:dependency="show_on_keyguard"
             android:persistent="false" />
 
+    <ListPreference
+            android:key="sound_timeout"
+            android:title="@string/app_notification_sound_timeout_title"
+            android:entries="@array/app_notification_sound_timeout_entries"
+            android:entryValues="@array/app_notification_sound_timeout_values"
+            android:order="7"
+            android:persistent="false" />
+
     <!-- App notification preferences -->
     <Preference
             android:key="app_settings"
             android:title="@string/app_notification_preferences"
-            android:order="7"
+            android:order="8"
             android:persistent="false" />
 
 </PreferenceScreen>
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index 22df064..2e76f92 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -27,6 +27,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.UserHandle;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -61,6 +62,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
     private static final String KEY_APP_SETTINGS = "app_settings";
     private static final String KEY_SHOW_ON_KEYGUARD = "show_on_keyguard";
     private static final String KEY_NO_ONGOING_ON_KEYGUARD = "no_ongoing_on_keyguard";
+    private static final String KEY_SOUND_TIMEOUT = "sound_timeout";
 
     private static final Intent APP_NOTIFICATION_PREFS_CATEGORY_INTENT
             = new Intent(Intent.ACTION_MAIN)
@@ -75,6 +77,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
     private SwitchPreference mSensitive;
     private SwitchPreference mShowOnKeyguard;
     private SwitchPreference mShowNoOngoingOnKeyguard;
+    private ListPreference mSoundTimeout;
     private AppRow mAppRow;
     private boolean mCreated;
     private boolean mIsSystemPackage;
@@ -143,6 +146,7 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         mSensitive = (SwitchPreference) findPreference(KEY_SENSITIVE);
         mShowOnKeyguard = (SwitchPreference) findPreference(KEY_SHOW_ON_KEYGUARD);
         mShowNoOngoingOnKeyguard = (SwitchPreference) findPreference(KEY_NO_ONGOING_ON_KEYGUARD);
+        mSoundTimeout = (ListPreference) findPreference(KEY_SOUND_TIMEOUT);
 
         mAppRow = mBackend.loadAppRow(pm, info.applicationInfo);
 
@@ -156,6 +160,8 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         mPriority.setChecked(mAppRow.priority);
         mPeekable.setChecked(mAppRow.peekable);
         mSensitive.setChecked(mAppRow.sensitive);
+        mSoundTimeout.setValue(Long.toString(mAppRow.soundTimeout));
+        updateSoundTimeoutSummary(mAppRow.soundTimeout);
 
         mBlock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
             @Override
@@ -196,6 +202,18 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
             }
         });
 
+        mSoundTimeout.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                long value = Long.valueOf((String) newValue);
+                if (!mBackend.setNotificationSoundTimeout(pkg, mUid, value)) {
+                    return false;
+                }
+                updateSoundTimeoutSummary(value);
+                return true;
+            }
+        });
+
         if (mAppRow.settingsIntent != null) {
             findPreference(KEY_APP_SETTINGS).setOnPreferenceClickListener(
                     new OnPreferenceClickListener() {
@@ -260,6 +278,25 @@ public class AppNotificationSettings extends SettingsPreferenceFragment {
         }
     }
 
+    private void updateSoundTimeoutSummary(long value) {
+        if (value == 0) {
+            mSoundTimeout.setSummary(R.string.app_notification_sound_timeout_value_none);
+        } else {
+            final CharSequence[] entries = mSoundTimeout.getEntries();
+            final CharSequence[] values = mSoundTimeout.getEntryValues();
+            CharSequence summary = null;
+            for (int i = 0; i < values.length; i++) {
+                long timeout = Long.parseLong(values[i].toString());
+                if (timeout == value) {
+                    summary = getString(R.string.app_notification_sound_timeout_summary_template,
+                            entries[i]);
+                    break;
+                }
+            }
+            mSoundTimeout.setSummary(summary);
+        }
+    }
+
     private void updateDependents(boolean banned) {
         final boolean lockscreenSecure = new LockPatternUtils(getActivity()).isSecure(
                 UserHandle.myUserId());
diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java
index 5467cb3..ae83179 100644
--- a/src/com/android/settings/notification/NotificationBackend.java
+++ b/src/com/android/settings/notification/NotificationBackend.java
@@ -47,6 +47,7 @@ public class NotificationBackend {
         row.priority = getHighPriority(row.pkg, row.uid);
         row.peekable = getPeekable(row.pkg, row.uid);
         row.sensitive = getSensitive(row.pkg, row.uid);
+        row.soundTimeout = getNotificationSoundTimeout(row.pkg, row.uid);
         return row;
     }
 
@@ -149,6 +150,25 @@ public class NotificationBackend {
         }
     }
 
+    public long getNotificationSoundTimeout(String pkg, int uid) {
+        try {
+            return sINM.getPackageNotificationSoundTimeout(pkg, uid);
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return 0;
+        }
+    }
+
+    public boolean setNotificationSoundTimeout(String pkg, int uid, long timeout) {
+        try {
+            sINM.setPackageNotificationSoundTimeout(pkg, uid, timeout);
+            return true;
+        } catch (Exception e) {
+            Log.w(TAG, "Error calling NoMan", e);
+            return false;
+        }
+    }
+
     static class Row {
         public String section;
     }
@@ -164,6 +184,7 @@ public class NotificationBackend {
         public boolean peekable;
         public boolean sensitive;
         public boolean first;  // first app in section
+        public long soundTimeout;
     }
 
 }
-- 
cgit v1.1


From 7955711d5f9f55e889f65a8ec48c812ff900c4b3 Mon Sep 17 00:00:00 2001
From: Marcos Marado <mmarado@cyngn.com>
Date: Mon, 17 Oct 2016 19:31:46 +0100
Subject: SecuritySettings: Fix KeyStore related NPE's

Both "Show password" and "Credential storage" options depend on having
a KeyStore. However, KeyStore assumes that there's an
android.security.keystore service around. Let's validate if it indeed
exists and not show those two sections if it doesn't, in order to
avoid breakage.

Issue: BUGDUMP-7995106

Change-Id: I30b74057aae42e72387087d1c1d847dd8524f87f
---
 src/com/android/settings/SecuritySettings.java | 45 +++++++++++++++-----------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 3513126..7db4a4e 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -31,6 +31,7 @@ import android.hardware.fingerprint.Fingerprint;
 import android.hardware.fingerprint.FingerprintManager;
 import android.os.Bundle;
 import android.os.PersistableBundle;
+import android.os.ServiceManager;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.preference.ListPreference;
@@ -449,26 +450,34 @@ public class SecuritySettings extends SettingsPreferenceFragment
                 updateSmsSecuritySummary(smsSecurityCheck);
             }
 
-            // Show password
-            mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
-            mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
-
-            // Credential storage
+            // needed by Credential storage and Application install sections
             final UserManager um = (UserManager) getActivity().getSystemService(Context.USER_SERVICE);
-            mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
-            if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
-                Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
 
-                final int storageSummaryRes =
-                        mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
-                                : R.string.credential_storage_type_software;
-                credentialStorageType.setSummary(storageSummaryRes);
-            } else {
-                PreferenceGroup credentialsManager = (PreferenceGroup)
-                        root.findPreference(KEY_CREDENTIALS_MANAGER);
-                credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
-                credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
-                credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
+            // Both "Show password" and "Credential storage" options depend on having a KeyStore.
+            // However, KeyStore assumes that there's an android.security.keystore service around.
+            // Let's validate if it indeed exists here, to avoid breakage.
+            if (ServiceManager.getService("android.security.keystore") != null) {
+                // Show password
+                mShowPassword = (SwitchPreference) root.findPreference(KEY_SHOW_PASSWORD);
+                mResetCredentials = root.findPreference(KEY_RESET_CREDENTIALS);
+
+                // Credential storage
+                mKeyStore = KeyStore.getInstance(); // needs to be initialized for onResume()
+
+                if (!um.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+                    Preference credentialStorageType = root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE);
+
+                    final int storageSummaryRes =
+                            mKeyStore.isHardwareBacked() ? R.string.credential_storage_type_hardware
+                                    : R.string.credential_storage_type_software;
+                    credentialStorageType.setSummary(storageSummaryRes);
+                } else {
+                    PreferenceGroup credentialsManager = (PreferenceGroup)
+                            root.findPreference(KEY_CREDENTIALS_MANAGER);
+                    credentialsManager.removePreference(root.findPreference(KEY_RESET_CREDENTIALS));
+                    credentialsManager.removePreference(root.findPreference(KEY_CREDENTIALS_INSTALL));
+                    credentialsManager.removePreference(root.findPreference(KEY_CREDENTIAL_STORAGE_TYPE));
+                }
             }
 
             // Application install
-- 
cgit v1.1


From f6d341de9c5d0cff71544261d10c8375a9d67b7c Mon Sep 17 00:00:00 2001
From: Bruno Martins <bgcngm@gmail.com>
Date: Thu, 10 Nov 2016 00:26:37 +0000
Subject: Settings: Fix mismerge

 * This was wrongly added during merge of tag 'android-6.0.1_r74'

Change-Id: I43f10016b69b4680da01be77ecb5fbb7e84a7429
---
 .../settings/fingerprint/FingerprintEnrollIntroduction.java   | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
index c3f2a5f..2e66d16 100644
--- a/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
+++ b/src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
@@ -44,16 +44,9 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase {
         findViewById(R.id.cancel_button).setOnClickListener(this);
 
         final View learnMoreButton = findViewById(R.id.learn_more_button);
-        // If help url is not overlaid, remove the button.
-        if (TextUtils.isEmpty(getString(R.string.help_url_fingerprint))) {
-            learnMoreButton.setVisibility(View.GONE);
-        } else {
-            learnMoreButton.setOnClickListener(this);
-        }
-
-        final View learnMoreButton = findViewById(R.id.learn_more_button);
         learnMoreButton.setOnClickListener(this);
-        if (Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
+        if (TextUtils.isEmpty(getString(R.string.help_url_fingerprint)) ||
+                Global.getInt(getContentResolver(), Global.DEVICE_PROVISIONED, 0) == 0) {
             learnMoreButton.setVisibility(View.GONE);
         }
 
-- 
cgit v1.1


From c83e96c1ae430314bdda7476e17c08d66b17ddb3 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <android@cerqueira.org>
Date: Thu, 10 Nov 2016 12:17:30 +0000
Subject: lights: Use NotificationManager to figure out LED capabilities

As of f/b change I7d627914b058861048071fc15776031c4152157f, there's
a more generic helper method in the notification service to get a
more unified (and extensible) list of what the on-device LEDs can
do. Move away from direct usage of the boolean resources.

Change-Id: Ib9a6f28dc52af722dac168ec219b790ad94d6a19
---
 .../notificationlight/ApplicationLightPreference.java       | 13 ++++++++-----
 .../settings/notificationlight/BatteryLightSettings.java    |  9 ++++++---
 .../settings/notificationlight/LightSettingsDialog.java     |  3 +--
 .../notificationlight/NotificationLightSettings.java        |  8 +++++---
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/com/android/settings/notificationlight/ApplicationLightPreference.java b/src/com/android/settings/notificationlight/ApplicationLightPreference.java
index a12f45b..405c826 100644
--- a/src/com/android/settings/notificationlight/ApplicationLightPreference.java
+++ b/src/com/android/settings/notificationlight/ApplicationLightPreference.java
@@ -18,6 +18,7 @@ package com.android.settings.notificationlight;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.NotificationManager;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.res.Resources;
@@ -55,11 +56,11 @@ public class ApplicationLightPreference extends DialogPreference {
      */
     public ApplicationLightPreference(Context context, AttributeSet attrs) {
         super(context, attrs);
+        NotificationManager nm = context.getSystemService(NotificationManager.class);
         mColorValue = DEFAULT_COLOR;
         mOnValue = DEFAULT_TIME;
         mOffValue = DEFAULT_TIME;
-        mOnOffChangeable = context.getResources().getBoolean(
-                com.android.internal.R.bool.config_ledCanPulse);
+        mOnOffChangeable = nm.deviceLightsCan(NotificationManager.LIGHTS_LED_PULSE);
         init();
     }
 
@@ -71,11 +72,11 @@ public class ApplicationLightPreference extends DialogPreference {
      */
     public ApplicationLightPreference(Context context, int color, int onValue, int offValue) {
         super(context, null);
+        NotificationManager nm = context.getSystemService(NotificationManager.class);
         mColorValue = color;
         mOnValue = onValue;
         mOffValue = offValue;
-        mOnOffChangeable = context.getResources().getBoolean(
-                com.android.internal.R.bool.config_ledCanPulse);
+        mOnOffChangeable = nm.deviceLightsCan(NotificationManager.LIGHTS_LED_PULSE);
         init();
     }
 
@@ -117,6 +118,8 @@ public class ApplicationLightPreference extends DialogPreference {
     protected void onBindView(View view) {
         super.onBindView(view);
 
+        NotificationManager nm = getContext().getSystemService(NotificationManager.class);
+
         mLightColorView = (ImageView) view.findViewById(R.id.light_color);
         mOnValueView = (TextView) view.findViewById(R.id.textViewTimeOnValue);
         mOffValueView = (TextView) view.findViewById(R.id.textViewTimeOffValue);
@@ -126,7 +129,7 @@ public class ApplicationLightPreference extends DialogPreference {
         TextView tView = (TextView) view.findViewById(android.R.id.summary);
         tView.setVisibility(View.GONE);
 
-        if (!mResources.getBoolean(com.android.internal.R.bool.config_multiColorNotificationLed)) {
+        if (!nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION)) {
             mLightColorView.setVisibility(View.GONE);
         }
 
diff --git a/src/com/android/settings/notificationlight/BatteryLightSettings.java b/src/com/android/settings/notificationlight/BatteryLightSettings.java
index 2ee884e..9efabc3 100644
--- a/src/com/android/settings/notificationlight/BatteryLightSettings.java
+++ b/src/com/android/settings/notificationlight/BatteryLightSettings.java
@@ -16,6 +16,7 @@
 
 package com.android.settings.notificationlight;
 
+import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -64,6 +65,8 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.battery_light_settings);
 
+        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);
+
         PreferenceScreen prefSet = getPreferenceScreen();
 
         PreferenceGroup mGeneralPrefs = (PreferenceGroup) prefSet.findPreference("general_section");
@@ -71,13 +74,13 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
         mLightEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(LIGHT_ENABLED_PREF);
         mPulseEnabledPref = (CMSystemSettingSwitchPreference) prefSet.findPreference(PULSE_ENABLED_PREF);
 
-        if (!getResources().getBoolean(com.android.internal.R.bool.config_ledCanPulse) ||
-                getResources().getBoolean(org.cyanogenmod.platform.internal.R.bool.config_useSegmentedBatteryLed)) {
+        if (!nm.deviceLightsCan(NotificationManager.LIGHTS_LED_PULSE) ||
+             nm.deviceLightsCan(NotificationManager.LIGHTS_SEGMENTED_BATTERY_LIGHTS) ) {
             mGeneralPrefs.removePreference(mPulseEnabledPref);
         }
 
         // Does the Device support changing battery LED colors?
-        if (getResources().getBoolean(com.android.internal.R.bool.config_multiColorBatteryLed)) {
+        if (nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_BATTERY)) {
             setHasOptionsMenu(true);
 
             // Low, Medium and full color preferences
diff --git a/src/com/android/settings/notificationlight/LightSettingsDialog.java b/src/com/android/settings/notificationlight/LightSettingsDialog.java
index d2d4e84..79b23e0 100644
--- a/src/com/android/settings/notificationlight/LightSettingsDialog.java
+++ b/src/com/android/settings/notificationlight/LightSettingsDialog.java
@@ -170,8 +170,7 @@ public class LightSettingsDialog extends AlertDialog implements
         setView(layout);
         setTitle(R.string.edit_light_settings);
 
-        if (!getContext().getResources().getBoolean(
-                com.android.internal.R.bool.config_multiColorNotificationLed)) {
+        if (!mNotificationManager.deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION)) {
             mColorPicker.setVisibility(View.GONE);
             mColorPanel.setVisibility(View.GONE);
             mLightsDialogDivider.setVisibility(View.GONE);
diff --git a/src/com/android/settings/notificationlight/NotificationLightSettings.java b/src/com/android/settings/notificationlight/NotificationLightSettings.java
index b17918a..1c3601c 100644
--- a/src/com/android/settings/notificationlight/NotificationLightSettings.java
+++ b/src/com/android/settings/notificationlight/NotificationLightSettings.java
@@ -18,6 +18,7 @@ package com.android.settings.notificationlight;
 
 import android.app.AlertDialog;
 import android.app.Dialog;
+import android.app.NotificationManager;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -97,6 +98,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         PreferenceScreen prefSet = getPreferenceScreen();
         Resources resources = getResources();
 
+        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);
+
         PreferenceGroup mAdvancedPrefs = (PreferenceGroup) prefSet.findPreference("advanced_section");
 
         // Get the system defined default notification color
@@ -135,8 +138,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         } else {
             mNotificationLedBrightnessPref.setOnPreferenceChangeListener(this);
         }
-        if (!resources.getBoolean(
-                org.cyanogenmod.platform.internal.R.bool.config_multipleNotificationLeds)) {
+        if (!nm.deviceLightsCan(NotificationManager.LIGHTS_MULTIPLE_LED)) {
             mAdvancedPrefs.removePreference(mMultipleLedsEnabledPref);
         } else {
             mMultipleLedsEnabledPref.setOnPreferenceChangeListener(this);
@@ -164,7 +166,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         mPackages = new HashMap<String, Package>();
         setHasOptionsMenu(true);
 
-        mMultiColorLed = resources.getBoolean(com.android.internal.R.bool.config_multiColorNotificationLed);
+        mMultiColorLed = nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION);
         if (!mMultiColorLed) {
             resetColors();
             PreferenceGroup mGeneralPrefs = (PreferenceGroup) prefSet.findPreference("general_section");
-- 
cgit v1.1


From bbd02a64e0a4371de1858f90943d991863a41fe0 Mon Sep 17 00:00:00 2001
From: Zhao Wei Liew <zhaoweiliew@gmail.com>
Date: Thu, 17 Nov 2016 20:22:39 +0800
Subject: Settings: Make proximity wake string more accurate

We also check the proximity sensor for gesture-activated wake-ups,
such as tap to wake.

Change-Id: I4e73a8d9b116e49fa168c1a4a457f55ff3885aea
---
 res/values/cm_strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 4ef248c..7fa4160 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -627,7 +627,7 @@
 
     <!-- Proximity wake -->
     <string name="proximity_wake_title">Prevent accidental wake-up</string>
-    <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>
+    <string name="proximity_wake_summary">Check the proximity sensor prior to wake-ups triggered by gestures</string>
 
     <!-- Turn on display when power connected; turn off display when power disconnected -->
     <string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
-- 
cgit v1.1


From 34a780de7ae8733d89dd110d527234e02e94f1cf Mon Sep 17 00:00:00 2001
From: Alberto97 <albertop2197@gmail.com>
Date: Sat, 19 Nov 2016 16:08:15 +0100
Subject: Settings: Hide Reset action if Battery LED is not multicolor

Change-Id: Icb3c7d640cb540d69efa7186c84a92e4e780968d
---
 .../settings/notificationlight/BatteryLightSettings.java     | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/com/android/settings/notificationlight/BatteryLightSettings.java b/src/com/android/settings/notificationlight/BatteryLightSettings.java
index 9efabc3..afdd756 100644
--- a/src/com/android/settings/notificationlight/BatteryLightSettings.java
+++ b/src/com/android/settings/notificationlight/BatteryLightSettings.java
@@ -147,10 +147,14 @@ public class BatteryLightSettings extends SettingsPreferenceFragment implements
 
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
-        menu.add(0, MENU_RESET, 0, R.string.profile_reset_title)
-                .setIcon(R.drawable.ic_settings_backup_restore)
-                .setAlphabeticShortcut('r')
-                .setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        final NotificationManager nm = getContext().getSystemService(NotificationManager.class);
+        if (nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_BATTERY)) {
+            menu.add(0, MENU_RESET, 0, R.string.profile_reset_title)
+                    .setIcon(R.drawable.ic_settings_backup_restore)
+                    .setAlphabeticShortcut('r')
+                    .setShowAsActionFlags(
+                            MenuItem.SHOW_AS_ACTION_ALWAYS | MenuItem.SHOW_AS_ACTION_WITH_TEXT);
+        }
     }
 
     @Override
-- 
cgit v1.1


From 4f954a904b199ba817869653e8eded97ead7d8fb Mon Sep 17 00:00:00 2001
From: Alberto97 <albertop2197@gmail.com>
Date: Wed, 16 Nov 2016 12:11:00 -0600
Subject: NotificationLightSettings: Remove noop fields when LED can't pulse

Change-Id: I639b7fc385ffbc551ca3708d9f42db59662b6bee
---
 .../NotificationLightSettings.java                 | 33 ++++++++++++++++------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/com/android/settings/notificationlight/NotificationLightSettings.java b/src/com/android/settings/notificationlight/NotificationLightSettings.java
index 1c3601c..3b02d36 100644
--- a/src/com/android/settings/notificationlight/NotificationLightSettings.java
+++ b/src/com/android/settings/notificationlight/NotificationLightSettings.java
@@ -89,6 +89,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
     private String mPackageList;
     private Map<String, Package> mPackages;
     private boolean mMultiColorLed;
+    private boolean mLedCanPulse;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -101,6 +102,7 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         final NotificationManager nm = getContext().getSystemService(NotificationManager.class);
 
         PreferenceGroup mAdvancedPrefs = (PreferenceGroup) prefSet.findPreference("advanced_section");
+        PreferenceGroup mGeneralPrefs = (PreferenceGroup) prefSet.findPreference("general_section");
 
         // Get the system defined default notification color
         mDefaultColor =
@@ -111,12 +113,14 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         mDefaultLedOff = resources.getInteger(
                 com.android.internal.R.integer.config_defaultNotificationLedOff);
 
+        mLedCanPulse = nm.deviceLightsCan(NotificationManager.LIGHTS_LED_PULSE);
+        mMultiColorLed = nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION);
+
         mEnabledPref = (SystemSettingSwitchPreference)
                 findPreference(Settings.System.NOTIFICATION_LIGHT_PULSE);
         mEnabledPref.setOnPreferenceChangeListener(this);
 
         mDefaultPref = (ApplicationLightPreference) findPreference(DEFAULT_PREF);
-        mDefaultPref.setOnPreferenceChangeListener(this);
 
         mAutoGenerateColors = (CMSystemSettingSwitchPreference)
                 findPreference(CMSettings.System.NOTIFICATION_LIGHT_COLOR_AUTO);
@@ -131,7 +135,6 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         mScreenOnLightsPref.setOnPreferenceChangeListener(this);
         mCustomEnabledPref = (CMSystemSettingSwitchPreference)
                 findPreference(CMSettings.System.NOTIFICATION_LIGHT_PULSE_CUSTOM_ENABLE);
-        mCustomEnabledPref.setOnPreferenceChangeListener(this);
         if (!resources.getBoolean(
                 org.cyanogenmod.platform.internal.R.bool.config_adjustableNotificationLedBrightness)) {
             mAdvancedPrefs.removePreference(mNotificationLedBrightnessPref);
@@ -143,10 +146,18 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         } else {
             mMultipleLedsEnabledPref.setOnPreferenceChangeListener(this);
         }
+        if (!mLedCanPulse && !mMultiColorLed) {
+            mGeneralPrefs.removePreference(mDefaultPref);
+            mAdvancedPrefs.removePreference(mCustomEnabledPref);
+        } else {
+            mCustomEnabledPref.setOnPreferenceChangeListener(this);
+            mDefaultPref.setOnPreferenceChangeListener(this);
+        }
 
         // Missed call and Voicemail preferences should only show on devices with a voice capabilities
         TelephonyManager tm = (TelephonyManager) getActivity().getSystemService(Context.TELEPHONY_SERVICE);
-        if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE) {
+        if (tm.getPhoneType() == TelephonyManager.PHONE_TYPE_NONE
+                || (!mLedCanPulse && !mMultiColorLed)) {
             removePreference("phone_list");
         } else {
             mCallPref = (ApplicationLightPreference) findPreference(MISSED_CALL_PREF);
@@ -156,8 +167,12 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
             mVoicemailPref.setOnPreferenceChangeListener(this);
         }
 
-        mApplicationPrefList = (PreferenceGroup) findPreference("applications_list");
-        mApplicationPrefList.setOrderingAsAdded(false);
+        if (!mLedCanPulse && !mMultiColorLed) {
+            removePreference("applications_list");
+        } else {
+            mApplicationPrefList = (PreferenceGroup) findPreference("applications_list");
+            mApplicationPrefList.setOrderingAsAdded(false);
+        }
 
         // Get launch-able applications
         mPackageManager = getPackageManager();
@@ -166,10 +181,8 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
         mPackages = new HashMap<String, Package>();
         setHasOptionsMenu(true);
 
-        mMultiColorLed = nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION);
         if (!mMultiColorLed) {
             resetColors();
-            PreferenceGroup mGeneralPrefs = (PreferenceGroup) prefSet.findPreference("general_section");
             mGeneralPrefs.removePreference(mAutoGenerateColors);
         } else {
             mAutoGenerateColors.setOnPreferenceChangeListener(this);
@@ -253,8 +266,10 @@ public class NotificationLightSettings extends SettingsPreferenceFragment implem
             mVoicemailPref.setAllValues(vmailColor, vmailTimeOn, vmailTimeOff);
         }
 
-        mApplicationPrefList = (PreferenceGroup) findPreference("applications_list");
-        mApplicationPrefList.setOrderingAsAdded(false);
+        if (mLedCanPulse || mMultiColorLed) {
+            mApplicationPrefList = (PreferenceGroup) findPreference("applications_list");
+            mApplicationPrefList.setOrderingAsAdded(false);
+        }
     }
 
     private void refreshCustomApplicationPrefs() {
-- 
cgit v1.1


From c2da9ad6a331c6a6f5b8c56ecf5c716ab08f4d21 Mon Sep 17 00:00:00 2001
From: Ricardo Cerqueira <android@cerqueira.org>
Date: Thu, 24 Nov 2016 15:04:06 +0000
Subject: telephony: Disable the SIM state change receiver

We've mistakenly reimplemented this functionality at the telephony
framework because we didn't realize it was here to begin with (and
neutralized by a QC commit).
Having the QC configuration in place makes _both_ come up, which
is annoying...
Since the f/o/t implementation (change
Iddaef47eefeab43ed99ca6f27f81dffd8dd08689) uses different visual
assets people are already used to, let's forcefully use that one
for now until we figure out which one we want to retain...

Change-Id: I1dfab99e475b2d5aa4574ecdb5d0d7ee6cf00191
---
 AndroidManifest.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 700c93c..ffeb655 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2718,12 +2718,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".sim.SimSelectNotification">
-            <intent-filter>
-                <action android:name="android.intent.action.SIM_STATE_CHANGED"></action>
-            </intent-filter>
-        </receiver>
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="com.android.settings.files"
-- 
cgit v1.1


From 630dfa8a5381368b50bca48a87b8b422c02074c8 Mon Sep 17 00:00:00 2001
From: Tyler Dunn <ireallylikeshrek@gmail.com>
Date: Mon, 31 Oct 2016 23:37:36 -0400
Subject: DataUsageUtils: Clean up based on code review

* Add missing header
* Extract DataUsageContract.UID + " = ? " into a string
* Simplify "0" string
* Use try-with-resource block to ensure cursor is closed

This commit is based on the post-merge feedback of Kamaljeet Maini,
Fabrice Di Meglio and Danny Baumann.

Change-Id: I774948ba119e3e4a2dd438e1ed1588bfb9fefae2
---
 src/com/android/settings/DataUsageUtils.java | 50 ++++++++++++++++------------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/src/com/android/settings/DataUsageUtils.java b/src/com/android/settings/DataUsageUtils.java
index 5f08067..09b6b10 100644
--- a/src/com/android/settings/DataUsageUtils.java
+++ b/src/com/android/settings/DataUsageUtils.java
@@ -1,5 +1,20 @@
-package com.android.settings;
+/*
+ * Copyright (C) 2016 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.
+ */
 
+package com.android.settings;
 
 import android.app.AlarmManager;
 import android.app.PendingIntent;
@@ -11,12 +26,12 @@ import android.util.Log;
 
 import cyanogenmod.providers.DataUsageContract;
 
-
 /**
  * This class contains utility helper functions for accessing DataUsageProvider
  */
 public class DataUsageUtils {
     private static final String TAG = DataUsageUtils.class.getSimpleName();
+    private static final String WHERE_CLAUSE = DataUsageContract.UID + " = ? ";
     private static final int DATAUSAGE_SERVICE_ALARM_ID = 0x102030;
     private static boolean DEBUG = true;
 
@@ -42,8 +57,8 @@ public class DataUsageUtils {
         }
         context.getContentResolver().delete(
                 DataUsageContract.CONTENT_URI,
-                DataUsageContract.UID + " = ? ",
-                new String [] { String.valueOf(uid)}
+                WHERE_CLAUSE,
+                new String [] { String.valueOf(uid) }
         );
     }
 
@@ -66,43 +81,36 @@ public class DataUsageUtils {
         context.getContentResolver().update(
                 DataUsageContract.CONTENT_URI,
                 values,
-                DataUsageContract.UID + " = ? ",
-                new String [] { String.valueOf(uid)}
+                WHERE_CLAUSE,
+                new String [] { String.valueOf(uid) }
         );
     }
 
     public static boolean isDbEnabled(Context context) {
         boolean dbEnabled = false;
-        Cursor cursor = context.getContentResolver().query(
+        try (Cursor cursor = context.getContentResolver().query(
                 DataUsageContract.CONTENT_URI,
                 null,
-                DataUsageContract.UID + " = ? ",
-                new String [] { String.valueOf("0") },
-                null
-        );
-
-        if (cursor != null) {
-            cursor.close();
+                WHERE_CLAUSE,
+                new String [] { "0" },
+                null)) {
             dbEnabled = true;
         }
         return dbEnabled;
     }
 
-
     public static boolean isAppEnabled(Context context, int uid) {
         boolean appEnabled = false;
-        Cursor cursor = context.getContentResolver().query(
+
+        try (Cursor cursor = context.getContentResolver().query(
                 DataUsageContract.CONTENT_URI,
                 null,
-                DataUsageContract.UID + " = ? ",
+                WHERE_CLAUSE,
                 new String [] { String.valueOf(uid) },
-                null
-        );
-        if (cursor != null) {
+                null)) {
             if (cursor.moveToFirst()) {
                 appEnabled = cursor.getInt(DataUsageContract.COLUMN_OF_ENABLE) == 1;
             }
-            cursor.close();
         }
 
         if (DEBUG) {
-- 
cgit v1.1


From cba3884323d3db19a9a75cddd44a542f9531d535 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Tue, 29 Nov 2016 09:39:33 -0800
Subject: Automatic translation import

Change-Id: I6accc5d5e84063b20a7837ccac93dbcd78c67f21
Ticket: -
---
 res/values-af/cm_strings.xml      |  68 ++++
 res/values-am/cm_strings.xml      |   2 +
 res/values-ar/cm_strings.xml      |   2 +
 res/values-as-rIN/cm_strings.xml  |   2 +
 res/values-ast-rES/cm_strings.xml |   2 +
 res/values-az-rAZ/cm_strings.xml  |   2 +
 res/values-be/cm_strings.xml      |   6 +-
 res/values-bg/cm_strings.xml      |  15 +
 res/values-bn-rBD/cm_strings.xml  |   2 +
 res/values-br-rFR/cm_strings.xml  |   2 +
 res/values-bs-rBA/cm_strings.xml  |   2 +
 res/values-ca/cm_strings.xml      |  15 +
 res/values-cs/cm_strings.xml      |  23 ++
 res/values-csb-rPL/cm_strings.xml |   2 +
 res/values-cy/cm_strings.xml      |   2 +
 res/values-da/cm_strings.xml      |   8 +
 res/values-de/cm_strings.xml      |  14 +
 res/values-el/cm_strings.xml      |   2 +
 res/values-en-rAU/cm_strings.xml  |   2 +
 res/values-en-rGB/cm_strings.xml  |   2 +
 res/values-en-rIN/cm_strings.xml  |   2 +
 res/values-en-rPT/cm_strings.xml  |   2 +
 res/values-eo/cm_plurals.xml      |  27 --
 res/values-eo/cm_strings.xml      | 644 +-------------------------------------
 res/values-es-rCO/cm_strings.xml  |   2 +
 res/values-es-rMX/cm_strings.xml  |   2 +
 res/values-es-rUS/cm_strings.xml  |   2 +
 res/values-es/cm_strings.xml      |   2 +
 res/values-et-rEE/cm_strings.xml  |   2 +
 res/values-eu-rES/cm_strings.xml  |  19 +-
 res/values-fa/cm_strings.xml      |   2 +
 res/values-fi/cm_strings.xml      |  15 +
 res/values-fil-rPH/cm_strings.xml |   2 +
 res/values-fr-rCA/cm_strings.xml  |   2 +
 res/values-fr/cm_strings.xml      |   2 +
 res/values-frp-rIT/cm_strings.xml |   2 +
 res/values-fy-rNL/cm_strings.xml  |   2 +
 res/values-ga-rIE/cm_strings.xml  |   2 +
 res/values-gd-rGB/cm_strings.xml  |   2 +
 res/values-gl-rES/cm_strings.xml  |  15 +
 res/values-gu-rIN/cm_strings.xml  |   2 +
 res/values-hi/cm_strings.xml      |   2 +
 res/values-hr/cm_strings.xml      |  15 +
 res/values-hu/cm_strings.xml      |   2 +
 res/values-hy-rAM/cm_strings.xml  |   2 +
 res/values-in/cm_strings.xml      |  45 ++-
 res/values-is-rIS/cm_strings.xml  |   2 +
 res/values-it/cm_strings.xml      |  15 +
 res/values-iw/cm_strings.xml      |  21 ++
 res/values-ja/cm_strings.xml      |  39 ++-
 res/values-ka-rGE/cm_strings.xml  |   2 +
 res/values-kk-rKZ/cm_strings.xml  |   2 +
 res/values-km-rKH/cm_strings.xml  |   2 +
 res/values-kn-rIN/cm_strings.xml  |   2 +
 res/values-ko/cm_strings.xml      |   2 +
 res/values-ku/cm_strings.xml      |   2 +
 res/values-ky-rKG/cm_strings.xml  |   2 +
 res/values-lb/cm_strings.xml      |   2 +
 res/values-lo-rLA/cm_strings.xml  |   2 +
 res/values-lt/cm_strings.xml      |   2 +
 res/values-lv/cm_strings.xml      |   2 +
 res/values-mk-rMK/cm_strings.xml  |   2 +
 res/values-ml-rIN/cm_strings.xml  |   2 +
 res/values-mn-rMN/cm_strings.xml  |   2 +
 res/values-mr-rIN/cm_strings.xml  |   2 +
 res/values-ms-rMY/cm_strings.xml  |   2 +
 res/values-my-rMM/cm_strings.xml  |   2 +
 res/values-nb/cm_strings.xml      |  15 +
 res/values-ne-rNP/cm_strings.xml  |   2 +
 res/values-nl/cm_strings.xml      |  19 +-
 res/values-oc-rFR/cm_strings.xml  |   2 +
 res/values-or-rIN/cm_strings.xml  |   2 +
 res/values-pa-rIN/cm_strings.xml  |   2 +
 res/values-pl/cm_strings.xml      |  17 +
 res/values-pt-rBR/cm_strings.xml  |  15 +
 res/values-pt-rPT/cm_strings.xml  |  15 +
 res/values-rm/cm_strings.xml      |   2 +
 res/values-ro/cm_strings.xml      |   2 +
 res/values-ru/cm_strings.xml      |  15 +
 res/values-si-rLK/cm_strings.xml  |   2 +
 res/values-sk/cm_strings.xml      |   2 +
 res/values-sl/cm_strings.xml      |  19 +-
 res/values-sq-rAL/cm_strings.xml  |   2 +
 res/values-sr/cm_strings.xml      |  11 +
 res/values-sv/cm_strings.xml      |   2 +
 res/values-sw/cm_strings.xml      |   2 +
 res/values-ta-rIN/cm_strings.xml  |   2 +
 res/values-te-rIN/cm_strings.xml  |   2 +
 res/values-th/cm_strings.xml      |   2 +
 res/values-tr/cm_strings.xml      |   2 +
 res/values-ug/cm_strings.xml      |   2 +
 res/values-uk/cm_strings.xml      |   2 +
 res/values-ur-rPK/cm_strings.xml  |   2 +
 res/values-uz-rUZ/cm_strings.xml  |   2 +
 res/values-vi/cm_strings.xml      |   2 +
 res/values-zh-rCN/cm_strings.xml  |  15 +
 res/values-zh-rHK/cm_strings.xml  |   2 +
 res/values-zh-rTW/cm_strings.xml  |   2 +
 res/values-zu/cm_strings.xml      |   2 +
 99 files changed, 607 insertions(+), 684 deletions(-)
 delete mode 100644 res/values-eo/cm_plurals.xml

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 1582d9d..8741f5b 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -17,9 +17,16 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Jy is nou <xliff:g id="step_count">%1$d </xliff:g> stap weg om navrae te doen na toestel ID.</item>
+    <item quantity="other">Jy is nou <xliff:g id="step_count">%1$d </xliff:g> stappe weg om navrae te doen na toestel ID.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Toestel-ID: [<xliff:g id="device_id">%1$s </xliff:g>] gekopieer na knipbord</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Toestel-ID is nie beskikbaar op hierdie weergawe nie</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Toestel-ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Jy is nou <xliff:g id="step_count">%1$d</xliff:g> stap weg van bemagtigende ontwikkelaar opsies.</item>
@@ -43,6 +50,8 @@
   <string name="root_access_adb">Slegs ADB</string>
   <string name="root_access_all">Programme en ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Bestuur root toegang</string>
+  <string name="root_appops_summary">Kyk na en beheer die root reëls</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -278,6 +287,7 @@
   <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ligte instellings</string>
   <string name="led_notification_text">LED liggie word deur instellings gaktiveer</string>
+  <string name="notification_light_no_apps_summary">Om per toep beheer by te voeg, aktiveer \'%1$s\' en druk \'\u002b\' op die kieslys balk</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Android ontfouting</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
@@ -447,6 +457,7 @@
   <string name="app_ops_allowed_count">Toegelaat <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_ignored_count">Ontken <xliff:g id="count" example="2 times">%s</xliff:g></string>
   <string name="app_ops_both_count">Toegelaat <xliff:g id="count">%1$s</xliff:g>, ontken <xliff:g id="count">%2$s</xliff:g></string>
+  <string name="app_ops_disabled_by_optimization">Gedeaktiveer deur battery optimalisering</string>
   <!-- App ops menu options -->
   <string name="app_ops_show_user_apps">Wys gebruiker programme</string>
   <string name="app_ops_show_system_apps">Wys ingeboude programme</string>
@@ -552,6 +563,7 @@
   <string name="volume_adjust_sounds_title">Volume verander klanke</string>
   <!-- Hardware tunables - Vibrator intensity -->
   <string name="vibrator_intensity_title">Vibrator intensiteit</string>
+  <string name="vibrator_warning">Waardes hoër as %1$d%% word nie aanbeveel nie</string>
   <!-- Hardware tunables - Color calibration -->
   <string name="color_calibration_title">Kleur kalibrasie</string>
   <string name="color_calibration_summary">Kalibreer skerm kleure</string>
@@ -603,8 +615,14 @@
   <string name="live_display_color_profile_photography_summary">Perfekte kleur voortplanting vir foto\'s</string>
   <string name="live_display_color_profile_basic_title">Basies</string>
   <string name="live_display_color_profile_basic_summary">Gebruik die skerm ongekalibreerd</string>
+  <string name="live_display_color_profile_adaptive_title">Aanpasbaar</string>
+  <string name="live_display_color_profile_adaptive_summary">Kleure pas by omringende omstandighede</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Prent aanpassing</string>
+  <string name="picture_adjustment_summary">Verstel kleur, versadiging, intensiteit en kontras</string>
+  <string name="adj_hue_title">Kleur</string>
   <string name="adj_saturation_title">Versadigingspunt</string>
+  <string name="adj_intensity_title">Intensiteit</string>
   <string name="adj_contrast_title">Kontras</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Selektor ikoon</string>
@@ -932,6 +950,7 @@
   <string name="zen_mode_summary_selected_callers">kies bellers</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">geselekteerde boodskappe</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hoof: %1$s W/kg</string>
@@ -1000,9 +1019,36 @@
   <string name="restrict_app_cellular_summary">Voorkom toep om sellulêre data konneksie te gebruik</string>
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
+  <string name="weather_settings_title">Weer</string>
+  <string name="weather_settings_no_services_prompt">Geen weer verskaffer dienste geïnstalleer</string>
+  <string name="weather_settings_button">Verskaffer instellings</string>
+  <string name="weather_settings_activity_not_found">Kon nie die instellings-kieslys van die verskaffer begin nie</string>
+  <string name="weather_settings_add_weather_provider">Voeg weer verskaffer by</string>
   <string name="weather_settings_general_settings_title">Algemeen</string>
+  <string name="weather_settings_providers_title">Verskaffers</string>
+  <string name="weather_settings_temp_units_title">Temperatuur eenheid</string>
+  <string name="weather_settings_temp_celsius">Celsius</string>
+  <string name="weather_settings_temp_fahrenheit">Fahrenheit</string>
+  <string name="weather_settings_keyword">weer</string>
+  <string name="background_data_access">Agtergrond data toegang</string>
+  <string name="allow_background_both">Oor sellulêre data &amp; Wi\u2011Fi</string>
+  <string name="allow_background_wlan">Slegs oor Wi\u2011Fi</string>
+  <string name="allow_background_none">Geen toegang</string>
+  <string name="mobile_data_alert">Sellulêre data waarskuwing</string>
+  <string name="mobile_data_alert_summary">Stel my in kennis wanneer die toep baie data gebruik</string>
+  <string name="data_usage_menu_enable_data_alerts">Aktiveer data gebruik waarskuwings</string>
+  <string name="data_usage_menu_disable_data_alerts">Deaktiveer data gebruik waarskuwings</string>
+  <string name="data_usage_menu_reset_stats">Data statistiek terug gestel</string>
+  <string name="reset_data_stats_msg">Dit sal alle vorige en huidige data opsporings inligting verwyder</string>
+  <string name="reset_stats_confirm">Bevestig</string>
+  <string name="restrict_cellular_access_title">Beperk sellulêre data toegang</string>
+  <string name="restrict_cellular_access_summary">Deaktiveer data toegang op sellulêre netwerke</string>
+  <string name="restrict_cellular_access_dialog_title">Beperk sellulêre data toegang?</string>
+  <string name="restrict_cellular_access_dialog_summary">Hierdie funksie kan veroorsaak dat \'n toepassing wat netwerk toegang benodig hang wanneer net sellulêre netwerke beskikbaar is.\n\nJy kan meer toepaslike data gebruik kontroleer met behulp van instellings binne die teop.</string>
   <!-- Label for settings shortcut: carrier selection -->
+  <string name="shortcut_carrier_title">Netwerk operateurs</string>
   <!-- title for lock screen blur preference -->
+  <string name="lockscreen_blur_enabled_title">Blur agtergrond</string>
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Wys weer</string>
   <!-- Per app controls for LP keyguard notifications -->
@@ -1010,10 +1056,32 @@
   <string name="app_notification_show_on_keyguard_summary">Vertoon kennisgewings vanuit hierdie program op die slotskerm</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktiveer aanhoudende kennisgewings op die slotskerm</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Moet nooit aanhoudende kennisgewings vertoon vanuit hierdie program op die slotskerm</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
+  <string name="cm_radio_info_label">Verbeterde radio beheer</string>
   <!-- Radio Control (IMS/MBN etc.) -->
+  <string name="cm_radio_info_mbn_auto_load_on_label">Skakel MBN outo laai af</string>
+  <string name="cm_radio_info_mbn_auto_load_off_label">Skakel MBN outo laai aan</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">Skakel fout opspoor vir VoLTE af</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">Skakel fout opspoor vir VoLTE aan</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">Skakel fout opspoor vir VT af</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">Skakel fout opspoor vir VT aan</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">Skakel fout opspoor vir WFC af</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">Skakel fout opspoor vir WFC aan</string>
+  <string name="cm_radio_info_adb_log_on_label">Skakel ADB radio log af</string>
+  <string name="cm_radio_info_adb_log_off_label">Skakel ADB radio log aan</string>
+  <string name="cm_radio_info_diag_log_on_label">Skakel Diag log af</string>
+  <string name="cm_radio_info_diag_log_off_label">Skakel Diag log aan</string>
   <!-- Lock screen wallpaper -->
+  <string name="lockscreen_wallpaper_title">Muurpapier</string>
+  <string name="not_available_with_app">Nie beskikbaar met %1$s</string>
   <!-- Format string for fingerprint location message -->
+  <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">Vind die vingerafdruk sensor op die <xliff:g id="sensor_location">%1$s </xliff:g> van jou foon.</string>
   <!-- Fingerprint sensor locations -->
+  <string name="security_settings_fingerprint_sensor_location_back">terug</string>
+  <string name="security_settings_fingerprint_sensor_location_front">voorkant</string>
+  <string name="security_settings_fingerprint_sensor_location_left">linkerkant</string>
+  <string name="security_settings_fingerprint_sensor_location_right">regte kant</string>
   <!-- SIM status format string -->
+  <string name="sim_status_format_string">Stem: <xliff:g id="voice_status">%1$s </xliff:g> / Data: <xliff:g id="data_status">%2$s </xliff:g></string>
 </resources>
diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-am/cm_strings.xml
+++ b/res/values-am/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index cc69081..5d93622 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -940,6 +940,7 @@
   <string name="zen_mode_summary_selected_callers">المتصلون المحددون</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">الرسائل المحددة</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">الرأس: %1$s w/ كغ</string>
@@ -1044,6 +1045,7 @@
   <string name="app_notification_show_on_keyguard_summary">إظهار إشعارات من هذا التطبيق على شاشة التأمين</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">منع الإشعارات الثابتة على شاشة التأمين</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">عدم إظهار إشعارات ثابتة من هذا التطبيق على شاشة التأمين</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index c1d3c95..cc22db5 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">নিৰ্বাচিত কলাৰসকল</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">নিৰ্বাচিত বাৰ্তা</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">মূৰ: %1$s W/kg</string>
@@ -1003,6 +1004,7 @@
   <string name="app_notification_show_on_keyguard_summary">এই এপ্প্‌ৰ পৰা অধিসূচনা লক স্ক্ৰীণত প্ৰদৰ্শন কৰক</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">লক স্ক্ৰীণত নেৰানেপেৰা অধিসূচনা অক্ষম কৰক</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">এই এপ্প্‌ৰ পৰা নেৰানেপেৰা অধিসূচনা লক স্ক্ৰীণত নেদেখুৱাব</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 22a6da2..121ebc0 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -893,6 +893,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="zen_mode_summary_selected_callers">llamaes esbillaes</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensaxes esbillaos</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -982,6 +983,7 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="app_notification_show_on_keyguard_summary">Amosar notificaciones d\'esta aplicación na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes na pantalla de bloquéu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nun amosar nunca notificaciones persistentes d\'esta aplicación na pantalla de bloquéu</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Control avanzáu de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index f8df89c..267f450 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -667,6 +667,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -704,6 +705,7 @@
   <string name="app_notification_show_on_keyguard_summary">Kilid ekranında bu tətbiqetmənin bildirişlərini göstər</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Kilid ekranında davamlı bildirişləri ləğv et</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilid ekranında bu tətbiqmənin davamlı bildirişlərini heç vaxt göstərmə</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index 7db746e..c8b2caa 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -259,7 +259,7 @@
   <string name="battery_low_pulse_title">Мігацець пры нізкім роўні зарада</string>
   <string name="battery_light_list_title">Колеры</string>
   <string name="battery_light_low_color_title">Батарэя разраджана</string>
-  <string name="battery_light_medium_color_title">Зарадка</string>
+  <string name="battery_light_medium_color_title">Энэрганазапашванне</string>
   <string name="battery_light_full_color_title">Цалкам зараджаны</string>
   <!-- Lights settings screen, notification light settings -->
   <string name="notification_light_title">Індыкатар падзей</string>
@@ -293,7 +293,7 @@
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <string name="app_ops_categories_location">Месцазнаходжанне</string>
   <string name="app_ops_categories_personal">Асабістыя дадзеныя</string>
-  <string name="app_ops_categories_messaging">Гутарка</string>
+  <string name="app_ops_categories_messaging">Паведамленні</string>
   <string name="app_ops_categories_media">Мультымедыя</string>
   <string name="app_ops_categories_device">Прылада</string>
   <string name="app_ops_categories_bootup">Загрузка</string>
@@ -931,6 +931,7 @@
   <string name="zen_mode_summary_selected_callers">абраныя абанэнты</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">абраныя паведамленні</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Галава: %1$s Вт/кг</string>
@@ -1009,6 +1010,7 @@
   <string name="app_notification_show_on_keyguard_summary">Паказваць апавяшчэнні з гэтага дадатку на экране блакавання</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Адключыць шторазовыя апавяшчэнні пра блакаванне экрана</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не паказваць шторазовыя апавяшчэнні з гэтага дадатку на экране блакавання</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 328bfde..16447af 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">избрани повиквания</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">избрани съобщения</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Вибрация</string>
+  <string name="zen_mode_vibration_never">Без вибрация</string>
+  <string name="zen_mode_vibration_calls_only">Вибрирация само при обаждания</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Вибрация само при обаждания и известия</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Глава: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Показвай известия от това приложение при заключен екран</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Забрани постоянна нотификация при заключен екран</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никога не показвай постоянни нотификации от това приложение при заключен екран</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Минимално време между напомняния</string>
+  <string name="app_notification_sound_timeout_summary_template">Разреши звуци или вибрации, но не повече от веднъж на всеки <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Без ограничение</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 секунди</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 секунди</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 минута</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 минути</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 минути</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 минути</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Подобрен радио контрол</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index cbbecb0..b0b05d0 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -521,6 +521,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">হেডঃ %1$s W/kg</string>
@@ -553,6 +554,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-br-rFR/cm_strings.xml
+++ b/res/values-br-rFR/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-bs-rBA/cm_strings.xml
+++ b/res/values-bs-rBA/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 58f6f1e..b7291ca 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">trucades seleccionades</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">missatges seleccionats</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibració</string>
+  <string name="zen_mode_vibration_never">No vibris</string>
+  <string name="zen_mode_vibration_calls_only">Només vibra per a les trucades</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibra per a les trucades i les notificacions</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cap: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Mostra les notificacions d\'aquesta aplicació a la pantalla de bloqueig</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deshabilita les notificacions persistents a la pantalla de bloqueig</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostris mai notificacions persistents d\'aquesta aplicació a la pantalla de bloqueig</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Temps mínim entre els sons de notificació</string>
+  <string name="app_notification_sound_timeout_summary_template">Permet sons o vibració no més d\'una vegada cada <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sense restricció</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 segons</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 segons</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minut</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuts</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuts</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuts</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Control millorat de la ràdio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index 835a695..fb7de2a 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -17,9 +17,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Jste <xliff:g id="step_count">%1$d</xliff:g> krok od dotazu na ID zařízení.</item>
+    <item quantity="few">Jste <xliff:g id="step_count">%1$d </xliff:g> kroky od dotazu na ID zařízení.</item>
+    <item quantity="other">Jste <xliff:g id="step_count">%1$d </xliff:g> kroků od dotazu na ID zařízení.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID zařízení: [<xliff:g id="device_id">%1$s</xliff:g>] zkopírováno do schránky</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Na tomto sestavení není ID zařízení k dispozici</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID zařízení</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Už jste jen <xliff:g id="step_count">%1$d</xliff:g> krok od povolení vývojářských nastavení.</item>
@@ -943,6 +951,11 @@
   <string name="zen_mode_summary_selected_callers">vybrané kontakty</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">vybrané zprávy</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibrace</string>
+  <string name="zen_mode_vibration_never">Nevibrovat</string>
+  <string name="zen_mode_vibration_calls_only">Vibrovat pouze při volání</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrovat při volání a oznámení</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hlava: %1$s W/kg</string>
@@ -1048,6 +1061,16 @@
   <string name="app_notification_show_on_keyguard_summary">Zobrazit upozornění z aplikace na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Zakázat trvalé upozornění na zamykací obrazovce</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikdy nezobrazovat trvalé upozornění na zamykací obrazovce</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimální doba mezi zvuky oznámení</string>
+  <string name="app_notification_sound_timeout_summary_template">Povolit zvuky nebo vibrace ne více než jednou každých <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Bez omezení</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekund</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekund</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuta</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minut</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minut</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minut</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Rozšířené řízení rádia</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-csb-rPL/cm_strings.xml
+++ b/res/values-csb-rPL/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-cy/cm_strings.xml
+++ b/res/values-cy/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 7c15463..1b26199 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -20,6 +20,7 @@
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
   <!--  Device Info screen. Confirmation that Device ID is not available -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Enheds-ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Du er nu <xliff:g id="step_count">%1$d</xliff:g> skridt fra at aktivere Indstillinger for udviklere.</item>
@@ -43,6 +44,7 @@
   <string name="root_access_adb">Kun ADB</string>
   <string name="root_access_all">Apps og ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">Administrer root adgang</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -600,7 +602,11 @@
   <string name="live_display_color_profile_basic_title">Grundlæggende</string>
   <string name="live_display_color_profile_basic_summary">Brug skærmen ukalibreret</string>
   <!-- LiveDisplay : Picture Adjustment -->
+  <string name="picture_adjustment_title">Billedjustering</string>
+  <string name="picture_adjustment_summary">Justerer farvetone, mætning, lysstyrke og kontrast</string>
+  <string name="adj_hue_title">Farvetone</string>
   <string name="adj_saturation_title">Farvemætning</string>
+  <string name="adj_intensity_title">Lysstyrke</string>
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikon for valg</string>
@@ -919,6 +925,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valgte beskeder</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hoved: %1$s W/kg</string>
@@ -1017,6 +1024,7 @@
   <string name="app_notification_show_on_keyguard_summary">Vis meddelelser fra denne app på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende meddelelser på låseskærmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldrig vedvarende meddelelser fra denne app på låseskærmen</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Udvidet radiokontrol</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index fff52ff..2d36dfd 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">ausgewählte Anrufer</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">ausgewählte Nachrichten</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibration</string>
+  <string name="zen_mode_vibration_never">Nicht vibrieren</string>
+  <string name="zen_mode_vibration_calls_only">Nur bei Anrufen vibrieren</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Bei Anrufen und Benachrichtigungen vibrieren</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Kopf: %1$s W/kg</string>
@@ -1055,6 +1060,15 @@
   <string name="app_notification_show_on_keyguard_summary">Benachrichtigungen von dieser App auf dem Sperrbildschirm anzeigen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhafte Benachrichtigungen auf dem Sperrbildschirm deaktivieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Keine dauerhaften Benachrichtigungen dieser App auf dem Sperrbildschirm anzeigen</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_summary_template">Töne und Vibrationen nur alle <xliff:g id="duration">%1$s</xliff:g> zulassen</string>
+  <string name="app_notification_sound_timeout_value_none">Keine Beschränkung</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 Sekunden</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 Sekunden</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 Minute</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 Minuten</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 Minuten</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 Minuten</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Erweiterte Modemfunktionen</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index b7f4b7d..8c7dcc5 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -954,6 +954,7 @@
   <string name="zen_mode_summary_selected_callers">επιλεγμένοι καλούντες</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">επιλεγμένα μηνύματα</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Κεφάλι: %1$s W/kg</string>
@@ -1059,6 +1060,7 @@
   <string name="app_notification_show_on_keyguard_summary">Εμφάνιση ειδοποιήσεων από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Απενεργ. επίμονης ειδοποίησης στην οθόνη κλειδώματος</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Να μην εμφανίζονται ποτέ επίμονες ειδοποιήσεις από αυτήν την εφαρμογή στην οθόνη κλειδώματος</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Προηγμένος έλεγχος modem</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index e2d014e..e761725 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -722,6 +722,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Head: %1$s W/kg</string>
@@ -764,6 +765,7 @@
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml
index 068171d..038d40c 100644
--- a/res/values-en-rGB/cm_strings.xml
+++ b/res/values-en-rGB/cm_strings.xml
@@ -166,6 +166,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -201,6 +202,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index 43e36e2..ac9a941 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -848,6 +848,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Head: %1$s W/kg</string>
@@ -908,6 +909,7 @@
   <string name="app_notification_show_on_keyguard_summary">Show notifications from this app on the lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disable persistent notification on lock screen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Never show persistent notifications from this app on the lock screen</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-en-rPT/cm_strings.xml
+++ b/res/values-en-rPT/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-eo/cm_plurals.xml b/res/values-eo/cm_plurals.xml
deleted file mode 100644
index e99a1b9..0000000
--- a/res/values-eo/cm_plurals.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2013-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">
-  <plurals name="backlight_timeout_time">
-    <item quantity="one"><xliff:g id="seconds">%d</xliff:g> sekundo</item>
-    <item quantity="other"><xliff:g id="seconds">%d</xliff:g> sekundoj</item>
-  </plurals>
-  <plurals name="app_ops_count">
-    <item quantity="one">unufoje</item>
-    <item quantity="other">%d fojoj</item>
-  </plurals>
-</resources>
diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml
index 148d382..1dbcd0e 100644
--- a/res/values-eo/cm_strings.xml
+++ b/res/values-eo/cm_strings.xml
@@ -22,823 +22,211 @@
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
-  <string name="show_dev_on_cm">Vi ŝaltis la programadajn agordojn!</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Okay we get it, stop pressing, you already have it on -->
-  <string name="show_dev_already_cm">Ne utilas, vi jam ŝaltis la programadajn agordojn.</string>
   <!-- Launch Dev Tools -->
-  <string name="development_tools_title">Programadaj iloj</string>
   <!-- Development shortcut -->
-  <string name="development_shortcut_title">Programada simbola ligilo</string>
-  <string name="development_shortcut_summary">Ŝalti simbolajn ligilojn por mastrumi aplikaĵojn en listo de lasttempaj aplikaĵoj</string>
   <!-- Setting checkbox title for root access -->
-  <string name="root_access">Radikuzanta reĝimo</string>
-  <string name="root_access_warning_title">Ĉu permesi radikuzantajn permesojn?</string>
-  <string name="root_access_warning_message">Permesi al la aplikaĵoj peti radikuzantan aliron estas tre danĝere kaj povus kompromiti la sekurecon de via sistemo!</string>
-  <string name="root_access_none">Malŝaltita</string>
-  <string name="root_access_apps">Nur aplikaĵoj</string>
-  <string name="root_access_adb">Nur ADB</string>
-  <string name="root_access_all">Aplikaĵoj kaj ADB</string>
   <!-- Preference link for root appops -->
   <!-- NFC PreferenceCategory title -->
   <!-- About phone screen, CyanogenMod version -->
-  <string name="mod_version">Versio de CyanogenMod</string>
   <string name="mod_version_default">Nekonata</string>
   <!-- About phone screen, Device model -->
-  <string name="device_model">Modelo de la aparato</string>
   <!-- About phone screen, Device name -->
-  <string name="device_name">Nomo de la aparato</string>
   <!-- About phone screen, CyanogenMod Api Level -->
   <string name="mod_api_level_default">Nekonata</string>
   <!-- About phone screen, build date -->
-  <string name="build_date">Dato de la eldono</string>
   <!-- CM Updater -->
-  <string name="cmupdate_settings_title">Ĝisdatigoj de CyanogenMod</string>
   <!-- Settings switch for updating Cyanogen recovery -->
-  <string name="update_recovery_title">Ĝistadigi riparadon de Cyanogen</string>
-  <string name="update_recovery_summary">Ĝistadigi riparadon de Cyanogen kun sistemaj ĝistadigadoj</string>
-  <string name="update_recovery_on_warning">ATENTU: Kiam tiu funkcio estas ŝaltita, via instalata riparado estos anstataŭigita per unu el la aktuala sistemo.\n\nVia riparado estos ĝistatigita samtempe kiel la sistemaj ĝisdatigadoj, kaj tio helpos al kongrueco de la estontaj versioj.\n\nĈu vi volas ŝalti tiun  funkcion?</string>
-  <string name="update_recovery_off_warning">ATENTU: Kiam tiu funkcio estas malŝaltita, via instalata riparado ne estos ĝistatigitaj samtempe kiel la sistemaj ĝisdatigadoj.\n\nEstontaj sistemaj ĝistadigoj eble ne instaliĝos kun malmodernaj aŭ propraj versioj de riparadoj\n\nĈu vi volas malŝalti tiun  funkcion?</string>
   <!-- Themes Settings -->
   <!-- Settings main menu entry -->
   <string name="themes_settings_title">Etosoj</string>
   <!-- Sound settings screen -->
-  <string name="ring_mode_title">Sonora reĝimo</string>
-  <string name="ring_mode_normal">Normale</string>
-  <string name="ring_mode_vibrate">Vibrado</string>
-  <string name="ring_mode_mute">Silentigi</string>
-  <string name="settings_reset_button">Restarigo</string>
   <!-- Profiles settings  -->
-  <string name="profiles_settings_title">Sistemaj profiloj</string>
   <string name="profiles_add">Aldoni</string>
   <string name="profile_menu_delete">Forigi</string>
-  <string name="profile_settings_title">Profilo</string>
-  <string name="profile_empty_list_profiles_off">Por agordi kaj uzi sistemajn profilojn, ŝaltu la profilojn.</string>
-  <string name="profile_trigger_configure">Agordi ekagilon</string>
-  <string name="profile_write_nfc_tag">Skribi en la NFC etikedon</string>
-  <string name="profile_write_touch_tag">Tuŝu etikedon por skribi</string>
-  <string name="profile_write_success">Etikedo estis sukcese skribita</string>
-  <string name="profile_write_failed">La skribado fiaskis!</string>
-  <string name="profile_selected">Elektita profilo: %1$s</string>
-  <string name="profile_nfc_text">Skribi profilon en NFC etikedon permesas tuŝeti la etikedon por elekti la profilon. Tuŝeti duan fojon elektos la antaŭan profilon.</string>
-  <string name="profile_unknown_nfc_tag">Nekonata profilo</string>
-  <string name="profile_add_nfc_text">Tiu NFC etikedo rilatas al nekonata profilo. Alkroĉi tiun NFC etikedona al ekzistanta profilo ebligos elekti la profilon poste.</string>
-  <string name="profile_select">Elekti profilon</string>
-  <string name="profile_remove_dialog_message">Ĉu forigi profilon %1$s?</string>
-  <string name="profile_populate_profile_from_state">Ĉu agordi profilon kun nunaj aparataj agordoj?</string>
-  <string name="profile_menu_fill_from_state">Importi nunajn aparatajn agordojn</string>
-  <string name="profile_remove_current_profile">Ne eblas forigi la nunan profilon!</string>
-  <string name="profile_app_group_category_title">Atentigoj</string>
-  <string name="profile_app_group_item_instructions">Aldoni aŭ forigi grupojn</string>
-  <string name="profile_app_group_item_instructions_summary">Aldoni aŭ forigi atentigojn al la grupo de aplikaĵoj de tiu profilo</string>
   <!-- Profile mode options. -->
-  <string name="profile_entries_on">Aktiva</string>
-  <string name="profile_entries_off">For</string>
-  <string name="profile_entries_no_override">Ne trapasi</string>
   <!-- Add Profile -->
   <string name="profile_name_title">Nomo</string>
-  <string name="new_profile_name">&lt;nova profilo&gt;</string>
   <!-- Rename Dialog  -->
-  <string name="rename_dialog_title">Alinomi</string>
-  <string name="rename_dialog_message">Tajpu novan nomon</string>
-  <string name="duplicate_appgroup_name">Ripetita nomo de grupo de aplikaĵoj!</string>
-  <string name="rename_dialog_hint">Tajpu la nomon de la profilo</string>
   <!-- Reset Profiles -->
-  <string name="profile_reset_title">Restarigo</string>
   <!-- Delete confimation messages -->
-  <string name="profile_app_delete_confirm">Forigi tiun aplikaĵon?</string>
   <!-- Profile network mode -->
-  <string name="profile_networkmode_2g">2G</string>
-  <string name="profile_networkmode_3g">3G</string>
-  <string name="profile_networkmode_4g">LTE</string>
-  <string name="profile_networkmode_2g3g">2G/3G</string>
-  <string name="profile_networkmode_2g3g4g">2G/3G/LTE</string>
   <!-- Profile Config screen PreferenceGroup titles -->
-  <string name="profile_volumeoverrides_title">Ŝanĝi laŭtecon</string>
-  <string name="connection_state_enabled">Ŝalti</string>
-  <string name="volume_override_summary">Agordi al %1$s/%2$s</string>
-  <string name="profile_volume_override_checkbox_label">Ignori laŭtecon</string>
   <!-- Menu item for managing profiles -->
-  <string name="profile_profiles_manage">Profiloj</string>
-  <string name="profile_profile_manage">Mastrumi profilon</string>
-  <string name="profile_appgroups_manage">Grupoj de aplikaĵoj</string>
-  <string name="profile_appgroup_manage">Mastrumi grupon de aplikaĵoj</string>
   <!-- Profile settings screen, section header for settings related to notification profiles -->
-  <string name="profile_settings">Profila agordo</string>
-  <string name="profile_trigger_connect">Konektiĝante</string>
-  <string name="profile_trigger_disconnect">Malkonektiĝante</string>
-  <string name="profile_trigger_notrigger">Neniu ekagilo</string>
   <!-- Profile Settings sound modes labels -->
-  <string name="sound_mode">Atentiga reĝimo</string>
-  <string name="ringer_mode">Sonora reĝimo</string>
-  <string name="lights_mode">Luma reĝimo</string>
-  <string name="vibrate_mode">Vibrada reĝimo</string>
-  <string name="choose_soundtone">Elekti atentegan sonoron</string>
-  <string name="choose_ringtone">Elekti sonoron</string>
   <!-- Sound settings screen, setting option name to pick ringtone (a list dialog comes up)-->
-  <string name="soundtone_title">Atentiga sonoro</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grupoj de aplikaĵoj</string>
-  <string name="profile_applist_title">Aplikaĵoj</string>
-  <string name="profile_new_appgroup">Nova grupo de aplikaĵoj</string>
-  <string name="profile_delete_appgroup">Ĉu forigi tiun grupon de aplikaĵoj?</string>
-  <string name="profile_appgroup_name_prompt">Entajpu nomon pot tiu nova grupo de aplikaĵoj</string>
-  <string name="profile_appgroup_name_title">Propra nomo</string>
+  <string name="profile_appgroup_name_title">Nomo</string>
   <!-- Add application dialog box title -->
-  <string name="profile_choose_app">Elekti aplikaĵon</string>
   <!-- Profiles - system settings -->
-  <string name="profile_system_settings_title">Sistemaj agordoj</string>
-  <string name="profile_lockmode_title">Reĝimo por sloŝa ekrano</string>
-  <string name="profile_lockmode_policy_disabled_summary">Tiu profila opcio estas malŝaltita pro strategio de la administranto de la aparato</string>
-  <string name="profile_lockmode_insecure_summary">Ne peti PIN-kodon nek pasvorton</string>
-  <string name="profile_lockmode_disabled_summary">Malŝalti ŝlosan ekranon</string>
-  <string name="profile_airplanemode_title">Aviadila reĝimo</string>
-  <string name="profile_brightness_title">Ekrana brileco</string>
-  <string name="profile_brightness_override_summary">Agordi al %1$d%%</string>
-  <string name="profile_brightness_override_checkbox_label">Ŝanĝi brilecon</string>
   <!-- Connection override toggles (not all are used at this time ) -->
-  <string name="toggleWifi">Vifio</string>
-  <string name="toggleWifiAp">Vifia retkaptejo</string>
-  <string name="toggleBluetooth">Bludento</string>
-  <string name="toggleGPS">GPS</string>
-  <string name="toggleData">Datuma konektado</string>
-  <string name="toggleSync">Aŭtomataj datumoj</string>
-  <string name="toggle2g3g4g">Plej ŝatata reta tipo</string>
-  <string name="toggleNfc">NFC</string>
   <!-- Wi-Fi region code -->
-  <string name="wifi_setting_countrycode_title">Vifia regiona kodo</string>
   <!-- Wi-Fi settings screen, setting summary for setting the wifi frequency band [CHAR LIMIT=50]-->
-  <string name="wifi_setting_countrycode_summary">Precizigi vifian regionan kodon</string>
   <!-- Wi-Fi settings screen, error message when the frequency band could not be set [CHAR LIMIT=50]. -->
-  <string name="wifi_setting_countrycode_error">Problemo okazis dum ŝaltado de regiona kodo.</string>
-  <string name="wifi_countrycode_us">Usono</string>
   <string name="wifi_countrycode_ca">Kanado, Tajvano</string>
-  <string name="wifi_countrycode_de">Germanio</string>
+  <string name="wifi_countrycode_de">Germanujo</string>
   <string name="wifi_countrycode_gb">Eŭropo</string>
-  <string name="wifi_countrycode_jp">Japanio, Rusio</string>
+  <string name="wifi_countrycode_jp">Japanujo, Rusujo</string>
   <string name="wifi_countrycode_au">Aŭstralio</string>
-  <string name="wifi_countrycode_cn">Ĉinio</string>
+  <string name="wifi_countrycode_cn">Ĉinujo</string>
   <string name="wifi_countrycode_kr">Koreujo</string>
-  <string name="wifi_countrycode_tr">Sudafriko, Turkio</string>
+  <string name="wifi_countrycode_tr">Sud-Afriko, Turkujo</string>
   <string name="wifi_countrycode_sg">Israelo, Singapuro</string>
   <string name="wifi_countrycode_br">Brazilo</string>
   <string name="wifi_countrycode_in">Barato</string>
   <!-- Profiles -->
-  <string name="profile_menu_delete_title">Foriga klavo</string>
-  <string name="profile_action_none">Nuligi la ŝanĝojn</string>
-  <string name="profile_action_disable">Malŝalti</string>
-  <string name="profile_action_enable">Ŝalti</string>
-  <string name="profile_trigger_a2dp_connect">Je A2DP-konektado</string>
-  <string name="profile_trigger_a2dp_disconnect">Je A2DP-malkonektado</string>
-  <string name="profile_tabs_wifi">Vifia</string>
-  <string name="profile_tabs_bluetooth">Bludento</string>
-  <string name="profile_tabs_nfc">NFC</string>
-  <string name="profile_triggers_header">Eventoj kiuj aktivigi tiun profilon</string>
-  <string name="profile_setup_setup_triggers_title">Paŝo 1: Aldoni ekagilon</string>
-  <string name="profile_setup_setup_triggers_title_config">Ŝanĝi ekagilojn: <xliff:g id="profile_name">%1$s</xliff:g></string>
-  <string name="profile_setup_actions_title">Paŝo 2: Agordi agojn</string>
-  <string name="profile_setup_actions_title_config">Denove agordi agojn</string>
-  <string name="profile_appgroups_manage">Grupoj de aplikaĵoj</string>
-  <string name="profile_appgroup_manage">Mastrumi grupon de aplikaĵoj</string>
+  <string name="profile_menu_delete_title">Forigi</string>
   <!-- Title for application group setting screen -->
-  <string name="profile_appgroups_title">Grupoj de aplikaĵoj</string>
-  <string name="profile_new_appgroup">Nova grupo de aplikaĵoj</string>
-  <string name="profile_delete_appgroup">Ĉu forigi tiun grupon de aplikaĵoj?</string>
-  <string name="profile_appgroup_name_prompt">Entajpu nomon pot tiu nova grupo de aplikaĵoj</string>
-  <string name="profile_appgroup_name_title">Propra nomo</string>
-  <string name="duplicate_appgroup_name">Ripetita nomo de grupo de aplikaĵoj!</string>
-  <string name="profile_app_delete_confirm">Forigi tiun aplikaĵon?</string>
-  <string name="no_bluetooth_triggers">Neniu Bludentaj aparatoj parigitaj.\nTuŝetu por parigi Bludentan aparaton antaŭ ol agordi ekagilojn.</string>
-  <string name="no_wifi_triggers">Neniu vifia aliro agordita.\nTuŝetu por konekti vifion antaŭ ol agordi ekagilojn.</string>
-  <string name="no_triggers_configured">Neniu ekagilo agordita. Tuŝetu por adoni pliajn.</string>
-  <string name="no_triggers_configured_nfc">Tuŝetu por agordi novan NFC-ekagilon.</string>
-  <string name="profile_setup_setup_triggers_description">Bonvoli elekti ekagilojn, kiuj aktivigos tiun profilon</string>
-  <string name="profile_setup_actions_description">Agordi nun, kio akazas kiam la profilo estas aktivigita</string>
+  <string name="profile_appgroup_name_title">Nomo</string>
   <!-- Navigation Bar -->
-  <string name="navigation_bar_category">Navigilo</string>
-  <string name="navigation_bar_left_title">Reĝimo por maldekstruloj</string>
-  <string name="navigation_bar_left_summary">Meti la navigilon je la maldesktra flanko de la ekrano dum horizontala aranĝo</string>
-  <string name="navigation_bar_title">Butonoj kaj aspektigo</string>
-  <string name="navigation_bar_help_text">Por komenci, tuŝetu la piktrogramon Redakti por maŝlosi la navigilon por redakti.\n\nVi povas tuŝeti piktogramon por ŝanĝi ties simbolan ligon, aŭ longe premi piktogramon por agordi la aspektigon.\n\nTuŝetu \"Konservi\" por enmeti viajn ŝangôjn, aŭ \"Restaŭri defaŭlton\" por restaŭri la aranĝon al defaŭlta agordo.</string>
-  <string name="navigation_restore_button_text">Restaŭri\ndefaŭltojn</string>
-  <string name="navigation_edit_button_text">Ŝanĝi</string>
+  <string name="navigation_edit_button_text">Redakti</string>
   <string name="navigation_save_button_text">Konservi</string>
-  <string name="navigation_bar_reset_message">Ĉu forigi la nunajn agordojn kaj restaŭri la defaŭltan aspektigon?</string>
-  <string name="navigation_bar_arrow_keys_title">Montri sagetojn dum tajpado</string>
-  <string name="navigation_bar_arrow_keys_summary">Montri maldekstran kaj desktran kursorojn butonojn dum tajpado. Ignoras IME agordon.</string>
-  <string name="navigation_bar_recents_title">Longe premu por lasttempaj</string>
   <!-- Notification light dialogs -->
-  <string name="edit_light_settings">Ŝanĝi luman agordon</string>
-  <string name="pulse_speed_title">Pulsa frekvenco kaj rapideco</string>
-  <string name="default_time">Normale</string>
-  <string name="custom_time">Propra</string>
-  <string name="dialog_delete_title">Foriga klavo</string>
-  <string name="dialog_delete_message">Ĉu forigi elektitan eron?</string>
   <!-- Values for the notification light pulse spinners -->
-  <string name="pulse_length_always_on">Ĉiam aktiva</string>
-  <string name="pulse_length_very_short">Tre mallonga</string>
-  <string name="pulse_length_short">Mallonga</string>
-  <string name="pulse_length_normal">Normale</string>
-  <string name="pulse_length_long">Longe</string>
-  <string name="pulse_length_very_long">Tre longa</string>
-  <string name="pulse_speed_very_fast">Tre rapida</string>
-  <string name="pulse_speed_fast">Rapida</string>
-  <string name="pulse_speed_normal">Normale</string>
-  <string name="pulse_speed_slow">Malrapida</string>
-  <string name="pulse_speed_very_slow">Tre malrapida</string>
   <!-- Battery light settings -->
-  <string name="battery_light_title">Bateria indikilo</string>
-  <string name="battery_low_pulse_title">Pulsi kiam baterio estas preskaŭ malplena</string>
   <string name="battery_light_list_title">Koloroj</string>
-  <string name="battery_light_low_color_title">Preskaŭ malplena baterio</string>
-  <string name="battery_light_medium_color_title">Ŝarĝado</string>
-  <string name="battery_light_full_color_title">Komplete ŝargita</string>
   <!-- Lights settings screen, notification light settings -->
-  <string name="notification_light_title">Atentiga lumo</string>
-  <string name="notification_light_general_title">Ĝeneralo</string>
-  <string name="notification_light_applist_title">Aplikaĵoj</string>
-  <string name="notification_light_phonelist_title">Telefono</string>
-  <string name="notification_light_use_custom">Uzi proprajn valorojn</string>
-  <string name="notification_light_default_value">Defaŭlto</string>
-  <string name="notification_light_missed_call_title">Maltrafitaj mesaĝoj</string>
-  <string name="notification_light_voicemail_title">Voĉa mesaĝo</string>
   <!-- Lights settings, LED notification -->
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
-  <string name="enable_adb_cm">Android sencimigado</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">Ŝaltu la interfacon Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
-  <string name="adb_over_network">reta ADB</string>
-  <string name="adb_over_network_summary">Ŝalti TCP/IP-sencimigadon tra retaj interfacoj (Wi\u2011Fi, USB retoj). Tiu agordo estas restaŭtigita dum lanĉado</string>
   <!-- Warning for Adb over Network -->
-  <string name="adb_over_network_warning">ATENTIGO: Kiam reta ADB estas ŝaltita, via telefono estas malfermata por entrudiĝoj tra ĉiuj konektitaj retoj!\n\nUzu tiun funkcion nur kiam vi estas konektita al fidindaj retoj.\n\nĈu vi ja volas ŝalti tiun funkcion?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
-  <string name="adb_notify">Atentigo pri sencimigado</string>
-  <string name="adb_notify_summary">Montri atentigon kiam USB-a aŭ reta sencimigo estas ŝaltita</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
-  <string name="app_ops_categories_location">Lokigo</string>
-  <string name="app_ops_categories_personal">Persona</string>
-  <string name="app_ops_categories_messaging">Mesaĝilo</string>
-  <string name="app_ops_categories_media">Datumportilo</string>
+  <string name="app_ops_categories_location">Loko</string>
   <string name="app_ops_categories_device">Aparato</string>
-  <string name="app_ops_categories_bootup">Lanĉado</string>
-  <string name="app_ops_categories_su">Radikuzanta reĝimo</string>
   <!-- User display names for app ops codes - extension of AOSP -->
-  <string name="app_ops_summaries_coarse_location">pogranda  lokigo</string>
-  <string name="app_ops_summaries_fine_location">fajna lokigo</string>
-  <string name="app_ops_summaries_gps">GPS</string>
-  <string name="app_ops_summaries_vibrate">vibrado</string>
-  <string name="app_ops_summaries_read_contacts">legi kontaktulojn</string>
-  <string name="app_ops_summaries_modify_contacts">ŝanĝi kontaktulojn</string>
-  <string name="app_ops_summaries_read_call_log">legi alvokan protokolon</string>
-  <string name="app_ops_summaries_modify_call_log">ŝanĝi alvokan protokolon</string>
-  <string name="app_ops_summaries_read_calendar">legi kalendaron</string>
-  <string name="app_ops_summaries_modify_calendar">ŝanĝi kalendaron</string>
-  <string name="app_ops_summaries_cell_scan">reta skanilo</string>
-  <string name="app_ops_summaries_call_phone">telefona alvoko</string>
-  <string name="app_ops_summaries_read_sms">legi SMS</string>
-  <string name="app_ops_summaries_write_sms">redakti SMS</string>
-  <string name="app_ops_summaries_receive_sms">ricevi SMS</string>
-  <string name="app_ops_summaries_receive_emergency_sms">ricevi urĝecajn SMS</string>
-  <string name="app_ops_summaries_receive_mms">ricevi MMS</string>
-  <string name="app_ops_summaries_receive_wap_push">ricevi puŝ-WAP</string>
-  <string name="app_ops_summaries_send_sms">sendi SMS</string>
-  <string name="app_ops_summaries_read_icc_sms">legi ICC SMS</string>
-  <string name="app_ops_summaries_write_icc_sms">redakti ICC SMS</string>
-  <string name="app_ops_summaries_modify_settings">ŝanĝi agordojn</string>
-  <string name="app_ops_summaries_draw_on_top">movi supren</string>
-  <string name="app_ops_summaries_access_notifications">atingi atentigojn</string>
-  <string name="app_ops_summaries_camera">fotilo</string>
-  <string name="app_ops_summaries_record_audio">registri sonon</string>
-  <string name="app_ops_summaries_play_audio">ludi sonon</string>
-  <string name="app_ops_summaries_read_clipboard">legi la tondejon</string>
-  <string name="app_ops_summaries_modify_clipboard">ŝanĝi la tondejon</string>
-  <string name="app_ops_summaries_media_buttons">aŭdvidaj butonoj</string>
-  <string name="app_ops_summaries_audio_focus">aŭdan fokuson</string>
-  <string name="app_ops_summaries_master_volume">mastrumi laŭtecon</string>
-  <string name="app_ops_summaries_voice_volume">voĉa laŭteco</string>
-  <string name="app_ops_summaries_ring_volume">sonora laŭteco</string>
-  <string name="app_ops_summaries_media_volume">aŭdvida laŭteco</string>
-  <string name="app_ops_summaries_alarm_volume">laŭteco de alarmo</string>
-  <string name="app_ops_summaries_notification_volume">atentiga laŭteco</string>
-  <string name="app_ops_summaries_keep_awake">konservi veka</string>
-  <string name="app_ops_summaries_monitor_location">mastrumi lokigon</string>
-  <string name="app_ops_summaries_monitor_high_power_location">mastrumi precizegan lokigon</string>
-  <string name="app_ops_summaries_mute_unmute_microphone">mutigi/malmutigi la mikrofonon</string>
-  <string name="app_ops_summaries_toast_window">afiŝi atentigojn</string>
-  <string name="app_ops_summaries_project_media">projetko medio</string>
-  <string name="app_ops_summaries_activate_vpn">ŝalti VPN</string>
-  <string name="app_ops_summaries_superuser">Radikuzanta reĝimo</string>
   <!-- User display names for app ops codes - extension of AOSP -->
-  <string name="app_ops_labels_gps">GPS</string>
-  <string name="app_ops_labels_vibrate">Vibrado</string>
-  <string name="app_ops_labels_read_contacts">Legi kontaktulojn</string>
-  <string name="app_ops_labels_modify_contacts">Ŝanĝi kontaktulojn</string>
-  <string name="app_ops_labels_read_call_log">Legi alvokan protokolon</string>
-  <string name="app_ops_labels_modify_call_log">Ŝanĝi alvokan protokolon</string>
-  <string name="app_ops_labels_read_calendar">Legi kalendaron</string>
-  <string name="app_ops_labels_modify_calendar">Ŝanĝi kalendaron</string>
-  <string name="app_ops_labels_notification">Atentigo</string>
-  <string name="app_ops_labels_call_phone">Telefona alvoko</string>
-  <string name="app_ops_labels_receive_sms">Ricevi SMS</string>
-  <string name="app_ops_labels_receive_mms">Ricevi MMS</string>
-  <string name="app_ops_labels_send_sms">Sendi SMS</string>
-  <string name="app_ops_labels_modify_settings">Ŝanĝi agordojn</string>
-  <string name="app_ops_labels_draw_on_top">Movi supren</string>
-  <string name="app_ops_labels_access_notifications">Atingi atentigojn</string>
-  <string name="app_ops_labels_camera">Fotilo</string>
-  <string name="app_ops_labels_record_audio">Registri sonon</string>
-  <string name="app_ops_labels_play_audio">Ludi sonon</string>
-  <string name="app_ops_labels_read_clipboard">Legi la tondejon</string>
-  <string name="app_ops_labels_modify_clipboard">Ŝanĝi la tondejon</string>
-  <string name="app_ops_labels_media_buttons">Aŭdvidaj butonoj</string>
-  <string name="app_ops_labels_audio_focus">Aŭda fokuso</string>
-  <string name="app_ops_labels_master_volume">Ĉefa laŭteco</string>
-  <string name="app_ops_labels_voice_volume">Voĉa laŭteco</string>
-  <string name="app_ops_labels_ring_volume">Sonora laŭteco</string>
-  <string name="app_ops_labels_media_volume">Aŭdvida laŭteco</string>
-  <string name="app_ops_labels_alarm_volume">Laŭteco de alarmo</string>
-  <string name="app_ops_labels_notification_volume">Atentiga laŭteco</string>
-  <string name="app_ops_labels_bluetooth_volume">Bludenta laŭteco</string>
-  <string name="app_ops_labels_keep_awake">Konservi veka</string>
-  <string name="app_ops_labels_mute_unmute_microphone">Mutigi/malmutigi la mikrofonon</string>
-  <string name="app_ops_labels_toast_window">Afiŝi atentigojn</string>
-  <string name="app_ops_labels_project_media">Projekto medio</string>
-  <string name="app_ops_labels_activate_vpn">Ŝalti VPN</string>
-  <string name="app_ops_labels_superuser">Radikuzanta reĝimo</string>
   <!-- App ops permissions -->
-  <string name="app_ops_permissions_allowed">Permesita</string>
-  <string name="app_ops_permissions_ignored">Ignorita</string>
-  <string name="app_ops_permissions_always_ask">Ĉiam demandi</string>
   <!-- App ops detail -->
-  <string name="app_ops_entry_summary"><xliff:g id="op">%1$s</xliff:g> (uzata <xliff:g id="count">%2$s</xliff:g>)</string>
-  <string name="app_ops_allowed_count">Permesita <xliff:g id="count" example="2 times">%s</xliff:g></string>
-  <string name="app_ops_ignored_count">Malpermesitaj <xliff:g id="count" example="2 times">%s</xliff:g></string>
-  <string name="app_ops_both_count">Permesitaj <xliff:g id="count">%1$s</xliff:g>, malpermesitaj <xliff:g id="count">%2$s</xliff:g></string>
   <!-- App ops menu options -->
-  <string name="app_ops_show_user_apps">Montri personajn aplikaĵojn</string>
-  <string name="app_ops_show_system_apps">Montri debazajn aplikaĵojn</string>
-  <string name="app_ops_reset_counters">Restarigi nombrilojn de permesitaj/malpermesitaj</string>
-  <string name="app_ops_reset_confirm_title">Konfirmi restartigon de nombriloj</string>
-  <string name="app_ops_reset_confirm_mesg">Ĉu vi certas, ke vi volas restarigi nombrilojn?</string>
-  <string name="ok">Konfirmi</string>
   <!-- Hostname setting -->
-  <string name="device_hostname">Aparata gastiga nomo</string>
-  <string name="unlock_scramble_pin_layout_title">Kaŝmiksita aranĝo</string>
-  <string name="unlock_scramble_pin_layout_summary">Kaŝmiksi la PIN-ŝablonon dum malŝlosado de la aparato</string>
-  <string name="button_pref_title">Butonoj</string>
-  <string name="hardware_keys_power_key_title">Start-butono</string>
-  <string name="hardware_keys_home_key_title">Hejmbutono</string>
-  <string name="hardware_keys_back_key_title">Reen-butono</string>
-  <string name="hardware_keys_menu_key_title">Menubutono</string>
-  <string name="hardware_keys_assist_key_title">Serĉ-butono</string>
-  <string name="hardware_keys_appswitch_key_title">Lasttempe-butono</string>
-  <string name="hardware_keys_volume_keys_title">Butonoj pri laŭteco</string>
-  <string name="hardware_keys_short_press_title">Mallonga premo</string>
-  <string name="hardware_keys_long_press_title">Longa premo</string>
-  <string name="hardware_keys_double_tap_title">Duobla tuŝeto</string>
-  <string name="hardware_keys_action_nothing">Neniu ago</string>
-  <string name="hardware_keys_action_menu">Malfermi/fermi menuon</string>
-  <string name="hardware_keys_action_app_switch">Lasttempaj aplikaĵoj</string>
-  <string name="hardware_keys_action_search">Serĉ-helpilo</string>
-  <string name="hardware_keys_action_voice_search">Voĉa serĉado</string>
-  <string name="hardware_keys_action_in_app_search">Serĉado en la aplikaĵo</string>
-  <string name="hardware_keys_action_launch_camera">Lanĉi la fotilon</string>
-  <string name="hardware_keys_action_sleep">Malŝalti la ekranon</string>
-  <string name="hardware_keys_action_last_app">Antaŭa aplikaĵo</string>
-  <string name="volbtn_music_controls_title">Kontrolo de la muziko</string>
-  <string name="volbtn_music_controls_summary">Kiam la ekrano estas malaktiva, longe premi la butonoj pri laŭteco ŝanĝos la ludatan titolon</string>
-  <string name="volbtn_cursor_control_title">Kontrolado de la kursoro per klaravo</string>
-  <string name="volbtn_cursor_control_off">Malŝaltita</string>
-  <string name="volbtn_cursor_control_on">Laŭtecaj butonoj supren/malsupren movas kursoron maldekstren/dekstren</string>
-  <string name="volbtn_cursor_control_on_reverse">Laŭtecaj butonoj supren/malsupren movas kursoron dekstren/maldekstren</string>
-  <string name="power_end_call_title">Fini alvokon</string>
-  <string name="power_end_call_summary">Premu la start-butonon finos la nunan alvokon</string>
-  <string name="swap_volume_buttons_title">Reorienti</string>
-  <string name="swap_volume_buttons_summary">Inversi laŭtencajn butonojn kiam la ekrano rotacias</string>
-  <string name="button_wake_title">Veki aparaton</string>
-  <string name="home_answer_call_title">Respondi alvokon</string>
-  <string name="home_answer_call_summary">Premi la hejm-butonon respondos la nunan alvenantan alvokon</string>
   <!-- Backlight brightness settings screen -->
-  <string name="adaptive_backlight_title">Adaptiĝa fonlumo</string>
-  <string name="adaptive_backlight_summary">Dinamike ĝustigas la brilecon de la fonlumo por maksimumigi la baterian vivdaŭron kaj konservi bonan legeblecon</string>
   <!-- Sunlight readability enhancement screen -->
-  <string name="sunlight_enhancement_title">Plibonigado sub sunlumo</string>
-  <string name="sunlight_enhancement_summary">Plibonigas la brilecon de la ekrano kaj la legeblecon sub brila sunlumo</string>
   <!-- Color enhancement settings screen -->
-  <string name="color_enhancement_title">Kolora plibonigado</string>
-  <string name="color_enhancement_summary">Dinamike plibonigi le ekranan koloron</string>
   <!-- Key backlight -->
-  <string name="button_backlight_title">Fonlumo</string>
-  <string name="button_backlight_enabled">Lumigi butonojn</string>
-  <string name="keyboard_backlight_enabled">Lumigi klavaron</string>
-  <string name="button_backlight_seekbar_title">Brileco de la butono</string>
-  <string name="keyboard_backlight_seekbar_title">Brileco de la klavaro</string>
-  <string name="backlight_timeout_title">Daŭro de lumado</string>
-  <string name="backlight_timeout_unlimited">Ne malŝalti</string>
-  <string name="backlight_summary_disabled">Malŝaltita</string>
-  <string name="backlight_summary_enabled_with_timeout">Ŝaltita por <xliff:g id="timeout">%s</xliff:g></string>
-  <string name="backlight_summary_enabled">Ŝaltita</string>
   <!-- Gesture Settings -->
   <!-- Settings main menu entry -->
-  <string name="gesture_settings_title">Gestoj</string>
   <!-- Power menu -->
-  <string name="power_menu_title">Start-menuo</string>
-  <string name="power_menu_reboot_title">Relanĉado-menuo</string>
-  <string name="power_menu_screenshot_title">Ekrankopio</string>
-  <string name="power_menu_airplane_title">Aviadila Reĝimo</string>
-  <string name="power_menu_users_title">Ŝanĝi uzanton</string>
-  <string name="power_menu_settings_title">Simbolaj ligiloj por agordoj</string>
-  <string name="power_menu_lockdown_title">Ŝlosado de la aparato</string>
-  <string name="power_menu_bug_report_title">Cimraporto</string>
-  <string name="power_menu_sound_title">Panelo pri sonoj</string>
-  <string name="power_menu_bug_report_disabled">La cimraporto estas malŝaltita en la programadaj parametroj</string>
   <!-- Buttons - Enable navbar -->
-  <string name="disable_navkeys_title">Ŝalti surekranan navigilon</string>
-  <string name="disable_navkeys_summary">Ŝalti surekranan navigilon kaj malŝalti aparatajn butonojn</string>
   <!-- tap-to-wake -->
-  <string name="double_tap_to_wake_title">Duoble-tuŝeti por veki</string>
-  <string name="double_tap_to_wake_summary">Duoble-tuŝetu la ekranon por ŝalti ĝin</string>
   <!-- tap-to-sleep -->
-  <string name="double_tap_to_sleep_title">Duoble-tuŝetu por dormi</string>
-  <string name="double_tap_to_sleep_summary">Duoble-tuŝeti la statan breton por malŝalti la ekranon</string>
   <!-- Proximity wake -->
-  <string name="proximity_wake_title">Malpermesi neatenditan vekiĝon</string>
-  <string name="proximity_wake_summary">Kontroli la proksimecan sensoron por malpermesi neatenditajn vekiĝon de la ekranon</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
-  <string name="wake_when_plugged_or_unplugged_title">Veki dum konektiĝo</string>
-  <string name="wake_when_plugged_or_unplugged_summary">Ŝalti la ekranon dum konektado aŭ malkonektado de energia fonto</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
     multiple font sizes in a limited amount of space. -->
-  <string name="font_size_sample">Ekzemplo</string>
   <!-- Volume settings - Volume adjustment sound -->
-  <string name="volume_adjust_sounds_title">Sonoj je la laŭteca agordo</string>
   <!-- Hardware tunables - Vibrator intensity -->
-  <string name="vibrator_intensity_title">Intenceso de la vibrado</string>
   <!-- Hardware tunables - Color calibration -->
-  <string name="color_calibration_title">Kolora kalibro</string>
-  <string name="color_calibration_summary">Kalibri ekranajn kolorojn</string>
-  <string name="color_red_title">Ruĝo</string>
-  <string name="color_green_title">Verdo</string>
-  <string name="color_blue_title">Bluo</string>
   <!-- Launch music player when headset is connected -->
-  <string name="headset_connect_player_title">Lanĉi la muzik-ludilon</string>
-  <string name="headset_connect_player_summary">Lanĉi la defaŭltan muzik-ludilon, kiam la kapaŭskultilo estas kontektita</string>
   <!-- WiFi auto-configure priorities -->
-  <string name="wifi_auto_config_priorities">Aŭtomata prioritato</string>
-  <string name="auto_brightness_reset_button">Restarigo</string>
   <!-- Display : Rotation  -->
-  <string name="display_rotation_title">Rotacio</string>
-  <string name="display_rotation_disabled">Malŝaltita</string>
-  <string name="display_rotation_unit">gradoj</string>
-  <string name="display_lockscreen_rotation_title">Rotacio de la ŝlosa ekrano</string>
-  <string name="display_rotation_category_title">Reĝimoj de rotacio</string>
-  <string name="display_rotation_0_title">0 grado</string>
-  <string name="display_rotation_90_title">90 gradoj</string>
-  <string name="display_rotation_180_title">180 gradoj</string>
-  <string name="display_rotation_270_title">270 gradoj</string>
   <!-- LiveDisplay -->
-  <string name="live_display_summary">Optimumigi vian ekranon laŭ la horo kaj la ĉirkaŭaĵa etoso por plibonigi la legebecon kaj malhelpi okulan malkomforton</string>
-  <string name="live_display_mode">Vidiga reĝimo</string>
-  <string name="live_display_color_temperature_title">Kolora temperaturo</string>
-  <string name="live_display_color_temperature_summary">Tage: <xliff:g id="day_temperature">%1$d</xliff:g>K  Nokte: <xliff:g id="night_temperature">%2$d</xliff:g>K</string>
-  <string name="live_display_color_temperature_label"><xliff:g id="degrees">%1$d</xliff:g>K</string>
   <string name="live_display_day">Tago</string>
-  <string name="live_display_night">Nokto</string>
-  <string name="live_display_outdoor_mode_title">Aŭtomata ekstera reĝimo</string>
-  <string name="live_display_outdoor_mode_summary">Aŭtomate plialtigi brilecon kaj intensecon sub la brila suno</string>
-  <string name="live_display_low_power_title">Malaltigi la energian uzon</string>
-  <string name="live_display_low_power_summary">Agordas ekranon por la lej malgranda energia uzado sen malplibonigi</string>
-  <string name="live_display_enhance_color_title">Plibonigi kolorojn</string>
-  <string name="live_display_enhance_color_summary">Plibonigi koloran intensecon de karnaj tonoj, pejzaĝoj, kaj aliaj bildoj</string>
   <!-- LiveDisplay : Picture Adjustment -->
-  <string name="adj_saturation_title">Intenseco</string>
-  <string name="adj_contrast_title">Kontrasto</string>
   <!-- Whether to display IME switcher notifcation -->
-  <string name="ime_switcher_notify">Piktogramo de la elektilo</string>
-  <string name="ime_switcher_notify_summary">Montri piktogramon de elektilo de eniga metodo</string>
   <!-- Heads up -->
-  <string name="heads_up_notifications">Flugantaj atentigoj</string>
-  <string name="summary_heads_up_enabled">Ŝpruc-atentigiloj estas ŝaltitaj</string>
-  <string name="summary_heads_up_disabled">Ŝpruc-atentigiloj estas malŝaltitaj</string>
   <!-- Bluetooth settings.  A checkbox to set if we should accept all the file types regardless of their presence in MIME type whitelist -->
-  <string name="bluetooth_accept_all_files">Akcepti ĉiujn tipojn de dosieroj</string>
   <!-- High touch sensitivity -->
-  <string name="high_touch_sensitivity_title">Alta tuŝa sentiveco</string>
-  <string name="high_touch_sensitivity_summary">Plialtigi tuŝan sentivecon de la ekrano, tiel ĝi povos esti uzara se vi havos gantojn</string>
   <!-- Display & Lights screen, setting options for LCD density -->
-  <string name="lcd_density">Denseco de LCD</string>
-  <string name="dialog_title_lcd_density">Denseco de LCD</string>
-  <string name="lcd_density_value_format">%d DPI</string>
-  <string name="lcd_density_default_value_format">%d DPI (defaŭlta)</string>
-  <string name="restarting_ui">Relanĉado\u2026</string>
   <!-- Stylus Icon -->
-  <string name="stylus_icon_enabled_title">Montri piktogramon dum uzado de grifeto</string>
-  <string name="stylus_icon_enabled_summary">Montru la kursoron kiam vi musumas aŭ desegnas per la grifeto</string>
   <!-- Stylus Gestures -->
-  <string name="gestures_settings_title">Grifelaj gestoj</string>
-  <string name="category_spen_title">Grifelaj gestoj</string>
-  <string name="enable_subcat_title">Grifelo</string>
-  <string name="enable_spen_title_head">Ŝalti gestojn</string>
-  <string name="enable_spen_summary_head">Uzi \"swipe\"-gestojn premante la grifetan butonon</string>
-  <string name="gestures_subcat_title">Gestoj</string>
-  <string name="gestures_left_spen_title_head">Movo maldekstren</string>
-  <string name="gestures_right_spen_title_head">Movo maldekstren</string>
-  <string name="gestures_up_spen_title_head">Movo supren</string>
-  <string name="gestures_down_spen_title_head">Movo malsupren</string>
-  <string name="gestures_long_spen_title_head">Longa premo</string>
-  <string name="gestures_double_spen_title_head">Duobla tuŝo</string>
   <!-- Gestures Options -->
-  <string name="gestures_action_empty">Neniu ago</string>
-  <string name="gestures_action_home">Hejmo</string>
-  <string name="gestures_action_back">Malantaŭen</string>
-  <string name="gestures_action_menu">Menuo</string>
-  <string name="gestures_action_search">Lanĉi serĉadon</string>
-  <string name="gestures_action_recent">Lasttempaj aplikaĵoj</string>
   <!-- Stylus gestures -->
-  <string name="stylus_app_not_installed">%s ne estas instalita</string>
   <!-- Touchscreen hovering -->
-  <string name="touchscreen_hovering_title">Surekrana glisado</string>
-  <string name="touchscreen_hovering_summary">Permesas glisi sur la ekrano kiel muso en retumiloj, foraj komputiloj, ktp.</string>
   <!-- Increasing ring tone volume -->
-  <string name="increasing_ring_volume_option_title">Laŭtigi la sonorilon</string>
-  <string name="increasing_ring_min_volume_title">Komenca laŭteco</string>
-  <string name="increasing_ring_ramp_up_time_title">Daŭro de la progresio</string>
   <!-- LTO download data over wi-fi only -->
-  <string name="category_calibration">Kalibrado</string>
-  <string name="display_and_lights">Afiŝado kaj lumoj</string>
   <!-- Category title for Charging sounds (Power state change) specific Settings.
          [CHAR LIMIT=40] -->
-  <string name="power_notifications_category_title">Ŝarĝado de sonoj</string>
   <!-- Sound settings, Charging sounds enable/disable, setting check box label -->
-  <string name="power_notifications_enable_title">Ŝalti</string>
-  <string name="power_notifications_enable_summary">Ludi sonon je konektado aŭ malkonektado de energia fonto</string>
   <!-- Sound settings, Charging sounds vibrate enable/disable, setting check box label -->
-  <string name="power_notifications_vibrate_title">Vibrado</string>
   <!-- Sound settings, Charging sounds ringtone selection, preference label -->
-  <string name="power_notifications_ringtone_title">Atentiga sono</string>
   <!-- Sound settings, charging sounds label for ringtone == none -->
-  <string name="power_notifications_ringtone_silent">Silenta</string>
   <!-- Status bar -->
-  <string name="status_bar_title">Stata breto</string>
-  <string name="status_bar_toggle_brightness">Kontrolado de brileco</string>
-  <string name="status_bar_toggle_brightness_summary">Agordi brilecon glitante tra la stata breto</string>
-  <string name="status_bar_notif_count_title">Montri atentigan nombron</string>
-  <string name="status_bar_notif_count_summary">Montri nombron de atendantaj atentigoj</string>
-  <string name="status_bar_quick_qs_pulldown_title">Rapidmenuo</string>
-  <string name="status_bar_quick_qs_pulldown_summary">%1$s parto de la stata breto malferman la panelon de rapidaj agordoj</string>
-  <string name="status_bar_quick_qs_pulldown_summary_left">Maldekstren</string>
-  <string name="status_bar_quick_qs_pulldown_summary_right">Dekstren</string>
-  <string name="status_bar_quick_qs_pulldown_off">For</string>
-  <string name="status_bar_quick_qs_pulldown_left">Maldekstren</string>
-  <string name="status_bar_quick_qs_pulldown_right">Dekstren</string>
   <!-- Status bar - Clock -->
-  <string name="status_bar_clock_style_title">Stilo de horloĝo</string>
-  <string name="status_bar_clock_style_right">Dekstren</string>
-  <string name="status_bar_clock_style_left">Maldekstren</string>
-  <string name="status_bar_clock_style_center">Centrigi</string>
-  <string name="status_bar_clock_style_hidden">Kaŝita</string>
-  <string name="status_bar_am_pm_title">Stilo AM/PM</string>
-  <string name="status_bar_am_pm_info">24-hora horloĝo ŝaltita</string>
-  <string name="status_bar_am_pm_normal">Normale</string>
-  <string name="status_bar_am_pm_small">Malgranda</string>
-  <string name="status_bar_am_pm_hidden">Kaŝita</string>
   <!-- Status bar - Battery -->
-  <string name="status_bar_battery_style_title">Stilo de bateria stato</string>
-  <string name="status_bar_battery_style_icon_portrait">Piktogramo Vertikale</string>
-  <string name="status_bar_battery_style_icon_landscape">Piktogramo Horizontale</string>
-  <string name="status_bar_battery_style_circle">Cirklo</string>
-  <string name="status_bar_battery_style_text">Teksto</string>
-  <string name="status_bar_battery_style_hidden">Kaŝita</string>
   <!-- Status bar - Battery percentage -->
-  <string name="status_bar_battery_percentage_title">Bateria procento</string>
-  <string name="status_bar_battery_percentage_default">Kaŝita</string>
-  <string name="status_bar_battery_percentage_text_inside">En la piktogramo</string>
-  <string name="status_bar_battery_percentage_text_next">Apud la piktogramo</string>
   <!-- Status bar - icon blacklist -->
   <!-- EdgeGesture service -->
-  <string name="edge_gesture_service_title">Bloki gestajn eventojn</string>
-  <string name="edge_gesture_service_summary">Ne sendi tuŝajn eventojn por navigilo kaj stata breto al aplikaĵoj</string>
   <!-- Keep screen on strings -->
+  <string name="keep_screen_on_never">Neniam</string>
   <!-- Privacy Settings Header item -->
-  <string name="privacy_settings_cyanogenmod_title">Privateco</string>
   <!-- Privacy Guard -->
-  <string name="privacy_guard_default_title">Defaŭlte ŝaltita</string>
-  <string name="privacy_guard_default_summary">Defaŭlte ŝaltita por laste instalitaj aplikaĵoj</string>
-  <string name="privacy_guard_manager_title">Protektado de datumoj</string>
-  <string name="privacy_guard_manager_summary">Mastrumi kiuj aplikaĵoj havas aliron al viaj personaj datumoj</string>
-  <string name="privacy_guard_no_user_apps">Neniu aplikaĵo estas instalita</string>
-  <string name="privacy_guard_help_title">Helpo</string>
-  <string name="privacy_guard_reset_title">Restarigo</string>
-  <string name="privacy_guard_reset_text">Ĉu restarigi rajtojn?</string>
-  <string name="privacy_guard_help_text">En tiu ekrano vi povas elekti por kiuj aplikaĵoj la protektado de datumoj estu ŝaltita, simple tuŝante ilin. La elektitaj aplikaĵoj ne povos aliri al viaj personaj datumoj, kiel kontaktuloj, mesaĝoj aŭ alvenantaj alvokoj. Longe premi aplikaĵan eron malfermas ĝia detalan ekranon.\n\nEnkonstruitaj aplikaĵoj ne estas defaŭlte montritaj sed povas esti videblaj kiam vi elektas la rilatan menuan opcion.</string>
-  <string name="privacy_guard_manager_show_system_apps">Montri debazajn aplikaĵojn</string>
-  <string name="privacy_guard_advanced_settings_title">Altnivelaj opcioj</string>
   <!-- Sizes for pattern lockscreen -->
   <!-- Whether a visible red line will be drawn after the user has drawn the unlock pattern incorrectly -->
-  <string name="lockpattern_settings_enable_error_path_title">Montri ŝablonan eraron</string>
   <!-- Whether the dots will be drawn when using the lockscreen pattern -->
-  <string name="lockpattern_settings_enable_dots_title">Montri ŝablonajn punktojn</string>
   <!-- Whether the keyguard will directly pass to password entry -->
   <!-- Whether the keyguard will directly pass to pattern view -->
   <!-- Whether the keyguard will directly pass to PIN entry -->
   <!-- lock screen visualizer -->
-  <string name="lockscreen_visualizer_title">Montri muzika vidilon</string>
   <!-- lock screen disabled by QS tile warning -->
   <!-- Battery saver -->
-  <string name="battery_saver_threshold">Limo de bateria ŝparado</string>
-  <string name="battery_saver_summary">Malaltigi rendimenton kaj limigi uzadon de datumoj</string>
-  <string name="battery_saver_summary_unavailable">Ne disponeblas dum ŝarĝado</string>
   <!-- Battery : Automatic performance profiles -->
-  <string name="autoperf_title">Ŝalti profilojn por aplilaĵoj</string>
-  <string name="autoperf_summary">Aŭtomate elekti taŭgan baterian reĝimon por diversaj aplikaĵoj</string>
-  <string name="perf_profile_title">Bateria reĝimo</string>
   <!-- Memory -->
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
-  <string name="notification_ringtone_title_cm">Atentiga sono</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">Altnivela restartigo</string>
-  <string name="advanced_reboot_summary">Kiam ŝaltita, inkluzivi opciojn en la start-menuon por restartigo al riparado, praŝargilo aŭ varma relanĉado</string>
-  <string name="category_interface">Interfaco</string>
   <!-- Expanded desktop -->
-  <string name="power_menu_expanded_desktop">Etendita labortablo</string>
-  <string name="expanded_hide_nothing">Kaŝi nenion</string>
-  <string name="expanded_hide_status">Kaŝi statan breton</string>
-  <string name="expanded_hide_navigation">Kaŝi navigilon</string>
-  <string name="expanded_hide_both">Kaŝi ambaŭ</string>
-  <string name="expanded_nothing_to_show">Por aldoni propran agordon por aplikaĵo por la etendita labortablo, malŝaltu \"Ŝaltitaj por ĉiuj\"</string>
-  <string name="expanded_enabled_for_all">Ŝaltata por ĉiuj</string>
-  <string name="expanded_desktop_style">Etendita labortabla stilo</string>
-  <string name="expanded_desktop_style_description">Elekti defaŭltan etenditan labortablan stilon</string>
-  <string name="expanded_desktop_title">Etenditaj labortablaj opcioj</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">Mortigi per la reen butono</string>
-  <string name="kill_app_longpress_back_summary">Mortigi la malfonan aplikaĵon premante lontempe la reen-butonon</string>
   <!-- Show/Hide Search Bar -->
-  <string name="recents_show_searchbar">Montri serĉ-breton en menuo de lasttempaj</string>
-  <string name="keywords_recents_show_searchbar">lasttempa lasttempaj malŝalti ŝalti montri kaŝi serĉi breto serĉbreto</string>
   <!-- Voice Wakeup -->
-  <string name="voice_wakeup_settings_title">Vocâ vekiĝo</string>
-  <string name="voice_wakeup_retrain_title">Trejni vian voĉon</string>
-  <string name="voice_wakeup_activity_title">Lanĉota aktiveco</string>
-  <string name="voice_wakeup_default_activity">Google Now</string>
-  <string name="picker_activities">Aktivecoj</string>
-  <string name="select_custom_app_title">Elekti personan aplikaĵon</string>
-  <string name="select_custom_activity_title">Elekti personan aktivecon</string>
   <!-- Blacklist preferences -->
-  <string name="blacklist_title">Listo de blokitaj alvokantoj</string>
-  <string name="blacklist_edit_dialog_title">Ŝanĝi la blokitan telefonnumeron</string>
   <string name="blacklist_prefs">Agordoj</string>
   <string name="blacklist_button_delete">Forigi</string>
-  <string name="blacklist_empty_text">Vi havas neniun blokitan numeron. Aldonu eron tuŝante la butonon Aldoni (+).</string>
-  <string name="blacklist_disabled_empty_text">Por malpermesi telefonnumerojn alvoki vin aŭ sendi mesaĝon al vi, ŝaltu la liston de blokitaj alvokantoj.</string>
-  <string name="blacklist_summary_disabled">Malŝaltita</string>
-  <string name="blacklist_summary">Vi ne ricevos alvenantajn alvokojn aŭ mesaôgjn de telefonnumeroj en la listo de blokitaj alvokantoj</string>
-  <string name="blacklist_notify">Montri atentigon</string>
-  <string name="blacklist_private_numbers_title">Privataj numeroj</string>
-  <string name="blacklist_private_numbers_summary_disabled">Ne bloki alvokojn de privataj numeroj</string>
-  <string name="blacklist_private_numbers_summary">Bloki alvenantajn <xliff:g id="type">%s</xliff:g> de privataj numeroj</string>
-  <string name="blacklist_unknown_numbers_title">Nekonataj numeroj</string>
-  <string name="blacklist_unknown_numbers_summary_disabled">Ne bloki alvokojn aŭ mesaĝojn de numeroj kiuj ne estas en la listo de kontaktuloj</string>
-  <string name="blacklist_unknown_numbers_summary">Bloki alvenantajn <xliff:g id="type">%s</xliff:g> de numeroj, kiuj ne estas en la listo de kontaktuloj</string>
-  <string name="blacklist_summary_type_calls_only">alvokoj</string>
-  <string name="blacklist_summary_type_messages_only">mesaĝoj</string>
-  <string name="blacklist_summary_type_calls_and_messages">alvokoj kaj mesaĝoj</string>
-  <string name="blacklist_regex_title">Uzi ĵokerojn</string>
-  <string name="blacklist_regex_summary">Uzi . kiel ĵokeron kaj * por ripeti. Ekz. 123.* blokas numerojn komencantajn per 123 kaj .*123.* blokas numerojn havantajn 123</string>
-  <string name="blacklist_policy_block_calls">Bloki alvenantajn alvokojn</string>
-  <string name="blacklist_policy_block_messages">Bloki alvenantajn mesaĝojn</string>
-  <string name="blacklist_bad_number_add">Ne eblas aldoni nevalidan telefonnumeron al la listo de blokitaj alvokantoj</string>
   <!-- Blacklist management -->
-  <string name="remove_blacklist_number_title">Forigi numeron</string>
-  <string name="remove_blacklist_entry">Ĉu vi volas forigi tiun blokitan telefonnumeron?</string>
-  <string name="select_contact">Elekti kontaktulon</string>
   <!-- Sms security limit -->
-  <string name="app_security_title">Sekureco de aplikaĵoj</string>
-  <string name="sms_security_check_limit_title">Limo de SMS mesaĝo</string>
-  <string name="sms_security_check_limit_summary">La aplikaĵoj povas sendi %d mesagôjn en 1 minuto antaŭ ol peti konfirmon</string>
-  <string name="sms_security_check_limit_summary_none">La aplikaĵoj ne rajtas sendi mesaĝojn sen konfirmo</string>
-  <string name="sms_security_check_limit_none">Nenio</string>
   <!-- Notification spamfilter -->
-  <string name="spam_added_title">%1$s aldonita</string>
-  <string name="spam_last_blocked_title">Lasttempe blokita %1$s</string>
-  <string name="block_notifications_title">Filtri atentigojn</string>
-  <string name="block_notifications_summary">Mastrumi ignoritajn atentigojn kaj filtrilojn</string>
-  <string name="no_filters_title">Neniu filtrilo ŝaltita</string>
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
-  <string name="anonymous_statistics_title">Statistikoj pri CyanogenMod</string>
-  <string name="anonymous_statistics_summary">Ebligas plibonigi CyanogenMod, sendante anonimajn statisktikojn pri cimraportoj
-,</string>
   <string name="anonymous_statistics_warning_title">Pri</string>
-  <string name="anonymous_statistics_warning">Ŝalti la sendadon de statistikoj ebligos la programistojn de CyanogenMod kolekti anonimajn informojn por kalkuli nombron de unikaj instaltadoj per aparato. La senditaj datumoj enhavas unikan identigilon, kiu ne malhelpas al la privateco de viaj datumoj. Datumoj estas pritraktitaj dum ĉiu lanĉado.\n\nPor vidi ekzemplon, elektu \"Antaŭvidi datumojn\".</string>
-  <string name="enable_reporting_title">Ŝalti raportojn</string>
-  <string name="preview_data_title">Antaŭvidi datumojn</string>
-  <string name="view_stats_title">Vidi statistikojn</string>
-  <string name="anonymous_learn_more">Scii pli</string>
   <!-- Anonymous Statistics - Preview -->
-  <string name="preview_id_title">Unika identigilo</string>
   <string name="preview_device_title">Aparato</string>
-  <string name="preview_version_title">Versio</string>
-  <string name="preview_country_title">Lando</string>
-  <string name="preview_carrier_title">Provizanto</string>
-  <string name="stats_collection_title">Rikolto de statistikoj</string>
-  <string name="stats_collection_summary">Kiam ŝaltita, ebligas kolekti statistikojn</string>
   <!-- Protected apps lockpattern reset button -->
-  <string name="lockpattern_reset_button">Restarigi ŝablonon</string>
-  <string name="lockpattern_settings_reset_summary">Tajpu retadreson de la ĉefa konto kaj ties pasvorton por restarigi la ŝlosilan ŝablonon</string>
   <!-- Protected Apps -->
-  <string name="menu_hidden_apps_delete">Restarigo</string>
-  <string name="menu_hidden_apps_reset_lock">Restarigi ŝlosan ŝablonon</string>
-  <string name="protected_apps">Protektitaj aplikaĵoj</string>
-  <string name="saving_protected_components">Registrado  de la komponanta stato\u2026</string>
-  <string name="pa_login_username_hint">Uzantnomo (retmesaĝo)</string>
   <string name="pa_login_password_hint">Pasvorto</string>
-  <string name="pa_login_submit_button">Aliĝi</string>
-  <string name="pa_login_checking_password">Kontrolado de konto\u2026</string>
-  <string name="pa_login_incorrect_login">La uzantnomo ne ĝustas</string>
   <!-- Contributors cloud activity -->
-  <string name="category_sounds">Sonoroj</string>
-  <string name="notification_manager">Atentigoj</string>
-  <string name="lockscreen_settings">Ŝlosa ekrano</string>
-  <string name="category_lights">Lumoj</string>
-  <string name="category_volume">Volumo</string>
-  <string name="category_vibrate">Vibrado</string>
-  <string name="category_misc">Diversaĵoj</string>
-  <string name="title_general">Ĝeneralo</string>
-  <string name="advanced">Altnivelaj opcioj</string>
-  <string name="link_volume_option_title">Ligi sonoron &amp; atentigan laŭtecon</string>
   <!-- Edit access point labels: PPP number -->
   <!-- APNs screen message indicating new APN user is adding is a duplicate -->
-  <string name="sim_disabled">malŝaltita</string>
-  <string name="sim_missing">mankanta aŭ difektita</string>
-  <string name="sim_enabler_airplane_on">Ne eblas fari tiun operacion kiam la aviadila reĝimo estas aktiva.</string>
-  <string name="sim_enabler_in_call">Ne eblas fari tiun operacion dum alvoko.</string>
-  <string name="sim_enabler_both_inactive">Ne eblas malŝalti ĉiujn SIM-kartojn</string>
-  <string name="primary_sub_select_title">Defaŭlta 3G/LFT abono</string>
   <!-- MSIM SIM status -->
-  <string name="sim_card_status_title">Statuso de SIM %d</string>
-  <string name="sim_card_lock_settings_title">Agordoj por ŝlosado de SIM %d</string>
-  <string name="sim_card_summary_empty">SIM ne enmetita</string>
-  <string name="sim_mobile_network_settings_title">Agordo de SIM %d</string>
   <!-- Zen mode allowed event setting summary items -->
   <!-- [CHAR LIMIT=50] Like zen_mode_reminders, but part of a list, so lower case if needed-->
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
-  <string name="maximum_head_level">Kapo: %1$s W/kg</string>
-  <string name="maximum_body_level">Korpo: %1$s W/kg</string>
   <!-- IC Codes -->
-  <string name="ic_code_model">Modelo: %1$s</string>
-  <string name="ic_code_full">IC: %1$s</string>
-  <string name="sim_ringtone_title">Sonoro de SIM %d</string>
   <!-- label for application name -->
   <!-- label for last time used -->
   <!-- label for usage time -->
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="tablet">Tio forigos ĉiujn datumojn de la <b>interna memorilo</b> de via tabulo, inkluzive:\n\n<li>Viaj aparataj kontoj</li>\n<li>Sistema kaj aplikaĵaj datumoj kaj agordoj</li>\n<li>elŝutitaj aplikaĵoj</li></string>
   <!-- SD card & phone storage settings screen, message on screen after user selects Factory data reset [CHAR LIMIT=NONE] -->
-  <string name="master_clear_desc_cm" product="default">Tio forigos ĉiujn datumojn de la <b>interna memorilo</b> de via telefono, inkluzive:\n\n<li>Viaj aparataj kontoj</li>\n<li>Sistema kaj aplikaĵaj datumoj kaj agordoj</li>\n<li>elŝutitaj aplikaĵoj</li></string>
   <!-- Factory reset strings -->
-  <string name="factory_reset_instructions_title">Personaj datumoj &amp; aplikaĵoj</string>
-  <string name="factory_reset_instructions_summary">Tio forviŝos viajn kontojn, aplikaĵojn, aplikaĵajn datumojn kaj sistemajn agordon en tiu aparato</string>
-  <string name="factory_reset_personal_content">Persona enhavo</string>
-  <string name="factory_reset_erase_stored_content">Forviŝi registritan enhavon</string>
-  <string name="factory_reset_erase_stored_content_summary">Forigi muzikon, fotojn, kaj aliajn personajn datumojn konservitajn en tiu aparato</string>
-  <string name="factory_reset_erase_stored_content_summary_forced">Forigi muzikon, fotojn, kaj aliajn personajn datumojn konservitajn en tiu aparato.\n\n<b>Tiu enhavo ne povas estis konservita pro la ĉifrado de la aparato.</b></string>
-  <string name="factory_reset_erase_sd_card">Strukturi SD-karton</string>
-  <string name="factory_reset_erase_sd_card_summary">Forviŝi ĉiujn datumojn en la SD-karto, inkluzive muzikon kaj fotojn</string>
-  <string name="factory_reset_warning_text_reset_now">RESTARIGI NUN</string>
-  <string name="factory_reset_warning_text_message">Ĉiuj viaj kontoj, aplikaĵoj, aplikaĵaj datumoj kaj sistemaj agordoj estos forigitaj de la aparato. Tio ago ne povos esti nuligita.</string>
   <!-- Tethering & portable hotspot other category -->
   <!-- Wi-Fi tethering inactivity timeout -->
+  <string name="hotstpot_inactivity_timeout_never">Neniam</string>
+  <string name="hotstpot_inactivity_timeout_1_minute">1 minuto</string>
+  <string name="hotstpot_inactivity_timeout_5_minutes">5 minutoj</string>
+  <string name="hotstpot_inactivity_timeout_10_minutes">10 minutoj</string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <!-- Live lock screen summary -->
   <!-- Live lock screen settings content description -->
   <string name="live_lock_screen_settings_button">Agordoj</string>
   <!-- Live lock screen settings screen, caption for when live lock screens are disabled -->
-  <string name="interruptions_ignore_while_media_title">Malpermesi mallaŭtigadon</string>
-  <string name="interruptions_ignore_while_media_summary">Ne mallaŭtigi aŭdvidan sonon, kiam atentigo alvenas</string>
   <!-- CM Legal -->
-  <string name="cmlicense_title">Laŭleĝa informo pri CyanogenMod</string>
   <!-- Menu label for reset the battery stats -->
   <!-- Reset stats confirmation dialog's message -->
   <!-- Dock battery not present message -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging on Dock AC. -->
   <!-- [CHAR_LIMIT=20] Battery use screen. Battery status shown in chart label when charging over Dock USB. -->
   <!-- Weather -->
-  <string name="weather_settings_general_settings_title">Ĝeneralo</string>
   <!-- Label for settings shortcut: carrier selection -->
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
-  <string name="lockscreen_weather_enabled_title">Montri veteron</string>
   <!-- Per app controls for LP keyguard notifications -->
-  <string name="app_notification_show_on_keyguard_title">Montri sur la ŝlosa ekrano</string>
-  <string name="app_notification_show_on_keyguard_summary">Montri atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
-  <string name="app_notification_no_ongoing_on_keyguard_title">Malŝalti daŭran atentigon sur ŝlosa ekrano</string>
-  <string name="app_notification_no_ongoing_on_keyguard_summary">Neniam montri daŭrajn atentigojn de tiu aplikaĵo sur la ŝlosa ekrano</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-es-rCO/cm_strings.xml b/res/values-es-rCO/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-es-rCO/cm_strings.xml
+++ b/res/values-es-rCO/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml
index c71494c..f874b7c 100644
--- a/res/values-es-rMX/cm_strings.xml
+++ b/res/values-es-rMX/cm_strings.xml
@@ -263,6 +263,7 @@
   <string name="zen_mode_summary_selected_callers">llamadores seleccionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -303,6 +304,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index 7928a55..f841104 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -934,6 +934,7 @@
   <string name="zen_mode_summary_selected_callers">llamadores seleccionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -1038,6 +1039,7 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla bloqueada</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla bloqueada</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla bloqueada</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 97f2718..c2132b7 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -936,6 +936,7 @@
   <string name="zen_mode_summary_selected_callers">personas que llaman</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensajes seleccionados</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeza: %1$s W/kg</string>
@@ -1041,6 +1042,7 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificaciones de esta aplicación en la pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar notificaciones persistentes en la pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">No mostrar nunca notificaciones persistentes de esta aplicación en la pantalla de bloqueo</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Control avanzado de la radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 9462628..87aa2b9 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -832,6 +832,7 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Pea: %1$s W/kg</string>
@@ -892,6 +893,7 @@ mis ei ohusta sinu privaatsust ega isiklikku infot. Teave saadetakse peale igat
   <string name="app_notification_show_on_keyguard_summary">Kuva selle rakenduse teavitusi lukustusekraanil</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Keela püsivad teavitused lukustusekraanil</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ära kunagi näita püsivaid teavitusi sellelt rakenduselt lukustuskuval</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index 8ba8b25..bcd5885 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -875,14 +875,14 @@
   <string name="stats_collection_summary">Gaitzean, datuak biltzea baimentzen du</string>
   <!-- Protected apps lockpattern reset button -->
   <string name="lockpattern_reset_button">Leheneratu eredua</string>
-  <string name="lockpattern_settings_reset_summary">Idatzi eposta kontu nagusia eta bere pasahitza eredu blokeoa kentzeko</string>
+  <string name="lockpattern_settings_reset_summary">Idatzi e-posta kontu nagusia eta bere pasahitza eredu blokeoa kentzeko</string>
   <!-- Protected Apps -->
   <string name="menu_hidden_apps_delete">Leheneratu</string>
   <string name="menu_hidden_apps_reset_lock">Berrezarri eredu blokeoa</string>
   <string name="protected_apps">Babesturiko aplikazioak</string>
   <string name="protected_apps_summary">Kudeatu blokeo ziurrarekin ezkutatuko diren aplikazioak</string>
   <string name="saving_protected_components">Osagaiaren egoera gordetzen\u2026</string>
-  <string name="pa_login_username_hint">Erabiltzaile izena (eposta)</string>
+  <string name="pa_login_username_hint">Erabiltzaile izena (e-posta)</string>
   <string name="pa_login_password_hint">Pasahitza</string>
   <string name="pa_login_submit_button">Hasi saioa</string>
   <string name="pa_login_checking_password">Kontua berresten\u2026</string>
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">hautatutako deitzaileak</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">hautatutako mezuak</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Bibrazioa</string>
+  <string name="zen_mode_vibration_never">Ez bibratu</string>
+  <string name="zen_mode_vibration_calls_only">Bibratu deiekin besterik ez</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Bibratu deiekin eta jakinarazpenekin</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Burua:%1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Bistaratu aplikazio honen jakinarazpenak blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Ezgaitu jakinarazpen iraunkorra blokeo-pantailan</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ez bistaratu inoiz aplikazio honen jakinarazpen iraunkorrak blokeo-pantailan</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Gutxieneko denbora jakinarazpen soinuen artean</string>
+  <string name="app_notification_sound_timeout_summary_template">Ez baimendu soinua edo bibrazioa aurrekotik denbora bat pasatu arte: <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Mugarik gabe</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 segundo</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 segundo</string>
+  <string name="app_notification_sound_timeout_value_1_minute">minutu bat</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutu</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutu</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutu</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Irrati kontrol hobetua</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 2600822..2704b74 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -832,6 +832,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">سر: %1$s W/kg</string>
@@ -892,6 +893,7 @@
   <string name="app_notification_show_on_keyguard_summary">نمایش اعلان‌های این برنامه در قفل صفحه</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">غیرفعال کردن اعلان‌های پایدار در قفل صفحه</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">اعلان‌های پایدار این برنامه هرگز در قفل صفحه نشان داده نشود</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 9111f83..4fd2511 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">valitut soittajat</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valitut viestit</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Värinä</string>
+  <string name="zen_mode_vibration_never">Värinä pois</string>
+  <string name="zen_mode_vibration_calls_only">Värinä vain puheluista</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Värinä puheluille ja ilmoituksille</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Pää: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Näytä tämän sovelluksen ilmoitukset lukitusnäytöllä</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Älä näytä pysyviä ilmoituksia lukitusnäytöllä</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Älä koskaan näytä pysyviä ilmoituksia tästä sovelluksesta lukitusnäytöllä</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Vähimmäisväli ilmoitusäänissä</string>
+  <string name="app_notification_sound_timeout_summary_template">Sallii äänen tai värinän vain seuraavin välein: <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Ei rajoitusta</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekuntia</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekuntia</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuutti</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuuttia</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuuttia</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuuttia</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Parannettu radion ohjaus</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-fil-rPH/cm_strings.xml
+++ b/res/values-fil-rPH/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-fr-rCA/cm_strings.xml
+++ b/res/values-fr-rCA/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index c354662..ad65cc1 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -935,6 +935,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="zen_mode_summary_selected_callers">appelants sélectionnés</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">messages sélectionnés</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Tête : %1$s W/kg</string>
@@ -1039,6 +1040,7 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="app_notification_show_on_keyguard_summary">Afficher les notifications de cette application sur l\'écran de verrouillage</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Désactiver les notifications persistantes sur l\'écran de verrouillage</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ne jamais afficher les notifications persistantes de cette application sur l\'écran de verrouillage</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-frp-rIT/cm_strings.xml
+++ b/res/values-frp-rIT/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml
index b4a0841..6ae8ac9 100644
--- a/res/values-fy-rNL/cm_strings.xml
+++ b/res/values-fy-rNL/cm_strings.xml
@@ -167,6 +167,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -195,6 +196,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ga-rIE/cm_strings.xml
+++ b/res/values-ga-rIE/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-gd-rGB/cm_strings.xml
+++ b/res/values-gd-rGB/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 88c9731..11af251 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">remitentes seleccionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensaxes seleccionadas</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibración</string>
+  <string name="zen_mode_vibration_never">Non vibrar</string>
+  <string name="zen_mode_vibration_calls_only">Vibrar só nas chamadas</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrar nas chamadas e notificacións</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Testa: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Amosar notificacións desta aplicación na pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desactivar as notificacións persistentes na pantalla de bloqueo</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca amosar notificacións persistentes deste aplicación na pantalla de bloqueo</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Tempo mínimo entre os sons das notificacións</string>
+  <string name="app_notification_sound_timeout_summary_template">Permitir os sons ou vibración non máis dunha vez cada <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sen restrición</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 segundos</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutos</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Control mellorado da radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index 0d6b193..e38bec9 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -931,6 +931,7 @@
   <string name="zen_mode_summary_selected_callers">પસંદગીના કૉલરો</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">પસંદગીના સંદેશા</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">હેડ: %1$s W/kg</string>
@@ -1005,6 +1006,7 @@
   <string name="app_notification_show_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી સૂચનાઓ દર્શાવો</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">લૉક સ્ક્રીન પર નિરંતર સૂચનાઓ અક્ષમ કરો</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">લૉક સ્ક્રીન પર આ ઍપમાંથી નિરંતર સૂચનાઓ ક્યારેય દર્શાવવા નહીં</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 70a8c54..66b71c4 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -797,6 +797,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">शीर्ष: %1$s W/kg</string>
@@ -856,6 +857,7 @@
   <string name="app_notification_show_on_keyguard_summary">इस ऐप की अधिसूचनाओं को लॉक स्क्रीन पर दिखाएँ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीन पर बने रहने वाली अधिसूचनाओं को अक्षम करें</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">इस ऐप की अधिसूचनाओं को कभी भी लॉक स्क्रीन पर नहीं दिखाएँ</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index d84ae3d..06c1cb8 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -952,6 +952,11 @@
   <string name="zen_mode_summary_selected_callers">odabrani pozivatelji</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">odabrane poruke</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibracija</string>
+  <string name="zen_mode_vibration_never">Ne vibriraj</string>
+  <string name="zen_mode_vibration_calls_only">Vibracija samo za pozive</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibracija za pozive i obavijesti</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Glava: %1$s W/kg</string>
@@ -1057,6 +1062,16 @@
   <string name="app_notification_show_on_keyguard_summary">Prikaži obavijesti iz ove aplikacije na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onemogući trajne obavijesti na zaključanom zaslonu</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikad ne prikazuj trajne obavijesti ove aplikacije na zaključanom zaslonu</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimalno vrijeme između zvukova obavijesti</string>
+  <string name="app_notification_sound_timeout_summary_template">Dopusti zvukove ili vibraciju ne više od jednom svakih <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Bez ograničenja</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekundi</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekundi</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuta</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuta</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuta</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuta</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Poboljšana radio kontrola</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 8384fca..47e01ea 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -950,6 +950,7 @@
   <string name="zen_mode_summary_selected_callers">kiválasztott hívók</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">kiválasztott üzenetek</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Fej: %1$s W/kg</string>
@@ -1055,6 +1056,7 @@
   <string name="app_notification_show_on_keyguard_summary">Ezen alkalmazáshoz tartozó értesítések megjelenítése a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Állandó értesítés tiltása a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Fejlett rádiós vezérlés</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-hy-rAM/cm_strings.xml
+++ b/res/values-hy-rAM/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index a6e2c8e..f7d6f85 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="other"><xliff:g id="step_count">%1$d</xliff:g> langkah dari meminta ID Perangkat.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">Perangkat ID: [<xliff:g id="device_id">%1$s </xliff:g>] disalin ke papan klip</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">ID perangkat ini tidak tersedia pada build ini</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">ID perangkat</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other"><xliff:g id="step_count">%1$d</xliff:g> langkah lagi untuk mengaktifkan opsi pengembang.</item>
@@ -194,7 +200,7 @@
   <!-- Profiles -->
   <string name="profile_menu_delete_title">Hapus</string>
   <string name="profile_action_none">Tinggalkan tanpa perubahan</string>
-  <string name="profile_action_system">Sistem baku</string>
+  <string name="profile_action_system">Sistem standar</string>
   <string name="profile_action_disable">Matikan</string>
   <string name="profile_action_enable">Hidupkan</string>
   <string name="profile_trigger_a2dp_connect">Pada saat A2DP terhubung</string>
@@ -229,10 +235,10 @@
   <string name="navigation_bar_left_summary">Tempatkan bilah navigasi di sebelah kiri layar dalam modus lanskap</string>
   <string name="navigation_bar_title">Tombol dan tata letak</string>
   <string name="navigation_bar_help_text">Untuk memulai ketuk ikon ubah untuk membuka bilah navigasi untuk diubah.\n\nAnda dapat mengetuk sebuah ikon untuk mengubah pintasan, atau tekan lama sebuah ikon untuk menata kembali tata letaknya.\n\nKetuk \'Simpan\' untuk melakukan perubahan, atau \'Kembalikan ke semula\' untuk mengatur tata letak ke pengaturan baku.</string>
-  <string name="navigation_restore_button_text">Kembalikan\nke pengaturan baku</string>
+  <string name="navigation_restore_button_text">Kembalikan\nke standar</string>
   <string name="navigation_edit_button_text">Edit</string>
   <string name="navigation_save_button_text">Simpan</string>
-  <string name="navigation_bar_reset_message">Hapus pengaturan saat ini dan kembalikan tata letak baku?</string>
+  <string name="navigation_bar_reset_message">Hapus pengaturan saat ini dan kembalikan tata letak bawaan?</string>
   <string name="navigation_bar_arrow_keys_title">Tampilkan tombol panah saat mengetik</string>
   <string name="navigation_bar_arrow_keys_summary">Tampilkan tombol kursor kiri dan kanan saat mengetik. Menggantikan pengubah IME.</string>
   <string name="navigation_bar_recents_title">Tindakan untuk menekan lama terbaru</string>
@@ -268,7 +274,7 @@
   <string name="notification_light_applist_title">Aplikasi</string>
   <string name="notification_light_phonelist_title">Telepon</string>
   <string name="notification_light_use_custom">Gunakan nilai khusus</string>
-  <string name="notification_light_default_value">Baku</string>
+  <string name="notification_light_default_value">Standar</string>
   <string name="notification_light_missed_call_title">Panggilan yang tidak terjawab</string>
   <string name="notification_light_voicemail_title">Pesan suara</string>
   <string name="notification_light_screen_on">Lampu dengan layar yang menyala</string>
@@ -299,7 +305,7 @@
   <string name="app_ops_categories_media">Media</string>
   <string name="app_ops_categories_device">Perangkat</string>
   <string name="app_ops_categories_bootup">Lakukan but</string>
-  <string name="app_ops_categories_su">Akses punca (root)</string>
+  <string name="app_ops_categories_su">Akses root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_summaries_coarse_location">lokasi yang kasar</string>
   <string name="app_ops_summaries_fine_location">lokasi yang baik</string>
@@ -369,7 +375,7 @@
   <string name="app_ops_summaries_start_at_boot">mulai saat boot</string>
   <string name="app_ops_summaries_toggle_nfc">hidup/matikan NFC</string>
   <string name="app_ops_summaries_toggle_mobile_data">hidup/matikan data selular</string>
-  <string name="app_ops_summaries_superuser">akses punca (root)</string>
+  <string name="app_ops_summaries_superuser">akses root</string>
   <!-- User display names for app ops codes - extension of AOSP -->
   <string name="app_ops_labels_coarse_location">Lokasi gersang</string>
   <string name="app_ops_labels_fine_location">Lokasi yang baik</string>
@@ -564,7 +570,7 @@
   <string name="color_blue_title">Biru</string>
   <!-- Launch music player when headset is connected -->
   <string name="headset_connect_player_title">Buka aplikasi musik</string>
-  <string name="headset_connect_player_summary">Jalankan aplikasi musik baku saat set kepala tersambung</string>
+  <string name="headset_connect_player_summary">Jalankan aplikasi musik bawaan saat headset tersambung</string>
   <!-- WiFi auto-configure priorities -->
   <string name="wifi_auto_config_priorities">Prioritas otomatis</string>
   <string name="auto_brightness_reset_button">Set ulang</string>
@@ -632,7 +638,7 @@
   <string name="lcd_density">Kerapatan LCD</string>
   <string name="dialog_title_lcd_density">Kerapatan LCD</string>
   <string name="lcd_density_value_format">%d DPI</string>
-  <string name="lcd_density_default_value_format">%d DPI (baku)</string>
+  <string name="lcd_density_default_value_format">%d DPI (standar)</string>
   <string name="restarting_ui">Memulai kembali UI\u2026</string>
   <!-- Stylus Icon -->
   <string name="stylus_icon_enabled_title">Tampilkan ikon saat menggunakan stilus</string>
@@ -790,7 +796,7 @@
   <string name="expanded_nothing_to_show">Untuk menambahkan konfigurasi khusus pada setiap aplikasi untuk kondisi diperluas, atur \"Diaktifkan untuk semua\" ke posisi tidak aktif</string>
   <string name="expanded_enabled_for_all">Diaktifkan untuk semua</string>
   <string name="expanded_desktop_style">Gaya destop yang diperluas</string>
-  <string name="expanded_desktop_style_description">Pilih gaya baku destop yang diperluas</string>
+  <string name="expanded_desktop_style_description">Pilih gaya standar perluasan desktop</string>
   <string name="expanded_desktop_title">Pilihan destop yang diperluas</string>
   <!-- Kill app long-press back -->
   <string name="kill_app_longpress_back">Matikan aplikasi dengan tombol kembali</string>
@@ -881,7 +887,7 @@
   <string name="pa_login_incorrect_login">Login tidak benar</string>
   <string name="pa_pattern_or_fingerprint_header">Harus menggambar pola atau menggunakan sidik jari untuk membuka</string>
   <!-- Contributors cloud activity -->
-  <string name="contributors_cloud_fragment_title">Penyumbang</string>
+  <string name="contributors_cloud_fragment_title">Kontributor</string>
   <string name="contributors_cloud_loading_message">Memuat data kontributor\u2026</string>
   <string name="contributors_cloud_failed_message">Tidak dapat memuat data kontributor</string>
   <string name="contributor_info_menu">Info kontributor</string>
@@ -925,7 +931,7 @@
   <string name="sub_activate_failed">Aktivasi gagal.</string>
   <string name="sub_deactivate_success">SIM dinonaktifkan.</string>
   <string name="sub_deactivate_failed">Penonaktifan gagal.</string>
-  <string name="primary_sub_select_title">Langganan 3G/LTE baku</string>
+  <string name="primary_sub_select_title">Standar 3G/LTE berlangganan</string>
   <string name="select_sim_card">Pilih kartu SIM</string>
   <!-- MSIM SIM status -->
   <string name="sim_card_status_title">Status %d SIM</string>
@@ -942,6 +948,11 @@
   <string name="zen_mode_summary_selected_callers">penelepon terpilih</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">pesan terpilih</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Getaran</string>
+  <string name="zen_mode_vibration_never">Jangan bergetar</string>
+  <string name="zen_mode_vibration_calls_only">Hanya bergetar untuk panggilan</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Bergetar untuk panggilan dan pemberitahuan</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Kepala: %1$s W/kg</string>
@@ -1011,7 +1022,7 @@
   <string name="privacy_guard_internet_category">Internet</string>
   <!-- Weather -->
   <string name="weather_settings_title">Cuaca</string>
-  <string name="weather_settings_no_services_prompt">Layanan penyedia cuaca belum diinstal</string>
+  <string name="weather_settings_no_services_prompt">Tidak ada layanan penyedia cuaca terpasang</string>
   <string name="weather_settings_button">Pengaturan penyedia</string>
   <string name="weather_settings_activity_not_found">Tidak dapat membuka menu pengaturan untuk penyedia ini</string>
   <string name="weather_settings_add_weather_provider">Tambahkan penyedia cuaca</string>
@@ -1047,6 +1058,16 @@
   <string name="app_notification_show_on_keyguard_summary">Tampilkan pemberitahuan dari aplikasi ini pada layar kunci</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Tiadakan pemberitahuan tetap pada layar kunci</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Tidak pernah menampilkan pemberitahuan tetap dari aplikasi ini pada layar kunci</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Waktu minimum antara suara pemberitahuan</string>
+  <string name="app_notification_sound_timeout_summary_template">Memungkinkan suara atau getaran tidak lebih dari sekali setiap <xliff:g id="duration">%1$s </xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Tidak ada pembatasan</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 detik</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 detik</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 menit</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 menit</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 menit</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 menit</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Tingkatkan kontrol radio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-is-rIS/cm_strings.xml
+++ b/res/values-is-rIS/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index a4c9f10..7f787d4 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -952,6 +952,11 @@
   <string name="zen_mode_summary_selected_callers">chiamanti selezionati</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">contatti selezionati</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibrazione</string>
+  <string name="zen_mode_vibration_never">Non vibrare</string>
+  <string name="zen_mode_vibration_calls_only">Vibra solo per chiamate</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibra per chiamate e notifiche</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Testa: %1$s W/kg</string>
@@ -1057,6 +1062,16 @@
   <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nella schermata di blocco</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nella schermata di blocco</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Tempo minimo tra suoni di notifica</string>
+  <string name="app_notification_sound_timeout_summary_template">Consenti suoni o vibrazioni non più di una volta ogni <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Nessuna restrizione</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 secondi</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 secondi</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuti</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuti</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuti</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Controlli radio avanzati</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index e18f152..bed3476 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -54,6 +54,8 @@
   <string name="root_access_adb">ADB בלבד</string>
   <string name="root_access_all">יישומים ו-ADB</string>
   <!-- Preference link for root appops -->
+  <string name="root_appops_title">ניהול גישות שורש</string>
+  <string name="root_appops_summary">הצג ושלוט בחוקי גישת השורש</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">NFC</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -618,10 +620,13 @@
   <string name="live_display_color_profile_basic_title">בסיסי</string>
   <string name="live_display_color_profile_basic_summary">השתמש בתצוגה ללא כיול</string>
   <string name="live_display_color_profile_adaptive_title">מסתגל</string>
+  <string name="live_display_color_profile_adaptive_summary">הצבעים מסתגלים לתנאי הסביבה</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="picture_adjustment_title">התאמת תמונה</string>
+  <string name="picture_adjustment_summary">התאם גוון, רוויה, עוצמה וניגודיות</string>
   <string name="adj_hue_title">גוון</string>
   <string name="adj_saturation_title">רוויה</string>
+  <string name="adj_intensity_title">עוצמה</string>
   <string name="adj_contrast_title">ניגודיות</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">סמל בורר</string>
@@ -949,6 +954,11 @@
   <string name="zen_mode_summary_selected_callers">מתקשרים נבחרים</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">הודעות נבחרות</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">רטט</string>
+  <string name="zen_mode_vibration_never">אל תרטוט</string>
+  <string name="zen_mode_vibration_calls_only">רטט רק עבור שיחות</string>
+  <string name="zen_mode_vibration_calls_and_notifications">רטט עבור שיחות והתראות</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">ראש: %1$s  W/kg</string>
@@ -1054,6 +1064,16 @@
   <string name="app_notification_show_on_keyguard_summary">הצג הודעות מיישום זה במסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">השבתת התראות תמידיות על מסך הנעילה</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">אל תציג התראות תמידיות מיישום זה על מסך הנעילה</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">זמן מינימלי בין צלילי התראות</string>
+  <string name="app_notification_sound_timeout_summary_template">אפשר צלילים או רטט לא יותר מפעם אחת בכל <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">ללא מגבלה</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 שניות</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 שניות</string>
+  <string name="app_notification_sound_timeout_value_1_minute">דקה 1</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 דקות</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 דקות</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 דקות</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">שליטת רדיו משופרת</string>
   <!-- Radio Control (IMS/MBN etc.) -->
@@ -1061,6 +1081,7 @@
   <string name="cm_radio_info_mbn_auto_load_off_label">הפעלת טעינת MBN אוטומטית</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">טפט</string>
+  <string name="not_available_with_app">לא זמין עם %1$s</string>
   <!-- Format string for fingerprint location message -->
   <string name="security_settings_fingerprint_enroll_find_sensor_message_cm">אתר את חיישן טביעות האצבע הנמצא ב<xliff:g id="sensor_location">%1$s</xliff:g> המכשיר שלך.</string>
   <!-- Fingerprint sensor locations -->
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index ae1fcdb..bef24d6 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -17,9 +17,15 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="other">端末IDを問い合わせるまであと<xliff:g id="step_count">%1$d</xliff:g>ステップです。</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">端末ID:[<xliff:g id="device_id">%1$s</xliff:g>]をクリップボードにコピーしました</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">端末IDはこのビルドでは利用できません</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">端末ID</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="other">開発者向けオプションが有効になるまであと<xliff:g id="step_count">%1$d</xliff:g>ステップです。</item>
@@ -32,7 +38,7 @@
   <string name="development_tools_title">開発ツール</string>
   <!-- Development shortcut -->
   <string name="development_shortcut_title">開発用ショートカット</string>
-  <string name="development_shortcut_summary">最近使ったアプリ一覧でアプリの管理のショートカットを有効にする</string>
+  <string name="development_shortcut_summary">アプリ履歴でアプリの管理のショートカットを有効にする</string>
   <!-- Setting checkbox title for root access -->
   <string name="root_access">ルートアクセス</string>
   <string name="root_access_warning_title">ルートアクセスを許可しますか？</string>
@@ -235,7 +241,7 @@
   <string name="navigation_bar_reset_message">現在の設定を削除してデフォルトのレイアウトに戻しますか？</string>
   <string name="navigation_bar_arrow_keys_title">入力中は矢印キーを表示</string>
   <string name="navigation_bar_arrow_keys_summary">入力中は左右の矢印ボタンを表示します。IMEの切り替えアイコンは無効になります。</string>
-  <string name="navigation_bar_recents_title">最近使ったアプリボタンの長押しの動作</string>
+  <string name="navigation_bar_recents_title">履歴ボタンの長押しの動作</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">ライトの設定を編集</string>
   <string name="pulse_speed_title">点滅時間と点滅速度</string>
@@ -467,7 +473,7 @@
   <string name="hardware_keys_back_key_title">戻るボタン</string>
   <string name="hardware_keys_menu_key_title">メニューボタン</string>
   <string name="hardware_keys_assist_key_title">検索ボタン</string>
-  <string name="hardware_keys_appswitch_key_title">最近使ったアプリボタン</string>
+  <string name="hardware_keys_appswitch_key_title">履歴ボタン</string>
   <string name="hardware_keys_camera_key_title">カメラボタン</string>
   <string name="hardware_keys_volume_keys_title">音量ボタン</string>
   <string name="hardware_keys_short_press_title">短く押したときの動作</string>
@@ -475,7 +481,7 @@
   <string name="hardware_keys_double_tap_title">ダブルタップの動作</string>
   <string name="hardware_keys_action_nothing">なし</string>
   <string name="hardware_keys_action_menu">メニューを開く/閉じる</string>
-  <string name="hardware_keys_action_app_switch">最近使ったアプリ一覧</string>
+  <string name="hardware_keys_action_app_switch">アプリ履歴</string>
   <string name="hardware_keys_action_search">検索アシスタント</string>
   <string name="hardware_keys_action_voice_search">音声検索</string>
   <string name="hardware_keys_action_in_app_search">アプリ内検索</string>
@@ -656,7 +662,7 @@
   <string name="gestures_action_back">戻る</string>
   <string name="gestures_action_menu">メニュー</string>
   <string name="gestures_action_search">検索を呼び出す</string>
-  <string name="gestures_action_recent">最近使ったアプリ</string>
+  <string name="gestures_action_recent">アプリ履歴</string>
   <!-- Stylus gestures -->
   <string name="stylus_app_not_installed">%sはインストールされていません</string>
   <!-- Touchscreen hovering -->
@@ -796,8 +802,8 @@
   <string name="kill_app_longpress_back">戻るボタンでアプリを終了</string>
   <string name="kill_app_longpress_back_summary">戻るボタンの長押しでフォアグラウンドアプリを終了する</string>
   <!-- Show/Hide Search Bar -->
-  <string name="recents_show_searchbar">最近使ったアプリメニューに検索バーを表示</string>
-  <string name="keywords_recents_show_searchbar">最近使ったアプリ 有効化 無効化 表示 非表示 検索バー</string>
+  <string name="recents_show_searchbar">アプリ履歴メニューに検索バーを表示</string>
+  <string name="keywords_recents_show_searchbar">アプリ履歴 有効化 無効化 表示 非表示 検索バー</string>
   <!-- Voice Wakeup -->
   <string name="voice_wakeup_settings_title">音声起動</string>
   <string name="voice_wakeup_retrain_title">声を再登録</string>
@@ -821,8 +827,8 @@
   <string name="blacklist_private_numbers_summary_disabled">非通知番号からの着信を拒否しない</string>
   <string name="blacklist_private_numbers_summary">非通知番号からの<xliff:g id="type">%s</xliff:g>を拒否する</string>
   <string name="blacklist_unknown_numbers_title">不明な番号</string>
-  <string name="blacklist_unknown_numbers_summary_disabled">連絡帳に登録されていない番号からの着信やメッセージを拒否しない</string>
-  <string name="blacklist_unknown_numbers_summary">連絡帳に登録されていない番号からの<xliff:g id="type">%s</xliff:g>を拒否する</string>
+  <string name="blacklist_unknown_numbers_summary_disabled">連絡先に登録されていない番号からの着信やメッセージを拒否しない</string>
+  <string name="blacklist_unknown_numbers_summary">連絡先に登録されていない番号からの<xliff:g id="type">%s</xliff:g>を拒否する</string>
   <string name="blacklist_summary_type_calls_only">着信</string>
   <string name="blacklist_summary_type_messages_only">メッセージ</string>
   <string name="blacklist_summary_type_calls_and_messages">着信とメッセージ</string>
@@ -942,6 +948,11 @@
   <string name="zen_mode_summary_selected_callers">選択した発信者</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">選択したメッセージ</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">バイブレーション</string>
+  <string name="zen_mode_vibration_never">振動しない</string>
+  <string name="zen_mode_vibration_calls_only">着信のみ振動する</string>
+  <string name="zen_mode_vibration_calls_and_notifications">着信と通知で振動する</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">頭部: %1$s W/kg</string>
@@ -1047,6 +1058,16 @@
   <string name="app_notification_show_on_keyguard_summary">このアプリからの通知をロック画面に表示する</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">常駐する通知をロック画面で無効化</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">このアプリからの常駐する通知をロック画面に表示しない</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">通知音の最小間隔</string>
+  <string name="app_notification_sound_timeout_summary_template"><xliff:g id="duration">%1$s</xliff:g>間に1回以上の通知音またはバイブレーションを許可しない</string>
+  <string name="app_notification_sound_timeout_value_none">無制限</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10秒</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30秒</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1分</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5分</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10分</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30分</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">拡張無線通信コントロール</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ka-rGE/cm_strings.xml
+++ b/res/values-ka-rGE/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-kk-rKZ/cm_strings.xml
+++ b/res/values-kk-rKZ/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-km-rKH/cm_strings.xml
+++ b/res/values-km-rKH/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 3bc96d6b..54c33f1 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -932,6 +932,7 @@
   <string name="zen_mode_summary_selected_callers">ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">ಆಯ್ಕೆ ಮಾಡಿದ ಸಂದೇಶಗಳು</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Head: %1$s W/kg</string>
@@ -1005,6 +1006,7 @@
   <string name="app_notification_show_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಈ ಆಪ್‍ನಿಂದ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ನಿರಂತರ ಅಧಿಸೂಚನೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ಲಾಕ್ ಪರದೆಯಲ್ಲಿ ಎಂದಿಗೂ ಈ ಆಪ್‍ನಿಂದ ನಿರಂತರ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪ್ರದರ್ಶಿಸಬೇಡ</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 1328b83..2e5909a 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -931,6 +931,7 @@
   <string name="zen_mode_summary_selected_callers">선택한 호출자</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">선택한 메세지</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">머리: %1$s W/kg</string>
@@ -1028,6 +1029,7 @@
   <string name="app_notification_show_on_keyguard_summary">잠금화면에 알림을 표시</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">상주 알림을 잠금화면에 표시하지 않음</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">이 앱의 상주 알림을 잠금화면에 표시하지 않음</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 0c9877e..5563cdf 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -725,6 +725,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">سەر: %1$s W/kg</string>
@@ -766,6 +767,7 @@
   <string name="app_notification_show_on_keyguard_summary">پیشاندانی تێبینی لەم بەرنامەیە لەسەر قوفڵی شاشە</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">لەکارخستنی بەردەوام تێبینی لەسەر قوفڵی سەرشاشە</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">هەرگیز بەبەردەوامی تێبینی پیشان مەدە لەسەر ئەم بەرنامەیە لەسەر قوفڵی سەر شاشە</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ky-rKG/cm_strings.xml
+++ b/res/values-ky-rKG/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f1bfcb7..f1a690d 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -874,6 +874,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Kapp: %1$s W/kg</string>
@@ -934,6 +935,7 @@
   <string name="app_notification_show_on_keyguard_summary">Notifikatioune vun dëser App op dem Spärschierm uweisen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhaft Notifikatiounen op de Spärschierm desaktivéieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ni dauerhaft Notifikatiounen op de Spärschierm uweisen</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-lo-rLA/cm_strings.xml
+++ b/res/values-lo-rLA/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 26aafcc..4d9d03c 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -831,6 +831,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Galva: %1$s W/kg</string>
@@ -891,6 +892,7 @@
   <string name="app_notification_show_on_keyguard_summary">Rodyti pranešimus iš šios programos ekrano užrakte</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Neleisti nuolatinių pranešimų ekrano užrakte</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Niekada nerodyti nuolatinių pranešimų iš šios programos ekrano užrakte</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index 93ebfc8..afe0271 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -513,6 +513,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Galva: %1$s W/kg</string>
@@ -545,6 +546,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-mk-rMK/cm_strings.xml
+++ b/res/values-mk-rMK/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index da7bc7d..74aa63b 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">തിരഞ്ഞെടുത്ത കോളർമാർ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">തിരഞ്ഞെടുത്ത സന്ദേശങ്ങൾ</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">ഹെഡ്: %1$s W/kg</string>
@@ -1004,6 +1005,7 @@
   <string name="app_notification_show_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് അറിയിപ്പുകൾ ദൃശ്യമാക്കുക</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ലോക്ക് സ്ക്രീനിൽ തുടര്‍ച്ചയായുള്ള അറിയിപ്പ് അപ്രാപ്തമാക്കുക</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ലോക്ക് സ്ക്രീനിൽ ഈ ആപ്ലിക്കേഷനിൽ നിന്ന് തുടരെയുള്ള അറിയിപ്പുകള്‍ ദൃശ്യമാക്കരുത്</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-mn-rMN/cm_strings.xml
+++ b/res/values-mn-rMN/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index fe86ace..abbc6d7 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">निवडलेले कॉलर्स</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">निवडलेले संदेश</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">हेड: %1$s W/किग्रॅ</string>
@@ -1003,6 +1004,7 @@
   <string name="app_notification_show_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सूचना लॉक स्क्रीनवर दर्शवा</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">लॉक स्क्रीनवर सातत्यपूर्ण सूचना अक्षम करा</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">या अनुप्रयोगाकडूनच्या सातत्यपूर्ण सूचना लॉक स्क्रीनवर कधीही दाखवू नका</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ms-rMY/cm_strings.xml
+++ b/res/values-ms-rMY/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-my-rMM/cm_strings.xml
+++ b/res/values-my-rMM/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index 6c2f61a..c040cb4 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">valgte oppringere</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valgte meldinger</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibrasjon</string>
+  <string name="zen_mode_vibration_never">Ikke vibrer</string>
+  <string name="zen_mode_vibration_calls_only">Vibrer bare ved innkommende anrop</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrer når innkommende anrop eller varsler</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hode: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Vis varsler fra denne appen på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Deaktivere vedvarende varsler på låseskjermen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Vis aldri vedvarende meldinger fra denne appen på låseskjermen</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimum tid imellom varsellyder</string>
+  <string name="app_notification_sound_timeout_summary_template">Gi lyder og vibrasjoner bare lov å ringe hvert <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Ingen begrensning</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekunder</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekunder</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minutt</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutter</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutter</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutter</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Forbedret radio kontroll</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ne-rNP/cm_strings.xml
+++ b/res/values-ne-rNP/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index e41c901..39c78ae 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">geselecteerde bellers</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">geselecteerde berichten</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Trillen</string>
+  <string name="zen_mode_vibration_never">Niet trillen</string>
+  <string name="zen_mode_vibration_calls_only">Alleen trillen bij oproepen</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Trillen bij oproepen en meldingen</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hoofd: %1$s W/kg</string>
@@ -1035,8 +1040,8 @@
   <string name="allow_background_none">Geen toegang</string>
   <string name="mobile_data_alert">Waarschuwing mobiele gegevens</string>
   <string name="mobile_data_alert_summary">Waarschuwen als de app een grote hoeveelheid gegevens gebruikt</string>
-  <string name="data_usage_menu_enable_data_alerts">Waarschuwingen voor gegevensgebruik inschakelen</string>
-  <string name="data_usage_menu_disable_data_alerts">Waarschuwingen voor gegevensgebruik uitschakelen</string>
+  <string name="data_usage_menu_enable_data_alerts">Waarschuwingen over gegevensgebruik inschakelen</string>
+  <string name="data_usage_menu_disable_data_alerts">Waarschuwingen over gegevensgebruik uitschakelen</string>
   <string name="data_usage_menu_reset_stats">Gegevensstatistieken opnieuw instellen</string>
   <string name="reset_data_stats_msg">Dit zal alle oude en huidige gegevensgeschiedenis verwijderen</string>
   <string name="reset_stats_confirm">Bevestigen</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Meldingen van deze app weergeven op het vergrendelingsscherm</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Permanente meldingen op vergrendelingsscherm uitschakelen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Permanente meldingen van deze app niet weergeven op het vergrendelingsscherm</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimale tijd tussen meldingsgeluiden</string>
+  <string name="app_notification_sound_timeout_summary_template">Geluid of trillen niet meer dan één keer per <xliff:g id="duration">%1$s</xliff:g> toestaan</string>
+  <string name="app_notification_sound_timeout_value_none">Geen beperking</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 seconden</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 seconden</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuut</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minuten</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minuten</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minuten</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Geavanceerde modeminstellingen</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-oc-rFR/cm_strings.xml
+++ b/res/values-oc-rFR/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index e1844bd..8215e5f 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">ଚୟନ କରାଯାଥିବା କଲର୍‍ଗୁଡିକ</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">ଚୟନ କରାଯାଥିବା ସଂଦେଶଗୁଡିକ</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">ହେଡ: %1$s W/kg</string>
@@ -1003,6 +1004,7 @@
   <string name="app_notification_show_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ନିର୍ଦେଶାବଳି ଦେଖା୍ନ୍ତୁ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି ଅ‍କ୍ଷମ କରନ୍ତୁ</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ଲ୍କ୍‍ ସ୍କ୍ରିନ୍‍ରେ ଏହି ଆପ୍ଲିକେସନ୍‍ରୁ ‍ସ୍ଥାୟୀ ନିର୍ଦ୍ଦେଶାବଳି କଦାପି ଦେଖାନ୍ତୁ ନାହିଁ</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-pa-rIN/cm_strings.xml
+++ b/res/values-pa-rIN/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index d7c8de2..7f88a3f 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -17,9 +17,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Jesteś <xliff:g id="step_count">%1$d</xliff:g> krok od zapytania o ID urządzenia.</item>
+    <item quantity="few">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroki od zapytania o ID urządzenia.</item>
+    <item quantity="other">Jesteś <xliff:g id="step_count">%1$d</xliff:g> kroków od zapytania o ID urządzenia.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ID urządzenia: [<xliff:g id="device_id">%1$s</xliff:g>] skopiowane do schowka</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Identyfikator urządzenia jest niedostępny w tej kompilacji</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Identyfikator urządzenia</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <!-- [CHAR LIMIT=NONE] Device Info screen. Confirmation that developer settings are enabled -->
   <string name="show_dev_on_cm">Aktywowałeś opcje programistyczne!</string>
@@ -935,6 +943,7 @@
   <string name="zen_mode_summary_selected_callers">wybrani rozmówcy</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">wybrane wiadomości</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Głowa: %1$s W/kg</string>
@@ -1034,11 +1043,19 @@
   <!-- title for lock screen blur preference -->
   <string name="lockscreen_blur_enabled_title">Rozmycie tła</string>
   <!-- title for lock screen weather preference -->
+  <string name="lockscreen_weather_enabled_title">Pokaż pogodę</string>
   <!-- Per app controls for LP keyguard notifications -->
   <string name="app_notification_show_on_keyguard_title">Pokaż na ekranie blokady</string>
   <string name="app_notification_show_on_keyguard_summary">Pokaż powiadomienia z tej aplikacji na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Wyłącz trwałe powiadomienia na ekranie blokady</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nigdy nie pokazuj trwałych powiadomień z tej aplikacji na ekranie blokady</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_value_10_seconds">10 sekund</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 sekund</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 min</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 min</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 min</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minut</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Rozszerzona kontrola radiowa</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 57a26e4..9c69303 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">números selecionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensagens selecionadas</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibração</string>
+  <string name="zen_mode_vibration_never">Não vibrar</string>
+  <string name="zen_mode_vibration_calls_only">Somente vibrar para chamadas</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrar para chamadas e notificações</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeça: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações deste aplicativo na tela de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar notificação persistente na tela de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar notificações persistentes deste aplicativo na tela de bloqueio</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Tempo mínimo entre sons de notificação</string>
+  <string name="app_notification_sound_timeout_summary_template">Permitir sons ou vibrações apenas uma vez a cada <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sem restrição</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 segundos</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutos</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Controle avançado do rádio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index c16f788..de79942 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -950,6 +950,11 @@
   <string name="zen_mode_summary_selected_callers">números selecionados</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mensagens selecionadas</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibração</string>
+  <string name="zen_mode_vibration_never">Não vibrar</string>
+  <string name="zen_mode_vibration_calls_only">Vibrar apenas para chamadas</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibrar para chamadas e notificações</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cabeça: %1$s W/kg</string>
@@ -1055,6 +1060,16 @@
   <string name="app_notification_show_on_keyguard_summary">Mostrar notificações desta aplicação no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Desativar as notificações persistentes no ecrã de bloqueio</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nunca mostrar as notificações persistentes desta aplicação no ecrã de bloqueio</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Tempo mínimo entre sons de notificação</string>
+  <string name="app_notification_sound_timeout_summary_template">Permitir sons ou vibrações, apenas uma vez, a cada <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Sem restrição</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 segundos</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 segundos</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 minuto</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 minutos</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 minutos</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 minutos</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Controlo avançado de rádio</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-rm/cm_strings.xml
+++ b/res/values-rm/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e813172..e69e7e7 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -870,6 +870,7 @@
   <string name="zen_mode_summary_selected_callers">apelanții selectați</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">mesajele selectate</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Cap: %1$s W/kg</string>
@@ -927,6 +928,7 @@
   <string name="app_notification_show_on_keyguard_summary">Afișează notificări de la acestă aplicație pe ecranul de blocare</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Dezactivați notificarea persistentă pe ecranul de blocare</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nu arată notificări persistente de la acestă aplicație pe ecranul de blocare</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index 9a4e242..cc66a60 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -952,6 +952,11 @@
   <string name="zen_mode_summary_selected_callers">Выбранные абоненты</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">выбранные сообщения</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Вибросигнал</string>
+  <string name="zen_mode_vibration_never">Не вибрировать</string>
+  <string name="zen_mode_vibration_calls_only">Вибрировать только при вызовах</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Вибрировать при вызовах и уведомлениях</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Голова: %1$s Вт/кг</string>
@@ -1057,6 +1062,16 @@
   <string name="app_notification_show_on_keyguard_summary">Показывать уведомления из этого приложения на экране блокировки</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Заблокировать постоянные на экране блокир.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не показывать постоянные уведомления из этого приложения на экране блокировки</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Частота звуковых уведомлений</string>
+  <string name="app_notification_sound_timeout_summary_template">Звуки и вибрация не чаще, чем раз в <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Без ограничений</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 секунд</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 секунд</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 минуту</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 минут</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 минут</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 минут</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Расширенное управление радиоблоком</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 8d3fdc6..50dca18 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -521,6 +521,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">හිස: %1$s W/kg</string>
@@ -553,6 +554,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index 525c882..b26f2b9 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -831,6 +831,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Hlava: %1$s W/kg</string>
@@ -891,6 +892,7 @@
   <string name="app_notification_show_on_keyguard_summary">Zobraziť oznámenia z tejto aplikácie na uzamknutej obrazovke</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Zakázať trvalé oznámenia na obrazovke uzamknutia</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nezobrazovať trvalé oznámenia z tejto aplikácie na obrazovke uzamknutia</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index 11618b5..f733730 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -295,7 +295,7 @@
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Razhroščevanje Android</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">Omogoči vmesnik Android Debug Bridge (ADB)</string>
+  <string name="enable_adb_summary_cm">Omogoči vmesnik Androidov most za razhroščevanje (ADB)</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ADB preko omrežja</string>
   <string name="adb_over_network_summary">Omogoči razhroščevanje TCP/IP preko omrežnih vmesnikov (Wi\u2011Fi, omrežja USB). Ta nastavitev se ob ponovnem zagonu ponastavi</string>
@@ -630,7 +630,7 @@
   <string name="adj_contrast_title">Kontrast</string>
   <!-- Whether to display IME switcher notifcation -->
   <string name="ime_switcher_notify">Ikona izbirnika</string>
-  <string name="ime_switcher_notify_summary">Prikaži ikono izbirnika metode za vnos</string>
+  <string name="ime_switcher_notify_summary">Prikaži ikono izbirnika načina vnosa</string>
   <!-- Heads up -->
   <string name="heads_up_notifications">Obvestila na zaslonu</string>
   <string name="summary_heads_up_enabled">Pojavna obvestila so omogočena</string>
@@ -961,6 +961,11 @@
   <string name="zen_mode_summary_selected_callers">izbrani klicatelji</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">izbrana sporočila</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Vibriranje</string>
+  <string name="zen_mode_vibration_never">Ne vibriraj</string>
+  <string name="zen_mode_vibration_calls_only">Vibriraj samo za klice</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Vibriraj za klice in obvestila</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Glava: %1$s W/kg</string>
@@ -1066,6 +1071,16 @@
   <string name="app_notification_show_on_keyguard_summary">Na zaklenjenem zaslonu prikaži obvestila iz te aplikacije</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Onem. vztr. obv. na zas. za zakl.</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Nikoli ne prikaži vztrajnih obvestil iz te aplikacije na zaklenjenem zaslonu</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Najmanjši čas med zvoki obvestil</string>
+  <string name="app_notification_sound_timeout_summary_template">Najmanjši čas med zvoki ali vibriranji: <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Brez omejitev</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 s</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 s</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 min.</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 min.</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 min.</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 min.</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Izboljšan nadzor oddajnika</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-sq-rAL/cm_strings.xml
+++ b/res/values-sq-rAL/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 413b29d..5899a9e 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -17,9 +17,17 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to show Device Id -->
+  <plurals name="show_device_id_countdown_cm">
+    <item quantity="one">Сада си <xliff:g id="step_count">%1$d</xliff:g> корак далеко од добијања ИД уређаја.</item>
+    <item quantity="few">Сада си <xliff:g id="step_count">%1$d</xliff:g> корака далеко од добијања ИД уређаја.</item>
+    <item quantity="other">Сада си <xliff:g id="step_count">%1$d</xliff:g> корака далеко од добијања ИД уређаја.</item>
+  </plurals>
   <!--  Device Info screen. Confirmation that Device ID is copied to clipboard -->
+  <string name="show_device_id_copied_cm">ИД уређаја:[<xliff:g id="device_id">%1$s</xliff:g>] копиран у оставу</string>
   <!--  Device Info screen. Confirmation that Device ID is not available -->
+  <string name="show_device_id_failed_cm">Идентификација уређаја није доступна на овој верзији</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Label for the deviceID text put to clipboard -->
+  <string name="show_device_id_clipboard_label">Идентификација уређаја</string>
   <!-- [CHAR LIMIT=NONE] Device Info screen. Countdown for user taps to enable development settings -->
   <plurals name="show_dev_countdown_cm">
     <item quantity="one">Сада си <xliff:g id="step_count">%1$d</xliff:g> корак далеко од омогућавања развојних опција.</item>
@@ -609,6 +617,7 @@
   <string name="live_display_color_profile_photography_summary">Савршена репродукција боје за фотографије</string>
   <string name="live_display_color_profile_basic_title">Основно</string>
   <string name="live_display_color_profile_basic_summary">Користи дисплеј неподешен</string>
+  <string name="live_display_color_profile_adaptive_title">Прилагодљиво</string>
   <string name="live_display_color_profile_adaptive_summary">Боје прилагођене амбиенталним условима</string>
   <!-- LiveDisplay : Picture Adjustment -->
   <string name="picture_adjustment_title">Корекција слике</string>
@@ -943,6 +952,7 @@
   <string name="zen_mode_summary_selected_callers">одабрани позиваоци</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">одабране поруке</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Глава: %1$s W/kg</string>
@@ -1048,6 +1058,7 @@
   <string name="app_notification_show_on_keyguard_summary">Прикажи обавештење ове апликације на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Онемогућити трајна обавештења на закључаном екрану</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Никад не приказуј трајна обавештења ове апликације на закључаном екрану</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Проширена радио контрола</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index 63a604a..ef8a8ff 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -937,6 +937,7 @@ inkluderar en unik identifikation,
   <string name="zen_mode_summary_selected_callers">valda uppringare</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">valda meddelanden</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Huvud: %1$s W/kg</string>
@@ -1025,6 +1026,7 @@ inkluderar en unik identifikation,
   <string name="app_notification_show_on_keyguard_summary">Visa aviseringar från denna app på låsskärmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Inaktivera beständiga aviseringar på låsskärmen</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Visa aldrig beständiga aviseringar från denna app på låsskärmen</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-sw/cm_strings.xml
+++ b/res/values-sw/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index dce85e1..9723e6a 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">தேர்வுசெய்யப்பட்ட அழைப்பாளர்கள்</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">தேர்வுசெய்யப்பட்ட செய்திகள்</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">தலை: %1$s W/கிலோ</string>
@@ -1003,6 +1004,7 @@
   <string name="app_notification_show_on_keyguard_summary">லாக் திரையில் இந்த பயன்பாடு-இல் இருந்து அறிவுறுத்தல்களை காட்டு</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">பூட்டுத் திரையில் விடாப்பிடியான அறிவுறுத்தலை முடக்கு</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">இந்த பயன்பாடு-இல் இருந்து  விடாப்பிடியான அறிவுறுத்தலை பூட்டுத் திரையில் எப்போதும் காட்டாதே</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index da78bc5..dd01b03 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -930,6 +930,7 @@
   <string name="zen_mode_summary_selected_callers">ఎంచుకున్న కాలర్‌లు</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">సందేశాలు ఎంచుకోబడ్డాయి</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">ప్రారంభం: %1$s W/kg</string>
@@ -1003,6 +1004,7 @@
   <string name="app_notification_show_on_keyguard_summary">ఈ ప్రోగ్రాం నుండి వచ్చే నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపుము</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">లాక్ స్క్రీన్ పైన నిరంతర నోటిఫికేషన్లను నిలిపివేయుము</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ఎప్పుడూ కూడా ఈ ప్రోగ్రాం నుండి వచ్చే నిరంతర నోటిఫికేషన్లను లాక్ స్క్రీన్ పైన చూపవద్దు</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index f3d02a7..78fa4f9 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -933,6 +933,7 @@
   <string name="zen_mode_summary_selected_callers">ผู้โทรที่เลือก</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">ข้อความที่เลือก</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">หัว: %1$s W/kg</string>
@@ -1037,6 +1038,7 @@
   <string name="app_notification_show_on_keyguard_summary">แสดงการแจ้งเตือนจากแอปนี้บนหน้าจอล็อค</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">ปิดใช้งานการแจ้งเตือนแบบถาวรบนหน้าจอล็อค</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">ไม่ต้องแสดงการแจ้งเตือนแบบถาวรจากแอปนี้บนหน้าจอล็อค</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 096b560..ae68928 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -934,6 +934,7 @@
   <string name="zen_mode_summary_selected_callers">seçili arayanlar</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">seçili mesajlar</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Baş: %1$s W/kg</string>
@@ -1038,6 +1039,7 @@
   <string name="app_notification_show_on_keyguard_summary">Kilit ekranında bu uygulamanın bildirimlerini göster</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Kilit ekranında kalıcı bildirimleri devre dışı bırak</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Kilit ekranında bu uygulamanın kalıcı bildirimlerini asla gösterme</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index c9ddb86..4735743 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -936,6 +936,7 @@
   <string name="zen_mode_summary_selected_callers">تاللانغان كىشىدىن كەلگەن تېلېفون</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">تاللانغان ئۇچۇر</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">باش: %1$s W/kg</string>
@@ -1017,6 +1018,7 @@
   <string name="app_notification_show_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ ئۇقتۇرۇشلىرىنى كۆرسىتىدۇ</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">قۇلۇپ ئېكراندا دائىملىق ئۇقتۇرۇشنى چەكلەيدۇ</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">قۇلۇپ ئېكراندا بۇ ئەپنىڭ دائىملىق ئۇقتۇرۇشىنى مەڭگۈ كۆرسەتمەيدۇ</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 32cad28..274a7d3 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -879,6 +879,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Голова: %1$s Вт/кг</string>
@@ -939,6 +940,7 @@
   <string name="app_notification_show_on_keyguard_summary">Відображати сповіщення із цієї програми на екрані блокування</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Відключити сповіщення на екрані блокування</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Не відображувати сповіщення від цієї програми на екрані блокування</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-ur-rPK/cm_strings.xml
+++ b/res/values-ur-rPK/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-uz-rUZ/cm_strings.xml
+++ b/res/values-uz-rUZ/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index 13c3db8..a195bb7 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -933,6 +933,7 @@
   <string name="zen_mode_summary_selected_callers">người gọi đã chọn</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">tin nhắn đã chọn</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Đầu: %1$s W/kg</string>
@@ -1037,6 +1038,7 @@
   <string name="app_notification_show_on_keyguard_summary">Hiển thị các thông báo từ ứng dụng này trên màn hình khóa</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">Tắt thông báo liên tục trên màn hình khóa</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Không bao giờ hiển thị các thông báo liên tục từ ứng dụng này trên màn hình khóa</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index a1bb2b3..66bf5a6 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -948,6 +948,11 @@
   <string name="zen_mode_summary_selected_callers">选定的来电者</string>
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">选定的信息</string>
+  <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">振动</string>
+  <string name="zen_mode_vibration_never">不要振动</string>
+  <string name="zen_mode_vibration_calls_only">仅在来电时振动</string>
+  <string name="zen_mode_vibration_calls_and_notifications">来电及通知时震动</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">头部：%1$s 瓦特/公斤</string>
@@ -1054,6 +1059,16 @@
   <string name="app_notification_show_on_keyguard_summary">在锁屏上显示来自此应用的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">禁用锁屏上的持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">永不在锁屏上显示来自此应用的持久通知</string>
+  <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">最短通知铃声间隔</string>
+  <string name="app_notification_sound_timeout_summary_template">每 <xliff:g id="duration">%1$s</xliff:g> 允许一次响铃或振动</string>
+  <string name="app_notification_sound_timeout_value_none">无限制</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 秒</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 秒</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 分钟</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 分钟</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 分钟</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 分钟</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">增强的无线通信控制</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 2458a85..91ac0ad 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -773,6 +773,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">頭：%1$s W/kg</string>
@@ -831,6 +832,7 @@
   <string name="app_notification_show_on_keyguard_summary">在鎖定螢幕中顯示此應用程式的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">在鎖定螢幕上停用持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖定螢幕上不再顯示來自此應用程式的持久通知</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 3ce4d0a..0e0bc8e 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -887,6 +887,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">已選的訊息</string>
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">頭部：%1$s W/kg</string>
@@ -962,6 +963,7 @@
   <string name="app_notification_show_on_keyguard_summary">在鎖定畫面中顯示此應用程式的通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_title">在鎖屏上停用持久通知</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">在鎖屏上不再顯示來自此應用程式的持久通知</string>
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">加強無線管理</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml
index eadd497..8e47c83 100644
--- a/res/values-zu/cm_strings.xml
+++ b/res/values-zu/cm_strings.xml
@@ -161,6 +161,7 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_events, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_callers, but part of a list, so lower case if needed -->
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
+  <!-- Allow vibration in zen mode -->
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <!-- IC Codes -->
@@ -188,6 +189,7 @@
   <!-- title for lock screen blur preference -->
   <!-- title for lock screen weather preference -->
   <!-- Per app controls for LP keyguard notifications -->
+  <!-- Notification sound timeout -->
   <!-- CmRadioInfo -->
   <!-- Radio Control (IMS/MBN etc.) -->
   <!-- Lock screen wallpaper -->
-- 
cgit v1.1


From 7ac57f0dd50be29d569084666fa68ba74bb1d100 Mon Sep 17 00:00:00 2001
From: "inky@build01" <jenkins@cyanogenmod.com>
Date: Fri, 2 Dec 2016 16:57:17 -0800
Subject: Automatic translation import

Change-Id: I8991cabc252267d4db6f08dbfaf5513e218029e0
Ticket: -
---
 res/values-af/cm_strings.xml      |  1 -
 res/values-ar/cm_strings.xml      |  1 -
 res/values-as-rIN/cm_strings.xml  |  1 -
 res/values-ast-rES/cm_strings.xml |  1 -
 res/values-az-rAZ/cm_strings.xml  |  1 -
 res/values-be/cm_strings.xml      |  1 -
 res/values-bg/cm_strings.xml      |  2 +-
 res/values-bn-rBD/cm_strings.xml  |  1 -
 res/values-ca/cm_strings.xml      |  4 ++--
 res/values-cs/cm_strings.xml      |  1 -
 res/values-da/cm_strings.xml      |  2 +-
 res/values-de/cm_strings.xml      |  3 ++-
 res/values-el/cm_strings.xml      |  1 -
 res/values-en-rAU/cm_strings.xml  |  1 -
 res/values-en-rIN/cm_strings.xml  |  1 -
 res/values-es-rUS/cm_strings.xml  |  1 -
 res/values-es/cm_strings.xml      |  1 -
 res/values-et-rEE/cm_strings.xml  |  1 -
 res/values-eu-rES/cm_strings.xml  | 14 +++++++-------
 res/values-fa/cm_strings.xml      |  1 -
 res/values-fi/cm_strings.xml      |  2 +-
 res/values-fr/cm_strings.xml      |  1 -
 res/values-gl-rES/cm_strings.xml  |  2 +-
 res/values-gu-rIN/cm_strings.xml  |  1 -
 res/values-hi/cm_strings.xml      |  1 -
 res/values-hr/cm_strings.xml      |  2 +-
 res/values-hu/cm_strings.xml      | 14 +++++++++++++-
 res/values-in/cm_strings.xml      | 19 +++++++++----------
 res/values-it/cm_strings.xml      | 20 ++++++++++----------
 res/values-iw/cm_strings.xml      |  9 ++++++++-
 res/values-ja/cm_strings.xml      |  8 ++++----
 res/values-kn-rIN/cm_strings.xml  |  1 -
 res/values-ko/cm_strings.xml      |  1 -
 res/values-ku/cm_strings.xml      |  1 -
 res/values-lb/cm_strings.xml      |  1 -
 res/values-lt/cm_strings.xml      |  1 -
 res/values-lv/cm_strings.xml      |  1 -
 res/values-ml-rIN/cm_strings.xml  |  1 -
 res/values-mr-rIN/cm_strings.xml  |  1 -
 res/values-nb/cm_strings.xml      |  1 -
 res/values-nl/cm_strings.xml      |  1 -
 res/values-or-rIN/cm_strings.xml  |  1 -
 res/values-pl/cm_strings.xml      |  1 -
 res/values-pt-rBR/cm_strings.xml  |  1 -
 res/values-pt-rPT/cm_strings.xml  | 26 +++++++++++++-------------
 res/values-ro/cm_strings.xml      |  1 -
 res/values-ru/cm_strings.xml      |  2 +-
 res/values-si-rLK/cm_strings.xml  |  1 -
 res/values-sk/cm_strings.xml      |  1 -
 res/values-sl/cm_strings.xml      | 12 ++++++------
 res/values-sr/cm_strings.xml      |  1 -
 res/values-sv/cm_strings.xml      |  1 -
 res/values-ta-rIN/cm_strings.xml  |  1 -
 res/values-te-rIN/cm_strings.xml  |  1 -
 res/values-th/cm_strings.xml      |  1 -
 res/values-tr/cm_strings.xml      |  1 -
 res/values-ug/cm_strings.xml      |  1 -
 res/values-uk/cm_strings.xml      |  1 -
 res/values-vi/cm_strings.xml      |  1 -
 res/values-zh-rCN/cm_strings.xml  |  4 ++--
 res/values-zh-rHK/cm_strings.xml  |  1 -
 res/values-zh-rTW/cm_strings.xml  |  1 -
 62 files changed, 82 insertions(+), 108 deletions(-)

diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
index 8741f5b..2fb4a69 100644
--- a/res/values-af/cm_strings.xml
+++ b/res/values-af/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Dubbel klop op die statusbalk om skerm af te skakel</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Voorkom toevallige wakker word</string>
-  <string name="proximity_wake_summary">Gaan die nabyheid sensor na voordat die skerm wakker gemaak word</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Word wakker op in/uit prop</string>
   <string name="wake_when_plugged_or_unplugged_summary">Skakel die skerm aan met die koppeling of ontkoppeling van \'n kragbron</string>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
index 5d93622..ed2d030 100644
--- a/res/values-ar/cm_strings.xml
+++ b/res/values-ar/cm_strings.xml
@@ -547,7 +547,6 @@
   <string name="double_tap_to_sleep_summary">الضغط مرتين فوق شريط الحالة لإطفاء الشاشة</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">منع الاستيقاظ العشوائي</string>
-  <string name="proximity_wake_summary">التحقق من مستشعر القرب قبل إيقاظ الشاشة</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">الإيقاظ عند التوصيل</string>
   <string name="wake_when_plugged_or_unplugged_summary">تشغيل الشاشة عند الاتصال أو قطع الاتصال بمصدر الطاقة</string>
diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml
index cc22db5..c9d1379 100644
--- a/res/values-as-rIN/cm_strings.xml
+++ b/res/values-as-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">প্রদর্শন অফ কৰিবলৈ ষ্টেটাছ বাৰত দুবাৰ ক্লিক কৰক</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">দুৰ্ঘটনাক্ৰমে ৱেক-আপ হোৱাটো প্ৰতিৰোধ কৰক</string>
-  <string name="proximity_wake_summary">স্ক্ৰীণ ৱেক আপ কৰাৰ আগতে প্ৰ\'ক্সিমিটী চেনচৰ পৰীক্ষা কৰক</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">প্লাগ কৰিলে ৱেক কৰক</string>
   <string name="wake_when_plugged_or_unplugged_summary">পাৱাৰ উৎসৰ সৈতে সংযোগ কৰিলে বা সংযোগহীন কৰিলে স্ক্ৰীণ অন কৰক</string>
diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml
index 121ebc0..e80c66a 100644
--- a/res/values-ast-rES/cm_strings.xml
+++ b/res/values-ast-rES/cm_strings.xml
@@ -538,7 +538,6 @@ Calca pa empareyar el preséu Bluetooth enantes de configurar los disparadores.<
   <string name="double_tap_to_sleep_summary">Calca dos vegaes na barra d\'estáu p\'apagar la pantalla</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir encendíu accidental</string>
-  <string name="proximity_wake_summary">Comprobar el sensor de proximidá enantes de prender la pantalla</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Prender con cargador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Prender la pantalla al coneutar o desconeutar el cargador</string>
diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml
index 267f450..2d40e5e 100644
--- a/res/values-az-rAZ/cm_strings.xml
+++ b/res/values-az-rAZ/cm_strings.xml
@@ -443,7 +443,6 @@
   <string name="double_tap_to_sleep_summary">Ekranı bağlamaq üçün durum sətrinə iki dəfə toxunun</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Təsadüfi oyanmaların qarşısını al</string>
-  <string name="proximity_wake_summary">Ekranı açmamışdan əvvəl yaxınlıq sensoruna nəzər yetir</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_summary">Güc mənbəsinə bağlananda və ya bağlantını kəsəndə ekranı aç</string>
   <!-- Font size sample text. This needs to be a very short string, as it is shown in
diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml
index c8b2caa..1579b54 100644
--- a/res/values-be/cm_strings.xml
+++ b/res/values-be/cm_strings.xml
@@ -541,7 +541,6 @@
   <string name="double_tap_to_sleep_summary">Двойчы дакраніцеся радка стану, каб перавесці прыладу ў спячы рэжым</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Прадухіляць выпадковае ўлучэнне</string>
-  <string name="proximity_wake_summary">Правяраць датчык набліжэння пры выйсці з рэжыму сну</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Улучэнне пры зарадцы</string>
   <string name="wake_when_plugged_or_unplugged_summary">Улучаць экран пры падлучэнні ці адключэнні крыніцы сілкавання</string>
diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml
index 16447af..285087f 100644
--- a/res/values-bg/cm_strings.xml
+++ b/res/values-bg/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Двукратно почукване върху лентата на състоянието изключва на дисплея</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Предотвратяване на случайно събуждане</string>
-  <string name="proximity_wake_summary">Проверява сензора за близост преди включване на екрана</string>
+  <string name="proximity_wake_summary">Проверете сензора за близост за събуждане чрез жестове</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Събуждане при зареждане</string>
   <string name="wake_when_plugged_or_unplugged_summary">Включване на екрана, когато включвате или изключвате източник на захранване</string>
diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml
index b0b05d0..cab442a 100644
--- a/res/values-bn-rBD/cm_strings.xml
+++ b/res/values-bn-rBD/cm_strings.xml
@@ -353,7 +353,6 @@
   <string name="double_tap_to_sleep_title">দুই টোকা দিয়ে নিদ্রা</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">আকস্মিক জেগে ওঠা প্রতিহত করুন</string>
-  <string name="proximity_wake_summary">পর্দা জাগ্রত করতে আগে প্রক্সিমিটি সেন্সর দেখে নিনি</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">প্লাগইন অবস্থায় জেগে উঠা</string>
   <string name="wake_when_plugged_or_unplugged_summary">শক্তির উৎস যখন যুক্ত অথবা বিচ্ছিন্ন করা হচ্ছে তখন পর্দা সচল করুন</string>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index b7291ca..0df656f 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Pica dues vegades a la barra d\'estat per apagar la pantalla</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evita l\'encesa accidental</string>
-  <string name="proximity_wake_summary">Comprova el sensor de proximitat abans d\'encendre la pantalla</string>
+  <string name="proximity_wake_summary">Comprova el sensor de proximitat abans dels despertars provocats per gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Encén en endollar</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encén la pantalla en connectar o desconnectar d\'una font d\'energia</string>
@@ -870,7 +870,7 @@
   <string name="preview_device_title">Dispositiu</string>
   <string name="preview_version_title">Versió</string>
   <string name="preview_country_title">País</string>
-  <string name="preview_carrier_title">Portadora</string>
+  <string name="preview_carrier_title">Operadora</string>
   <string name="stats_collection_title">Recollida d\'estadístiques</string>
   <string name="stats_collection_summary">Quan està activat, permet la recollida de mètriques</string>
   <!-- Protected apps lockpattern reset button -->
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
index fb7de2a..3bfbd36 100644
--- a/res/values-cs/cm_strings.xml
+++ b/res/values-cs/cm_strings.xml
@@ -554,7 +554,6 @@
   <string name="double_tap_to_sleep_summary">Dvojitým poklepáním na stavovou lištu vypnout obrazovku</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zabránit nechtěnému probuzení</string>
-  <string name="proximity_wake_summary">Kontrolovat senzor přiblížení pro zabránění nechtěného probuzení</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Probudit při nabíjení</string>
   <string name="wake_when_plugged_or_unplugged_summary">Zapnout obrazovku při připojení nebo odpojení nabíječky</string>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
index 1b26199..fd6b248 100644
--- a/res/values-da/cm_strings.xml
+++ b/res/values-da/cm_strings.xml
@@ -539,7 +539,7 @@
   <string name="double_tap_to_sleep_summary">Dobbelttryk på statuslinjen for at slukke skærmen</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Undgå utilsigtet vækning</string>
-  <string name="proximity_wake_summary">Check nærhedsføleren før skærmen vækkes</string>
+  <string name="proximity_wake_summary">Check nærhedsføler før oplåsning udløst af bevægelser</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Væk ved strøm</string>
   <string name="wake_when_plugged_or_unplugged_summary">Tænd skærmen, når du tilslutter eller frakobler en strømkilde</string>
diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
index 2d36dfd..46b4553 100644
--- a/res/values-de/cm_strings.xml
+++ b/res/values-de/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Doppelt auf die Statusleiste tippen, um das Display auszuschalten</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Unbeabsichtigtes Aufwecken verhindern</string>
-  <string name="proximity_wake_summary">Näherungssensor verwenden, um ein versehentliches Aufwecken des Geräts zu vermeiden</string>
+  <string name="proximity_wake_summary">Vor dem Aufwecken durch Gesten den Näherungssensor prüfen</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Beim Einstecken aufwecken</string>
   <string name="wake_when_plugged_or_unplugged_summary">Beim Anschließen oder Trennen einer Stromquelle den Bildschirm einschalten</string>
@@ -1061,6 +1061,7 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Dauerhafte Benachrichtigungen auf dem Sperrbildschirm deaktivieren</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Keine dauerhaften Benachrichtigungen dieser App auf dem Sperrbildschirm anzeigen</string>
   <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Minimale Zeit zwischen Benachrichtigungstönen</string>
   <string name="app_notification_sound_timeout_summary_template">Töne und Vibrationen nur alle <xliff:g id="duration">%1$s</xliff:g> zulassen</string>
   <string name="app_notification_sound_timeout_value_none">Keine Beschränkung</string>
   <string name="app_notification_sound_timeout_value_10_seconds">10 Sekunden</string>
diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 8c7dcc5..408c887 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Διπλό χτύπημα στη γραμμή κατάστασης για αναστολή της συσκευής</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Πρόληψη ακούσιας αφύπνισης</string>
-  <string name="proximity_wake_summary">Έλεγχος τον αισθητήρα εγγύτητας πριν την αφύπνιση της οθόνης</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Αφύπνιση κατά τη σύνδεση</string>
   <string name="wake_when_plugged_or_unplugged_summary">Ενεργοποίηση της οθόνης κατά την σύνδεση ή αποσύνδεση μιας πηγής ισχύος</string>
diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml
index e761725..6e9fbf5 100644
--- a/res/values-en-rAU/cm_strings.xml
+++ b/res/values-en-rAU/cm_strings.xml
@@ -443,7 +443,6 @@
   <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevent accidental wake-up</string>
-  <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
   <string name="wake_when_plugged_or_unplugged_summary">Turn the screen on when connecting or disconnecting a power source</string>
diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml
index ac9a941..db16a60 100644
--- a/res/values-en-rIN/cm_strings.xml
+++ b/res/values-en-rIN/cm_strings.xml
@@ -484,7 +484,6 @@
   <string name="double_tap_to_sleep_summary">Double-tap on the status bar to turn off the display</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevent accidental wake-up</string>
-  <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Wake on plug</string>
   <string name="wake_when_plugged_or_unplugged_summary">Turn the screen on when connecting or disconnecting a power source</string>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index f841104..910f2e6 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -543,7 +543,6 @@
   <string name="double_tap_to_sleep_summary">Apagar la pantalla mediante un doble toque sobre la barra de estado</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir activación accidental</string>
-  <string name="proximity_wake_summary">Comprobar el sensor de proximidad antes de encender la pantalla</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Activar con cargador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index c2132b7..8a3f980 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -543,7 +543,6 @@
   <string name="double_tap_to_sleep_summary">Apagar la pantalla realizando un doble toque sobre la barra de estado</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prevenir encendido accidental</string>
-  <string name="proximity_wake_summary">Comprobar el sensor de proximidad antes de encender la pantalla</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Encender al conectar el cargador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Encender la pantalla al conectar o desconectar el cargador</string>
diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml
index 87aa2b9..467b473 100644
--- a/res/values-et-rEE/cm_strings.xml
+++ b/res/values-et-rEE/cm_strings.xml
@@ -477,7 +477,6 @@
   <string name="double_tap_to_sleep_summary">Topeltpuudutage olekuriba ekraani väljalülitamiseks</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Väldi juhuslikku ärkamist</string>
-  <string name="proximity_wake_summary">Kontrolli lähedusandurit enne ekraani sisselülitamist</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Ärka laadija ühendamisel</string>
   <string name="wake_when_plugged_or_unplugged_summary">Lülita ekraan sisse kui ühendatakse või eemaldatakse toite allikas</string>
diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml
index bcd5885..728be8c 100644
--- a/res/values-eu-rES/cm_strings.xml
+++ b/res/values-eu-rES/cm_strings.xml
@@ -164,7 +164,7 @@
   <!-- Profiles - system settings -->
   <string name="profile_system_settings_title">Sistemaren ezarpenak</string>
   <string name="profile_lockmode_title">Blokeo-pantaila modua</string>
-  <string name="profile_lockmode_policy_disabled_summary">Profil aukera hau gailuaren administrazio politika betek ezgaitu du</string>
+  <string name="profile_lockmode_policy_disabled_summary">Profileko aukera hau gailuaren administrazio politika batek desgaitu du</string>
   <string name="profile_lockmode_insecure_summary">Ez eskatu PINa edo pasahitza</string>
   <string name="profile_lockmode_disabled_summary">Ezgaitu blokeo-pantaila</string>
   <string name="profile_airplanemode_title">Hegaldi modua</string>
@@ -236,7 +236,7 @@
   <string name="navigation_bar_left_title">Ezkertientzako modua</string>
   <string name="navigation_bar_left_summary">Kokatu nabigazio-barra pantailaren ezkerraldean paisaia moduan</string>
   <string name="navigation_bar_title">Botoiak eta diseinua</string>
-  <string name="navigation_bar_help_text">Hasteko sakatu editatu ikonoa nabigazio barra ediziorako askatzeko.\n\nikono bat sakatu dezakezu bere lasterbidea aldatzeko, edo luze sakatu dezakezu ikonoa diseinua berrantolatzeko.\n\nSakatu \'Gorde\' aldaketak bidaltzeko, edo \'Berrezarri lehenetsitakoak\' diseinua lehenetsitako ezarpenetara bueltatzeko.</string>
+  <string name="navigation_bar_help_text">Sakatu editatu ikonoa nabigazio-barra ediziorako desblokeatzeko.\n\nIkono bat sakatu dezakezu bere lasterbidea aldatzeko, edo luze sakatu dezakezu ikonoa diseinua berrantolatzeko.\n\nSakatu \'Gorde\' aldaketak bidaltzeko, edo \'Berrezarri lehenetsitakoak\' diseinua lehenetsitako ezarpenetara bueltatzeko.</string>
   <string name="navigation_restore_button_text">Berrezarri\nbalio lehenetsiak</string>
   <string name="navigation_edit_button_text">Editatu</string>
   <string name="navigation_save_button_text">Gorde</string>
@@ -245,7 +245,7 @@
   <string name="navigation_bar_arrow_keys_summary">Bistaratu ezker zein eskuin kurtsore botoiak idaztean. IME aldatzailea gainidazten du.</string>
   <string name="navigation_bar_recents_title">Azkenak botoian luze sakatzearen ekintza</string>
   <!-- Notification light dialogs -->
-  <string name="edit_light_settings">Jakinarazpena editatu</string>
+  <string name="edit_light_settings">Editatu argiaren ezarpenak</string>
   <string name="pulse_speed_title">Dirdiraren iraupena eta abiadura</string>
   <string name="default_time">Arrunta</string>
   <string name="custom_time">Lehenetsia</string>
@@ -279,7 +279,7 @@
   <string name="notification_light_default_value">Lehenetsia</string>
   <string name="notification_light_missed_call_title">Dei galdua</string>
   <string name="notification_light_voicemail_title">Ahots postontzia</string>
-  <string name="notification_light_screen_on">Argitu pantaila piztean</string>
+  <string name="notification_light_screen_on">Argiak pantaila piztuta dagoenean</string>
   <string name="notification_light_zen_mode">Argiak ez eten moduan</string>
   <string name="notification_light_use_multiple_leds">Hainbat LED</string>
   <string name="keywords_lights_brightness_level">ilundu LEDaren argitasuna</string>
@@ -483,7 +483,7 @@
   <string name="hardware_keys_double_tap_title">Birritan sakatzearen ekintza</string>
   <string name="hardware_keys_action_nothing">Ekintzarik ez</string>
   <string name="hardware_keys_action_menu">Ireki/itxi menua</string>
-  <string name="hardware_keys_action_app_switch">Azken aplikazioen kommutadorea</string>
+  <string name="hardware_keys_action_app_switch">Azken aplikazioen aldatzailea</string>
   <string name="hardware_keys_action_search">Bilaketa laguntzailea</string>
   <string name="hardware_keys_action_voice_search">Ahotsezko bilaketa</string>
   <string name="hardware_keys_action_in_app_search">Aplikazio barneko bilaketa</string>
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Birritan sakatu egoera barran pantaila itzaltzeko</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Ekidin ustekabeko esnatzea</string>
-  <string name="proximity_wake_summary">Kontsultatu gertutasun sentsorea pantaila piztu aurretik</string>
+  <string name="proximity_wake_summary">Egiaztatu hurbiltasun sentsorea keinuen bidez eragindako esnatzeen aurretik</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Esnatu kargadorearekin</string>
   <string name="wake_when_plugged_or_unplugged_summary">Piztu pantaila kargadorea konektatu edo deskonektatzean</string>
@@ -858,7 +858,7 @@
   <!-- Anonymous Statistics #CM -->
   <!-- About device screen, list item title. Takes the user to the screen about opting in or out of anonymous statistics. -->
   <string name="anonymous_statistics_title">CyanogenMod estatistikak</string>
-  <string name="anonymous_statistics_summary">CyanogenMod hobetzera lagundu estatistika anonimoak bidaliz</string>
+  <string name="anonymous_statistics_summary">CyanogenMod hobetzen lagundu estatistika anonimoak bidaliz</string>
   <string name="anonymous_statistics_warning_title">Honi buruz</string>
   <string name="anonymous_statistics_warning">CyanogenMod estatistikak baimenduz, CyanogenMod garatzaileei pertsonala ez den informazioa bidaltzea baimentzen duzu, gailu desberdinetako instalazioei segimendua egitea baimentzen diena. Igorritako datuen artean identifikatzaile esklusibo bat dago, honek ez du zure pribatutasuna edo datu pertsonalak arriskuan jartzen. Datuak abiarazte bakoitzean bidaltzen dira.\n\nIgorriko liratekeen datuen adibide bat ikusteko sakatu Aurreikusi Datuak.</string>
   <string name="enable_reporting_title">Gaitu txosten bidalketa</string>
diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml
index 2704b74..28ea72f 100644
--- a/res/values-fa/cm_strings.xml
+++ b/res/values-fa/cm_strings.xml
@@ -477,7 +477,6 @@
   <string name="double_tap_to_sleep_summary">خاموش شدن صفحه با دوبار ضربه زدن روی نوار وضعیت</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">جلوگیری از بیدار شدن تصادفی</string>
-  <string name="proximity_wake_summary">بررسی حسگر مجاورت قبل از روشن کردن صفحه</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">بیدار شدن هنگام اتصال به برق</string>
   <string name="wake_when_plugged_or_unplugged_summary">روشن شدن صفحه هنگام اتصال یا قطع اتصال منبع برق</string>
diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml
index 4fd2511..e25ed80 100644
--- a/res/values-fi/cm_strings.xml
+++ b/res/values-fi/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Sulje laitteen näyttö tuplanapauttamalla tilapalkkia</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Estä herätys vahingossa</string>
-  <string name="proximity_wake_summary">Tarkista lähesyysanturi ennen laitteen herättämistä</string>
+  <string name="proximity_wake_summary">Tarkista läheisyysanturi herättävien eleiden varalta</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Herää laturista</string>
   <string name="wake_when_plugged_or_unplugged_summary">Käynnistä näyttö kun virtalähde liitetään tai irrotetaan</string>
diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml
index ad65cc1..0a566e2 100644
--- a/res/values-fr/cm_strings.xml
+++ b/res/values-fr/cm_strings.xml
@@ -544,7 +544,6 @@ Vous êtes maintenant à <xliff:g id="step_count">%1$d</xliff:g> étapes de l\'a
   <string name="double_tap_to_sleep_summary">Appui double sur la barre d\'état pour éteindre l\'écran</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Empêcher un réveil accidentel</string>
-  <string name="proximity_wake_summary">Vérifier le capteur de proximité avant de réveiller l\'écran</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Réveiller au branchement</string>
   <string name="wake_when_plugged_or_unplugged_summary">Allumer l\'écran lors du branchement ou du débranchement d\'une source d\'alimentation</string>
diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
index 11af251..430d9c9 100644
--- a/res/values-gl-rES/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Toque dúas veces na barra de estado para apagar a visualización</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Previr acender de forma accidental</string>
-  <string name="proximity_wake_summary">Comprobar o sensor de proximidade antes de acender a pantalla</string>
+  <string name="proximity_wake_summary">Verificar o sensor de proximidade antes de espertar ao dispositivo con xestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Acender ao enchufar</string>
   <string name="wake_when_plugged_or_unplugged_summary">Acende a pantalla ao contectarse e desconectarse dunha fonte de enerxía</string>
diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml
index e38bec9..69f029e 100644
--- a/res/values-gu-rIN/cm_strings.xml
+++ b/res/values-gu-rIN/cm_strings.xml
@@ -541,7 +541,6 @@
   <string name="double_tap_to_sleep_summary">પ્રદર્શન બંધ કરવા સ્ટેટસ બાર પર ડબલ-ટૅપ કરો</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">આકસ્મિક વેક અપ રોકો</string>
-  <string name="proximity_wake_summary">સ્ક્રીન જગાવતા પહેલાં પ્રોક્સિમિટી સેન્સર ચકાસો</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">વેક ઑન પ્લગ</string>
   <string name="wake_when_plugged_or_unplugged_summary">પાવર સ્ત્રોત જોડો અથવા પરવાનગીું પાડો ત્યારે સ્ક્રીન ચાલુ કરો</string>
diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml
index 66b71c4..f4e9b56 100644
--- a/res/values-hi/cm_strings.xml
+++ b/res/values-hi/cm_strings.xml
@@ -473,7 +473,6 @@
   <string name="double_tap_to_sleep_summary">डिस्प्ले को बंद करने के लिए स्थिति पट्टी पर दो बार टैप करें</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">ग़लती से जगाए जाने को रोकें</string>
-  <string name="proximity_wake_summary">स्क्रीन को जगाने से पहले निकटता सेंसर को जाँचें</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">प्लग करने पर जागना</string>
   <string name="wake_when_plugged_or_unplugged_summary">पावर स्रोत से कनेक्ट करते समय या उससे डिसकनेक्ट करते समय स्क्रीन को चालू करें</string>
diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml
index 06c1cb8..6d14a1a 100644
--- a/res/values-hr/cm_strings.xml
+++ b/res/values-hr/cm_strings.xml
@@ -554,7 +554,7 @@
   <string name="double_tap_to_sleep_summary">Dvaput dodirnite statusnu traku za isključivanje zaslona</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Sprječavanje slučajnog buđenja</string>
-  <string name="proximity_wake_summary">Provjeri udaljenost senzora prije buđenja zaslona</string>
+  <string name="proximity_wake_summary">Provjerite senzor blizine prije buđenja aktivirano gestama</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Buđenje pri priključivanju</string>
   <string name="wake_when_plugged_or_unplugged_summary">Uključite zaslon prilikom spajanja ili odspajanja izvora napajanja</string>
diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml
index 47e01ea..0b1c4f3 100644
--- a/res/values-hu/cm_strings.xml
+++ b/res/values-hu/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Érintse meg kétszer az állapotsávot a kijelző kikapcsolásához</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Véletlen ébresztés megakadályozása</string>
-  <string name="proximity_wake_summary">Közelség érzékelő ellenőrzése a képernyő felébresztése előtt</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Felébredés töltő csatlakoztatásakor</string>
   <string name="wake_when_plugged_or_unplugged_summary">A képernyő bekapcsolása a töltő csatlakoztatása/eltávolítása után</string>
@@ -951,6 +950,10 @@
   <!-- [CHAR LIMIT=50] Like zen_mode_summary_selected_messages, but part of a list, so lower case if needed -->
   <string name="zen_mode_summary_selected_messages">kiválasztott üzenetek</string>
   <!-- Allow vibration in zen mode -->
+  <string name="zen_mode_vibration">Rezgés</string>
+  <string name="zen_mode_vibration_never">Ne rezegjen</string>
+  <string name="zen_mode_vibration_calls_only">Csak hívás esetén rezegjen</string>
+  <string name="zen_mode_vibration_calls_and_notifications">Hívások és értesítések esetén rezegjen</string>
   <!-- About phone settings screen, setting option dialog title to show regulatory information [CHAR LIMIT=25] -->
   <!-- SAR information -->
   <string name="maximum_head_level">Fej: %1$s W/kg</string>
@@ -1057,6 +1060,15 @@
   <string name="app_notification_no_ongoing_on_keyguard_title">Állandó értesítés tiltása a zárképernyőn</string>
   <string name="app_notification_no_ongoing_on_keyguard_summary">Ezen alkalmazáshoz tartozó állandó értesítés soha ne jelenjen meg a zárképernyőn</string>
   <!-- Notification sound timeout -->
+  <string name="app_notification_sound_timeout_title">Értesítési hangok közötti minimum időtartam</string>
+  <string name="app_notification_sound_timeout_summary_template">Hang vagy rezgés ismétlődésének engedélyezése: <xliff:g id="duration">%1$s</xliff:g></string>
+  <string name="app_notification_sound_timeout_value_none">Nincs korlátozás</string>
+  <string name="app_notification_sound_timeout_value_10_seconds">10 másodperc</string>
+  <string name="app_notification_sound_timeout_value_30_seconds">30 másodperc</string>
+  <string name="app_notification_sound_timeout_value_1_minute">1 perc</string>
+  <string name="app_notification_sound_timeout_value_5_minutes">5 perc</string>
+  <string name="app_notification_sound_timeout_value_15_minutes">10 perc</string>
+  <string name="app_notification_sound_timeout_value_30_minutes">30 perc</string>
   <!-- CmRadioInfo -->
   <string name="cm_radio_info_label">Fejlett rádiós vezérlés</string>
   <!-- Radio Control (IMS/MBN etc.) -->
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index f7d6f85..c3523a5 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -49,7 +49,7 @@
   <string name="root_access_all">Aplikasi dan ADB</string>
   <!-- Preference link for root appops -->
   <string name="root_appops_title">Kelola akses root</string>
-  <string name="root_appops_summary">Lihat dan kontrol aturan root</string>
+  <string name="root_appops_summary">Lihat dan kontrol aturan akses root</string>
   <!-- NFC PreferenceCategory title -->
   <string name="nfc_title_category">Komunikasi jarak dekat</string>
   <!-- About phone screen, CyanogenMod version -->
@@ -287,7 +287,7 @@
   <string name="led_notification_text">Lampu LED yang diaktifkan oleh pengaturan</string>
   <string name="notification_light_no_apps_summary">Untuk menambahkan kontrol pada setiap aplikasi, aktifkan \'%1$s\' dan tekan \'\u002b\' pada bilah menu</string>
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
-  <string name="enable_adb_cm">Perbaikan galat fungsi Android</string>
+  <string name="enable_adb_cm">Android debugging</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
   <string name="enable_adb_summary_cm">Aktifkan antarmuka Android Debug Bridge (adb)</string>
   <!-- Android debugging over WiFi -->
@@ -296,8 +296,8 @@
   <!-- Warning for Adb over Network -->
   <string name="adb_over_network_warning">PERINGATAN: Ketika ADB melalui jaringan diaktifkan, ponsel Anda terbuka terhadap intrusi pada semua jaringan yang terhubung!\n\nHanya gunakan fitur ini ketika Anda terhubung pada jaringan tepercaya\n\nApakah Anda benar-benar ingin mengaktifkan fungsi ini?</string>
   <!-- Setting checkbox summary for displaying USB debugging notification -->
-  <string name="adb_notify">Pemberitahuan perbaikan galat fungsi</string>
-  <string name="adb_notify_summary">Tampilkan pemberitahuan apabila perbaikan galat fungsi USB atau jaringan diaktifkan</string>
+  <string name="adb_notify">Pemberitahuan debugging</string>
+  <string name="adb_notify_summary">Tampilkan pemberitahuan bila USB atau jaringan debugging diaktifkan</string>
   <!-- Names of categories of app ops tabs - extension of AOSP -->
   <string name="app_ops_categories_location">Lokasi</string>
   <string name="app_ops_categories_personal">Pribadi</string>
@@ -464,7 +464,7 @@
   <string name="app_ops_reset_confirm_mesg">Apakah Anda yakin ingin mengatur ulang penghitung?</string>
   <string name="ok">Oke</string>
   <!-- Hostname setting -->
-  <string name="device_hostname">Nama hos perangkat</string>
+  <string name="device_hostname">Nama host perangkat</string>
   <string name="unlock_scramble_pin_layout_title">Tata letak acak</string>
   <string name="unlock_scramble_pin_layout_summary">Acak tata letak PIN saat membuka perangkat</string>
   <string name="button_pref_title">Tombol</string>
@@ -550,7 +550,6 @@
   <string name="double_tap_to_sleep_summary">Ketuk dua kali pada status bar untuk mematikan tampilan</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Mencegah bangun yang tidak disengaja</string>
-  <string name="proximity_wake_summary">Periksa sensor kedekatan sebelum membangunkan layar</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Bangun saat pengisi daya di pasang</string>
   <string name="wake_when_plugged_or_unplugged_summary">Aktifkan layar ketika menghubungkan atau melepaskan sumber daya</string>
@@ -694,9 +693,9 @@
   <!-- Sound settings, charging sounds label for ringtone == none -->
   <string name="power_notifications_ringtone_silent">Senyap</string>
   <!-- Status bar -->
-  <string name="status_bar_title">Bilah status</string>
+  <string name="status_bar_title">Status bar</string>
   <string name="status_bar_toggle_brightness">Kontrol kecerahan</string>
-  <string name="status_bar_toggle_brightness_summary">Sesuaikan kecerahan dengan menggeser di bilah status</string>
+  <string name="status_bar_toggle_brightness_summary">Sesuaikan kecerahan dengan menggeser di status bar</string>
   <string name="status_bar_notif_count_title">Tampilkan hitungan pemberitahuan</string>
   <string name="status_bar_notif_count_summary">Tampilkan jumlah pemberitahuan yang tertunda</string>
   <string name="status_bar_quick_qs_pulldown_title">Keruntuhan cepat</string>
@@ -737,7 +736,7 @@
   <string name="edge_gesture_service_summary">Jangan kirim acara sentuhan untuk navigasi dan gerakan bar status untuk aplikasi</string>
   <!-- Keep screen on strings -->
   <string name="keep_screen_on_never">Tidak pernah</string>
-  <string name="keep_screen_on_debugging">Saat perbaikan galat fungsi USB</string>
+  <string name="keep_screen_on_debugging">Saat USB debugging</string>
   <string name="keep_screen_on_charging">Saat mengisi daya</string>
   <!-- Privacy Settings Header item -->
   <string name="privacy_settings_cyanogenmod_title">Privasi</string>
@@ -895,7 +894,7 @@
         <![CDATA[<b>Nama:</b> <xliff:g id="name">%1$s</xliff:g><br/><br/>
                  <b>Nick:</b> <xliff:g id="nick">%2$s</xliff:g><br/><br/>
                  <b>Commits:</b> <xliff:g id="commits">%3$s</xliff:g>]]></string>
-  <string name="contributions_info_menu">Info sumbangan</string>
+  <string name="contributions_info_menu">Info kontribusi</string>
   <string name="contributions_info_msg">
 <![CDATA[<b>Jumlah kontributor:</b> <xliff:g id="total_contributors">%1$s</xliff:g><br/><br/>
                  <b>Jumlah kontribusi:</b> <xliff:g id="total_commits">%2$s</xliff:g><br/><br/>
diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml
index 7f787d4..36dcfa6 100644
--- a/res/values-it/cm_strings.xml
+++ b/res/values-it/cm_strings.xml
@@ -166,7 +166,7 @@
   <string name="profile_lockmode_title">Modalità blocco schermo</string>
   <string name="profile_lockmode_policy_disabled_summary">I profili sono stati disattivati dall\'amministratore</string>
   <string name="profile_lockmode_insecure_summary">Non chiedere password o PIN</string>
-  <string name="profile_lockmode_disabled_summary">Disattiva schermata di blocco</string>
+  <string name="profile_lockmode_disabled_summary">Disattiva blocco schermo</string>
   <string name="profile_airplanemode_title">Modalità aereo</string>
   <string name="profile_brightness_title">Luminosità schermo</string>
   <string name="profile_brightness_override_summary">Imposta su %1$d%%</string>
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Doppio tocco sulla barra di stato per spegnere il display</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Previeni risvegli accidentali</string>
-  <string name="proximity_wake_summary">Controlla il sensore di prossimità prima di accendere lo schermo</string>
+  <string name="proximity_wake_summary">Controla il sensore di prossimità prima di risvegliare lo smartphone con le gesture</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Risveglia al collegamento</string>
   <string name="wake_when_plugged_or_unplugged_summary">Accendi lo schermo quando si collega o si scollega l\'alimentazione</string>
@@ -580,7 +580,7 @@
   <string name="display_rotation_title">Rotazione schermo</string>
   <string name="display_rotation_disabled">Disattivata</string>
   <string name="display_rotation_unit">gradi</string>
-  <string name="display_lockscreen_rotation_title">Rotazione schermata blocco</string>
+  <string name="display_lockscreen_rotation_title">Rotazione blocco schermo</string>
   <string name="display_rotation_category_title">Modalità rotazione schermo</string>
   <string name="display_rotation_0_title">0 gradi</string>
   <string name="display_rotation_90_title">90 gradi</string>
@@ -771,8 +771,8 @@
   <string name="lockscreen_visualizer_title">Mostra visualizzatore musicale</string>
   <!-- lock screen disabled by QS tile warning -->
   <string name="lockscreen_disabled_by_qs_tile_title">Disattivata dai tile</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary">Tocca per attivare la schermata di blocco</string>
-  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Schermata di blocco attiva!</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary">Tocca per attivare il blocco schermo</string>
+  <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Blocco schermo attivo!</string>
   <!-- Battery saver -->
   <string name="battery_saver_threshold">Soglia risparmio energetico</string>
   <string name="battery_saver_summary">Riduce le prestazioni e limita i dati in background</string>
@@ -906,7 +906,7 @@
                  <b>Ultimo aggiornamento:</b> <xliff:g id="date">%3$s</xliff:g>]]></string>
   <string name="category_sounds">Suoni</string>
   <string name="notification_manager">Notifiche</string>
-  <string name="lockscreen_settings">Schermata di blocco</string>
+  <string name="lockscreen_settings">Blocco schermo</string>
   <string name="category_lights">Luci</string>
   <string name="category_volume">Volume</string>
   <string name="category_vibrate">Vibrazione</string>
@@ -1058,10 +1058,10 @@
   <!-- title for lock screen weather preference -->
   <string name="lockscreen_weather_enabled_title">Mostra meteo</string>
   <!-- Per app controls for LP keyguard notifications -->
-  <string name="app_notification_show_on_keyguard_title">Mostra nella schermata di blocco</string>
-  <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nella schermata di blocco</string>
-  <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nella schermata di blocco</string>
-  <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nella schermata di blocco</string>
+  <string name="app_notification_show_on_keyguard_title">Mostra nel blocco schermo</string>
+  <string name="app_notification_show_on_keyguard_summary">Mostra notifiche di quest\'app nel blocco schermo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_title">Disabilita la notifica persistente nel blocco schermo</string>
+  <string name="app_notification_no_ongoing_on_keyguard_summary">Non mostrare mai notifiche persistenti da quest\'app nel blocco schermo</string>
   <!-- Notification sound timeout -->
   <string name="app_notification_sound_timeout_title">Tempo minimo tra suoni di notifica</string>
   <string name="app_notification_sound_timeout_summary_template">Consenti suoni o vibrazioni non più di una volta ogni <xliff:g id="duration">%1$s</xliff:g></string>
diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml
index bed3476..e1e0d56 100644
--- a/res/values-iw/cm_strings.xml
+++ b/res/values-iw/cm_strings.xml
@@ -556,7 +556,6 @@
   <string name="double_tap_to_sleep_summary">הקש פעמיים בשורת המצב כדי לכבות את המסך</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">מנע התעוררות מקרית</string>
-  <string name="proximity_wake_summary">בדוק את חיישן הקרבה לפני הפעלת המסך</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">הער מסך בעת חיבור</string>
   <string name="wake_when_plugged_or_unplugged_summary">הפעל את המסך כאשר מקור חשמל מתחבר או מתנתק מהמכשיר</string>
@@ -1079,6 +1078,14 @@
   <!-- Radio Control (IMS/MBN etc.) -->
   <string name="cm_radio_info_mbn_auto_load_on_label">כיבוי טעינת MBN אוטומטית</string>
   <string name="cm_radio_info_mbn_auto_load_off_label">הפעלת טעינת MBN אוטומטית</string>
+  <string name="cm_radio_info_volte_avail_ovr_on_label">כיבוי איתור באגים VoLTE</string>
+  <string name="cm_radio_info_volte_avail_ovr_off_label">הפעלת איתור באגים VoLTE</string>
+  <string name="cm_radio_info_vt_avail_ovr_on_label">כיבוי איתור באגים VT</string>
+  <string name="cm_radio_info_vt_avail_ovr_off_label">הפעלת איתור באגים VT</string>
+  <string name="cm_radio_info_wfc_avail_ovr_on_label">כיבוי איתור באגים WFC</string>
+  <string name="cm_radio_info_wfc_avail_ovr_off_label">הפעלת איתור באגים WFC</string>
+  <string name="cm_radio_info_adb_log_on_label">כיבוי תיעוד רדיו ADB</string>
+  <string name="cm_radio_info_adb_log_off_label">הפעלת תיעוד רדיו ADB</string>
   <!-- Lock screen wallpaper -->
   <string name="lockscreen_wallpaper_title">טפט</string>
   <string name="not_available_with_app">לא זמין עם %1$s</string>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index bef24d6..1661f38 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -289,7 +289,7 @@
   <!-- Setting checkbox title for Whether to enable Android debugging support on the phone. -->
   <string name="enable_adb_cm">Androidデバッグ</string>
   <!-- Setting checkbox summary for Whether to enable Android debugging support on the phone -->
-  <string name="enable_adb_summary_cm">Androidデバッグブリッジ（ADB）インターフェースを有効にする</string>
+  <string name="enable_adb_summary_cm">Android Debug Bridge（ADB）インターフェースを有効にする</string>
   <!-- Android debugging over WiFi -->
   <string name="adb_over_network">ネットワーク経由のADB</string>
   <string name="adb_over_network_summary">ネットワークインターフェース（Wi\u2011Fi、USBネットワーク）経由でのTCP/IPデバッグを有効にします。この設定は再起動時にリセットされます。</string>
@@ -550,7 +550,7 @@
   <string name="double_tap_to_sleep_summary">ステータスバーをダブルタップしてディスプレイを消灯する</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">誤作動を防止</string>
-  <string name="proximity_wake_summary">画面をスリープ解除する前に接近センサーを確認する</string>
+  <string name="proximity_wake_summary">ジェスチャーでスリープ解除する前に接近センサーを確認する</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">接続時にスリープ解除</string>
   <string name="wake_when_plugged_or_unplugged_summary">電源を接続または切断したときに画面を点灯する</string>
@@ -784,7 +784,7 @@
   <!-- Sound & notification > Sound section: Title for the option defining the default notification ringtone. [CHAR LIMIT=30] -->
   <string name="notification_ringtone_title_cm">通知音</string>
   <!-- Advanced reboot options -->
-  <string name="advanced_reboot_title">高度な再起動</string>
+  <string name="advanced_reboot_title">再起動のオプション</string>
   <string name="advanced_reboot_summary">ロック解除時に、電源メニューにリカバリーやブートローダで再起動したり、ソフトリブートを行うオプションを含める</string>
   <string name="category_interface">インターフェース</string>
   <!-- Expanded desktop -->
@@ -878,7 +878,7 @@
   <string name="menu_hidden_apps_delete">リセット</string>
   <string name="menu_hidden_apps_reset_lock">パターンロックをリセット</string>
   <string name="protected_apps">アプリの保護</string>
-  <string name="protected_apps_summary">パスワードでロックしている時に非表示にするアプリを管理する</string>
+  <string name="protected_apps_summary">パスワードでロックしている場合に非表示にするアプリを管理する</string>
   <string name="saving_protected_components">コンポーネントの状態を保存中\u2026</string>
   <string name="pa_login_username_hint">ユーザー名（メール）</string>
   <string name="pa_login_password_hint">パスワード</string>
diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml
index 54c33f1..ba364e9 100644
--- a/res/values-kn-rIN/cm_strings.xml
+++ b/res/values-kn-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">ಪ್ರದರ್ಶನವನ್ನು ಆಫ್ ಮಾಡಲು ಸ್ಟೇಟಸ್ ಬಾರ್‍ ಮೇಲೆ ದ್ವಿಗುಣ-ಸ್ಪರ್ಶಿಸಿ</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">ಆಕಸ್ಮಿಕವಾಗಿ ಎಚ್ಚರವಾಗುವಿಕೆಯನ್ನು ತಡೆ</string>
-  <string name="proximity_wake_summary">ಪರದೆಯನ್ನು ಎಚ್ಚರಿಸುವ ಮೊದಲು ಸಾಮೀಪ್ಯ ಸಂವೇದಕವನ್ನು ಪರಿಶೀಲಿಸು</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">ಪ್ಲಗ್‍ಮಾಡಿದಾಗ ಎಚ್ಚರವಾಗು</string>
   <string name="wake_when_plugged_or_unplugged_summary">ವಿದ್ಯುತ್ ಮೂಲವನ್ನು ಸಂಪರ್ಕಿಸಿದಾಗ ಅಥವಾ ಅಸಂಪರ್ಕಿಸಿದಾಗ ಪರದೆಯನ್ನು ಆನ್ ಮಾಡು</string>
diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml
index 2e5909a..b43bedd 100644
--- a/res/values-ko/cm_strings.xml
+++ b/res/values-ko/cm_strings.xml
@@ -542,7 +542,6 @@
   <string name="double_tap_to_sleep_summary">상태 표시줄에 더블 탭하여 화면 끄기</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">실수로 화면 켜기 방지</string>
-  <string name="proximity_wake_summary">화면을 켜기 전에 근접 센서 확인</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">충전 시 켜짐</string>
   <string name="wake_when_plugged_or_unplugged_summary">전원이 연결되거나 분리될 때 화면 켜기</string>
diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml
index 5563cdf..ea43ac9 100644
--- a/res/values-ku/cm_strings.xml
+++ b/res/values-ku/cm_strings.xml
@@ -443,7 +443,6 @@
   <string name="double_tap_to_sleep_summary">دوجار دەستبدە لە شریتی دۆخ بۆ کوژانەوەی پیشاندان</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">قه‌ده‌غه‌کردنی هه‌ستانی ڕێکه‌وت</string>
-  <string name="proximity_wake_summary">هه‌ستیاری نزیکی بپشکنه‌ بۆ هه‌ستانی ڕوونما</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">هەڵسان لە پلاگ</string>
   <string name="wake_when_plugged_or_unplugged_summary">کردنەوەی ڕۆشای ڕوونماکە لە کاتی پەیوەندکردن یان پچڕانی لەکارەبا</string>
diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml
index f1a690d..6eba308 100644
--- a/res/values-lb/cm_strings.xml
+++ b/res/values-lb/cm_strings.xml
@@ -520,7 +520,6 @@
   <string name="double_tap_to_sleep_summary">Zweemol drécken op der Statusläischt mécht de Schierm aus</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Onbeofsiichtegt waakreg maache verhënneren</string>
-  <string name="proximity_wake_summary">Virum waakreg maachen de Proximitéitssensor iwwerpréiwen</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Beim Astieche waakreg maachen</string>
   <string name="wake_when_plugged_or_unplugged_summary">De Schierm uschalte wann eng Stroumquell ugeschloss oder getrennt gëtt</string>
diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml
index 4d9d03c..9e3f59a 100644
--- a/res/values-lt/cm_strings.xml
+++ b/res/values-lt/cm_strings.xml
@@ -478,7 +478,6 @@
   <string name="double_tap_to_sleep_summary">Dukart bakstelėti būsenos juostą, kad išjungti ekraną</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Išvengti atsitiktinio pažadinimo</string>
-  <string name="proximity_wake_summary">Patikrinti artumo jutiklio prioritetą, kad pažadinti ekraną</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Pažadinti, kai prijungiama</string>
   <string name="wake_when_plugged_or_unplugged_summary">Įjungti ekraną, kai prijungiamas ar atjungiamas maitinimo šaltinis</string>
diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml
index afe0271..dd4a947 100644
--- a/res/values-lv/cm_strings.xml
+++ b/res/values-lv/cm_strings.xml
@@ -345,7 +345,6 @@
   <string name="double_tap_to_sleep_title">Lai iemidzinātu, veiciet dubultu piesitienu</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Novērsiet nejaušu pamodināšanu</string>
-  <string name="proximity_wake_summary">Pirms pamodināt ekrānu, pārbaudīt tuvuma sensoru</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Pamodināt, iespraužot vadu</string>
   <string name="wake_when_plugged_or_unplugged_summary">Pievienojot, vai atvienojot no barošanas avota, ieslēgt ekrānu</string>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index 74aa63b..b5106cc 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">ഡിസ്പ്ലേ ഓഫ് ചെയ്യുന്നതിന് സ്റ്റാറ്റസ് ബാറിൽ ഇരട്ട-അമര്‍ത്തല്‍ ചെയ്യുക</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">യാദൃച്ഛികമായി സജീവമാകുന്നത് തടയുക</string>
-  <string name="proximity_wake_summary">സ്ക്രീൻ സജീവമാകുന്നതിന് മുമ്പ് പ്രോക്സിമിറ്റി സെൻസർ പരിശോധിക്കുക</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">വേക്ക് ഓൺ പ്ലഗ്</string>
   <string name="wake_when_plugged_or_unplugged_summary">ഒരു ഊര്‍ജ്ജ സ്രോതസ്സില്‍ ബന്ധിപ്പിക്കുമ്പോള്‍ അല്ലെങ്കില്‍ വിച്ഛേദിക്കുമ്പോൾ സ്ക്രീന്‍ ഓണ്‍ ചെയ്യുക</string>
diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml
index abbc6d7..bb361d8 100644
--- a/res/values-mr-rIN/cm_strings.xml
+++ b/res/values-mr-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">प्रदर्शन बंद करण्यासाठी स्थिती बारवर दुहेरी-टॅप करा</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">अपघाताने जागे करण्यास प्रतिबंध करा</string>
-  <string name="proximity_wake_summary">स्क्रीनला जागे करण्यापूर्वी प्रॉक्सिमिटी सेन्सर तपासा</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">जागे व्हा प्लग</string>
   <string name="wake_when_plugged_or_unplugged_summary">पॉवर स्त्रोत कनेक्ट किंवा डिस्कनेक्ट करताना हा स्क्रीन चालू करा</string>
diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml
index c040cb4..ac7380e 100644
--- a/res/values-nb/cm_strings.xml
+++ b/res/values-nb/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Dobbelttapp på statuslinjen for å slå av skjermen</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Hindre utilsiktet vekking</string>
-  <string name="proximity_wake_summary">Sjekk nærhetssensoren før skjermen vekkes</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Våkne ved tilkobling av strøm</string>
   <string name="wake_when_plugged_or_unplugged_summary">Slå skjermen på når du kobler til eller kobler fra en strømkilde</string>
diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml
index 39c78ae..0431376 100644
--- a/res/values-nl/cm_strings.xml
+++ b/res/values-nl/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Dubbeltikken op de statusbalk voor slaapstand</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Per ongeluk ontwaken voorkomen</string>
-  <string name="proximity_wake_summary">Nabijheidssensor gebruiken voorafgaand aan ontwaken van scherm</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Ontwaken door lader</string>
   <string name="wake_when_plugged_or_unplugged_summary">Scherm aan bij het aansluiten of loskoppelen van een lader</string>
diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml
index 8215e5f..e2fccf9 100644
--- a/res/values-or-rIN/cm_strings.xml
+++ b/res/values-or-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">ଡିସ୍‍ପ୍ଲେ ଅଫ୍‍ କରିବା ପାଇଁ ଷ୍ଟାଟସ୍‍ ବାର୍‍ରେ ଦୁଇଥର ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">ର୍ଆକ୍ସିଡେଂଟାଲ୍‍ ୱେକ୍‍-ଅପ୍‍ ପ୍ରତିରୋଧ କରନ୍ତୁ</string>
-  <string name="proximity_wake_summary">ସ୍କ୍ରିନ୍‍କୁ ଜଗାଇବା ପୂର୍ବରୁ ନିକଟ ସେନସର୍ ପରୀକ୍ଷିତ କରନ୍ତୁ</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">ପ୍ଲଗ୍‍କୁ ଉଠାନ୍ତୁ</string>
   <string name="wake_when_plugged_or_unplugged_summary">ଏକ ପାୱାର୍‍ ଉତ୍ସ ସଂଯୋଗ ବା ବିଛିନ୍ନ କରିବା ସମୟରେ ସ୍କ୍ରିନ୍‍ ଅନ୍‍ କରନ୍ତୁ</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 7f88a3f..fdd5655 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -548,7 +548,6 @@
   <string name="double_tap_to_sleep_summary">Dotknij dwukrotnie pasek stanu, aby zablokować ekran</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zapobiega przypadkowemu wybudzeniu</string>
-  <string name="proximity_wake_summary">Używaj czujnika zbliżeniowego podczas wybudzania ekranu</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Wybudź przy podłączaniu</string>
   <string name="wake_when_plugged_or_unplugged_summary">Włącz ekran podczas podłączania i odłączania od źródła zasilania</string>
diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml
index 9c69303..40deacb 100644
--- a/res/values-pt-rBR/cm_strings.xml
+++ b/res/values-pt-rBR/cm_strings.xml
@@ -552,7 +552,6 @@
   <string name="double_tap_to_sleep_summary">Toque duas vezes na barra de status para desligar a tela</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Evitar despertar acidental</string>
-  <string name="proximity_wake_summary">Verificar sensor de proximidade antes de despertar a tela</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Acordar ao plugar</string>
   <string name="wake_when_plugged_or_unplugged_summary">Ativar a tela ao ligar ou desligar do carregador</string>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index de79942..05de7cd 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -243,7 +243,7 @@
   <string name="navigation_bar_reset_message">Eliminar as definições atuais e restaurar o esquema padrão?</string>
   <string name="navigation_bar_arrow_keys_title">Mostrar teclas de seta enquanto escreve</string>
   <string name="navigation_bar_arrow_keys_summary">Mostrar os botões de cursor para a esquerda e para a direita enquanto escreve. Sobrepõe-se à definição do teclado.</string>
-  <string name="navigation_bar_recents_title">Ação de pressão longa no botão de aplicações recentes</string>
+  <string name="navigation_bar_recents_title">Ação de pressão longa no botão de Visão geral</string>
   <!-- Notification light dialogs -->
   <string name="edit_light_settings">Editar definições de luz</string>
   <string name="pulse_speed_title">Duração e velocidade da luz ao piscar</string>
@@ -471,11 +471,11 @@
   <string name="unlock_scramble_pin_layout_summary">Apresentar aleatoriamente a disposição do teclado numérico, quando desbloquear com PIN</string>
   <string name="button_pref_title">Botões</string>
   <string name="hardware_keys_power_key_title">Botão ligar/desligar</string>
-  <string name="hardware_keys_home_key_title">Botão Home</string>
-  <string name="hardware_keys_back_key_title">Botão voltar</string>
+  <string name="hardware_keys_home_key_title">Botão Página Inicial</string>
+  <string name="hardware_keys_back_key_title">Botão Anterior</string>
   <string name="hardware_keys_menu_key_title">Botão Menu</string>
-  <string name="hardware_keys_assist_key_title">Botão Pesquisa</string>
-  <string name="hardware_keys_appswitch_key_title">Botão de aplicações recentes</string>
+  <string name="hardware_keys_assist_key_title">Botão de pesquisa</string>
+  <string name="hardware_keys_appswitch_key_title">Botão de Visão geral</string>
   <string name="hardware_keys_camera_key_title">Botão da câmara</string>
   <string name="hardware_keys_volume_keys_title">Botões de volume</string>
   <string name="hardware_keys_short_press_title">Pressão rápida</string>
@@ -490,7 +490,7 @@
   <string name="hardware_keys_action_launch_camera">Iniciar a câmara</string>
   <string name="hardware_keys_action_sleep">Desligar o ecrã</string>
   <string name="hardware_keys_action_last_app">Última aplicação</string>
-  <string name="camera_sleep_on_release_title">Vista rápida</string>
+  <string name="camera_sleep_on_release_title">Apresentação rápida</string>
   <string name="camera_sleep_on_release_summary">Pressionar até metade irá manter o ecrã ligado apenas enquanto o botão estiver pressionado</string>
   <string name="camera_launch_title">Iniciar a câmara</string>
   <string name="camera_launch_summary">Pressionar algum tempo e depois soltar iniciará a câmara</string>
@@ -506,12 +506,12 @@
   <string name="swap_volume_buttons_summary">Trocar os botões de volume quando o ecrã é rodado</string>
   <string name="button_wake_title">Acordar o dispositivo</string>
   <string name="home_answer_call_title">Atender chamada</string>
-  <string name="home_answer_call_summary">Pressionar o botão Home irá atender a chamada recebida atual</string>
+  <string name="home_answer_call_summary">Pressionar o botão Página Inicial irá atender a chamada recebida atual</string>
   <!-- Backlight brightness settings screen -->
   <string name="adaptive_backlight_title">Luz de fundo adaptativa</string>
   <string name="adaptive_backlight_summary">Variar de forma inteligente a luz de fundo do ecrã para ajudar a maximizar a vida da bateria</string>
   <!-- Sunlight readability enhancement screen -->
-  <string name="sunlight_enhancement_title">Melhoramento do ecrã</string>
+  <string name="sunlight_enhancement_title">Melhoramento do ecrã sob luz solar</string>
   <string name="sunlight_enhancement_summary">Aumentar a luminosidade e legibilidade do ecrã sob luz solar brilhante</string>
   <!-- Color enhancement settings screen -->
   <string name="color_enhancement_title">Realce de cor</string>
@@ -552,7 +552,7 @@
   <string name="double_tap_to_sleep_summary">Dê um toque duplo na barra de estado para desligar o dispositivo</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Impedir o ecrã de se ligar acidentalmente</string>
-  <string name="proximity_wake_summary">Verificar o sensor de proximidade antes de ligar o ecrã</string>
+  <string name="proximity_wake_summary">Verificar o sensor de proximidade antes de acordar o dispositivo com gestos</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Ligar ecrã ao detetar carregador</string>
   <string name="wake_when_plugged_or_unplugged_summary">Ativar o ecrã quando conectar ou desconectar uma fonte de energia</string>
@@ -660,7 +660,7 @@
   <string name="gestures_double_spen_title_head">Duplo toque</string>
   <!-- Gestures Options -->
   <string name="gestures_action_empty">Sem ação</string>
-  <string name="gestures_action_home">Home</string>
+  <string name="gestures_action_home">Página Inicial</string>
   <string name="gestures_action_back">Voltar</string>
   <string name="gestures_action_menu">Menu</string>
   <string name="gestures_action_search">Invocar pesquisa</string>
@@ -801,8 +801,8 @@
   <string name="expanded_desktop_style_description">Escolha o estilo padrão da área de trabalho expandida</string>
   <string name="expanded_desktop_title">Opções da área de trabalho expandida</string>
   <!-- Kill app long-press back -->
-  <string name="kill_app_longpress_back">Fechar aplicação no botão Voltar</string>
-  <string name="kill_app_longpress_back_summary">Fechar a aplicação em primeiro plano com pressão longa no botão Voltar</string>
+  <string name="kill_app_longpress_back">Fechar aplicação no botão Anterior</string>
+  <string name="kill_app_longpress_back_summary">Fechar a aplicação em primeiro plano com pressão longa no botão Anterior</string>
   <!-- Show/Hide Search Bar -->
   <string name="recents_show_searchbar">Mostrar a barra de pesquisa no menu de aplicações recentes</string>
   <string name="keywords_recents_show_searchbar">recente recentes desativar ativar mostrar ocultar pesquisa barra barra de pesquisa</string>
@@ -834,7 +834,7 @@
   <string name="blacklist_summary_type_calls_only">chamadas</string>
   <string name="blacklist_summary_type_messages_only">mensagens</string>
   <string name="blacklist_summary_type_calls_and_messages">chamadas e mensagens</string>
-  <string name="blacklist_regex_title">Utilizar caracteres especiais</string>
+  <string name="blacklist_regex_title">Utilizar expressões regulares</string>
   <string name="blacklist_regex_summary">Use . como um joker e * para repetição. Por exemplo, 123.* bloqueia números que comecem com 123 e .*123.* bloqueia números que contenham 123</string>
   <string name="blacklist_policy_block_calls">Bloquear chamadas recebidas</string>
   <string name="blacklist_policy_block_messages">Bloquear mensagens recebidas</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index e69e7e7..2ca0aaf 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -512,7 +512,6 @@
   <string name="double_tap_to_sleep_summary">Atingeți de două ori bara de stare pentru a dezactiva afișarea</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Previne trezirea accidentală</string>
-  <string name="proximity_wake_summary">Verificați senzorul de proximitate înainte de trezirea ecranului</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Trezire la alimentare</string>
   <string name="wake_when_plugged_or_unplugged_summary">Aprinde ecranul când se conectează sau deconectează sursa de alimentare</string>
diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml
index cc66a60..57834ea 100644
--- a/res/values-ru/cm_strings.xml
+++ b/res/values-ru/cm_strings.xml
@@ -554,7 +554,7 @@
   <string name="double_tap_to_sleep_summary">Дважды коснитесь строки состояния, чтобы перевести устройство в спящий режим</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Предотвращать случайное включение</string>
-  <string name="proximity_wake_summary">Проверять датчик приближения при выходе из режима сна</string>
+  <string name="proximity_wake_summary">Проверять датчик приближения при выходе из режима сна с использованием жестов</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Включение при зарядке</string>
   <string name="wake_when_plugged_or_unplugged_summary">Включать экран при подключении или отключении источника питания</string>
diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml
index 50dca18..e0df1e7 100644
--- a/res/values-si-rLK/cm_strings.xml
+++ b/res/values-si-rLK/cm_strings.xml
@@ -353,7 +353,6 @@
   <string name="double_tap_to_sleep_title">දෙවරක් තට්ටුකර නිදිකරවන්න</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">අහඹු අවදි වීම් වළක්වන්න</string>
-  <string name="proximity_wake_summary">තිරය අවදි කිරීමට පෙර සන්නිකර්ෂණ සංවේදකය පරීක්ෂා කරන්න</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">පේණුගත කලවිට ඇහැරවන්න</string>
   <string name="wake_when_plugged_or_unplugged_summary">බල මූලාශ්‍රය සම්බන්ධ කිරීමේදී හෝ විසන්ධි කිරීමේදී තිරය ඇහැරවන්න</string>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index b26f2b9..a939e05 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -478,7 +478,6 @@
   <string name="double_tap_to_sleep_summary">Vypnúť displej dvojitým poklepaním na stavový riadok</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Zabrániť nechcenému prebudeniu</string>
-  <string name="proximity_wake_summary">Kontrolovať snímač priblíženia pre zabránenie nechcenému prebudeniu</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Prebudiť po pripojení</string>
   <string name="wake_when_plugged_or_unplugged_summary">Zapnúť obrazovku pri pripojení alebo odpojení zdroja nabíjania</string>
diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml
index f733730..b3d9f91 100644
--- a/res/values-sl/cm_strings.xml
+++ b/res/values-sl/cm_strings.xml
@@ -215,7 +215,7 @@
   <string name="profile_tabs_bluetooth">Bluetooth</string>
   <string name="profile_tabs_nfc">NFC</string>
   <string name="profile_triggers_header">Sprožilci, ki bodo omogočili ta profil</string>
-  <string name="profile_setup_setup_triggers_title">1. korak: Dodajanje sprožilcev</string>
+  <string name="profile_setup_setup_triggers_title">1. korak: dodajanje sprožilcev</string>
   <string name="profile_setup_setup_triggers_title_config">Spreminjanje sprožilcev: <xliff:g id="profile_name">%1$s </xliff:g></string>
   <string name="profile_setup_actions_title">Korak 2: Nastavitev dejanj</string>
   <string name="profile_setup_actions_title_config">Ponovna nastavitev dejanj</string>
@@ -268,7 +268,7 @@
   <string name="pulse_speed_slow">Počasna</string>
   <string name="pulse_speed_very_slow">Zelo počasna</string>
   <!-- Battery light settings -->
-  <string name="battery_light_title">Lučka baterije</string>
+  <string name="battery_light_title">Lučka za baterijo</string>
   <string name="battery_low_pulse_title">Utripaj, če je bat. skoraj prazna</string>
   <string name="battery_light_list_title">Barve</string>
   <string name="battery_light_low_color_title">Nizko stanje bat.</string>
@@ -556,7 +556,7 @@
   <string name="double_tap_to_sleep_summary">Dvakrat tapnite na vrstico stanja, da izklopite zaslon</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Prepreči nenamerno bujenje</string>
-  <string name="proximity_wake_summary">Pred bujenjem zaslona preveri tipalo bližine</string>
+  <string name="proximity_wake_summary">Pred bujenjem zaslona s potezami preveri tipalo bližine</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Zbudi ob priključitvi napajalnika</string>
   <string name="wake_when_plugged_or_unplugged_summary">Vklopi zaslon ob priključitvi/izključitvi napajanja</string>
@@ -774,7 +774,7 @@
   <!-- lock screen visualizer -->
   <string name="lockscreen_visualizer_title">Prikaži predočilnik glasbe</string>
   <!-- lock screen disabled by QS tile warning -->
-  <string name="lockscreen_disabled_by_qs_tile_title">Onemogočeno s ploščico hitrih nastavitev</string>
+  <string name="lockscreen_disabled_by_qs_tile_title">Onemogočeno s ploščico Hitrih nastavitev</string>
   <string name="lockscreen_disabled_by_qs_tile_summary">Tapnite, da omogočite zaklenjen zaslon</string>
   <string name="lockscreen_disabled_by_qs_tile_summary_enabled">Zaklepanje zaslona omogočeno!</string>
   <!-- Battery saver -->
@@ -801,8 +801,8 @@
   <string name="expanded_hide_both">Skrij oboje</string>
   <string name="expanded_nothing_to_show">Za dodajanje prilagojenih nastavitev za posamezno aplikacijo za razširjeno stanje nastavite \'Omogočeno za vse\' v izklopljen položaj</string>
   <string name="expanded_enabled_for_all">Omogočeno za vse</string>
-  <string name="expanded_desktop_style">Razširjen slog namizja</string>
-  <string name="expanded_desktop_style_description">Izberite privzeti razširjen slog namizja</string>
+  <string name="expanded_desktop_style">Slog razširjenega namizja</string>
+  <string name="expanded_desktop_style_description">Izberite privzeti slog razširjenega namizja</string>
   <string name="expanded_desktop_title">Možnosti razširjenega namizja</string>
   <!-- Kill app long-press back -->
   <string name="kill_app_longpress_back">Gumb Nazaj uniči aplikacijo</string>
diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml
index 5899a9e..897ad01 100644
--- a/res/values-sr/cm_strings.xml
+++ b/res/values-sr/cm_strings.xml
@@ -554,7 +554,6 @@
   <string name="double_tap_to_sleep_summary">Двапут додирни статусну траку да искључиш дисплеј</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Спречи случајно буђење</string>
-  <string name="proximity_wake_summary">Провери растојање сензора пре буђења екрана</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Пробуди на утикачу</string>
   <string name="wake_when_plugged_or_unplugged_summary">Укључи екран код повезивања или искључивања са извора напајања</string>
diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml
index ef8a8ff..672a107 100644
--- a/res/values-sv/cm_strings.xml
+++ b/res/values-sv/cm_strings.xml
@@ -542,7 +542,6 @@
   <string name="double_tap_to_sleep_summary">Dubbeltryck på statusfältet för att stänga av skärmen</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Förhindra oavsiktlig väckning</string>
-  <string name="proximity_wake_summary">Kontrollera närhetssensorn innan väckning av skärmen</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Vakna vid koppling</string>
   <string name="wake_when_plugged_or_unplugged_summary">Starta skärmen vid anslutning till eller frånkoppling från strömkälla</string>
diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml
index 9723e6a..cd48448 100644
--- a/res/values-ta-rIN/cm_strings.xml
+++ b/res/values-ta-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">காட்சியை ஆஃப் செய்ய நிலை பட்டை மீது இருமுறை தட்டு</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">தற்செயலான விழித்தலை தடு</string>
-  <string name="proximity_wake_summary">திரையை விழிப்லாக்வதற்கு முன்பாக அருகாமை சென்சரை சரிபார்க்கவும்</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">பிளக் செய்தால் விழி</string>
   <string name="wake_when_plugged_or_unplugged_summary">ஒரு மின் வளத்தை இணைத்தல் அல்லது துண்டித்தலின் போது திரையை ஆன் செய்க</string>
diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml
index dd01b03..17f4473 100644
--- a/res/values-te-rIN/cm_strings.xml
+++ b/res/values-te-rIN/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">డిస్ప్లేను ఆపివేయడానికి స్టేటస్ బార్ పైన రెండుసార్లు ట్యాప్ చేయండి</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">అప్రయత్నంగా మేల్కొల్పబడటాన్ని నివారించండి</string>
-  <string name="proximity_wake_summary">స్క్రీనును ఉపయోగించే ముందు సమీప సెన్సారును పరిశీలించండి</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">మేల్కొలుపు ప్లగ్</string>
   <string name="wake_when_plugged_or_unplugged_summary">విద్యుత్ ఆధారాన్ని అనుసంధానం చేసేటప్పుడు లేదా తొలిగించేటప్పుడు స్క్రీనును ఆన్ చేయండి</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 78fa4f9..552cb21 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -542,7 +542,6 @@
   <string name="double_tap_to_sleep_summary">แตะสองครั้งที่แถบสถานะเพื่อปิดหน้าจอ</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">ป้องกันการเปิดหน้าจอโดยไม่เจตนา</string>
-  <string name="proximity_wake_summary">ตรวจสอบเซนเซอร์แนบหน้าจอก่อนเปิดหน้าจอ</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">ตื่นเมื่อเสียบปลั๊ก</string>
   <string name="wake_when_plugged_or_unplugged_summary">เปิดหน้าจอเมื่อเชื่อมต่อหรือตัดการเชื่อมต่อกับแหล่งจ่ายไฟ</string>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index ae68928..aaa9af3 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -543,7 +543,6 @@
   <string name="double_tap_to_sleep_summary">Ekranı kapatmak için durum çubuğuna iki defa dokunun</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Yanlış uyandırmaları önle</string>
-  <string name="proximity_wake_summary">Ekranı açmadan önce yakınlık sensörünü kontrol et</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Takıp çıkarmada uyan</string>
   <string name="wake_when_plugged_or_unplugged_summary">Bir güç kaynağına bağlanırken ya da bağlantısını keserken ekranı aç</string>
diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml
index 4735743..45c6499 100644
--- a/res/values-ug/cm_strings.xml
+++ b/res/values-ug/cm_strings.xml
@@ -540,7 +540,6 @@
   <string name="double_tap_to_sleep_summary">ئېكراننى تاقاش ئۈچۈن ھالەت بالداقنى قوش چېكىڭ</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">تاسادىپىي ئويغىتىشنىڭ ئالدىنى ئېلىش</string>
-  <string name="proximity_wake_summary">ئېكراننى قوزغىتىشتىن ئىلگىرى ئارىلىق سەزگۈچنى تەكشۈرىدۇ</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">چېتىلغاندا ئويغات</string>
   <string name="wake_when_plugged_or_unplugged_summary">توكقا چېتىلغان ياكى ئۈزۈلگەندە ئېكراننى ئاچىدۇ</string>
diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml
index 274a7d3..dea49d3 100644
--- a/res/values-uk/cm_strings.xml
+++ b/res/values-uk/cm_strings.xml
@@ -526,7 +526,6 @@
   <string name="double_tap_to_sleep_summary">Двічі натисніть на рядок стану, аби вимкнути екран</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Запобігання випадкового пробудження</string>
-  <string name="proximity_wake_summary">Перевірити датчик наближення до пробудження екрану</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Екран прокидається при підключені</string>
   <string name="wake_when_plugged_or_unplugged_summary">Екран прокидається при підключені до зарядного пристрою</string>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index a195bb7..677ccee 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -542,7 +542,6 @@
   <string name="double_tap_to_sleep_summary">Chạm hai lần vào thanh trạng thái để tắt màn hình hiển thị</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Ngăn ngừa tình cờ mở màn hình</string>
-  <string name="proximity_wake_summary">Kiểm tra cảm biến tiệm cận trước khi bật màn hình</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Sáng màn hình khi cắm sạc</string>
   <string name="wake_when_plugged_or_unplugged_summary">Bật màn hình khi kết nối hoặc ngắt kết nối nguồn điện</string>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index 66bf5a6..f333c35 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -488,7 +488,7 @@
   <string name="hardware_keys_action_launch_camera">启动相机</string>
   <string name="hardware_keys_action_sleep">关闭屏幕</string>
   <string name="hardware_keys_action_last_app">上次运行应用</string>
-  <string name="camera_sleep_on_release_title">屏幕窥探</string>
+  <string name="camera_sleep_on_release_title">屏幕速览</string>
   <string name="camera_sleep_on_release_summary">仅当按钮被按下时，半按将会保持屏幕点亮</string>
   <string name="camera_launch_title">启动相机</string>
   <string name="camera_launch_summary">长按并松开将会启动相机</string>
@@ -550,7 +550,7 @@
   <string name="double_tap_to_sleep_summary">双击状态栏以关闭屏幕显示</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">防止意外唤醒</string>
-  <string name="proximity_wake_summary">唤醒屏幕前检查距离传感器</string>
+  <string name="proximity_wake_summary">经由手势唤醒前先检查距离传感器</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">连接或移除电源时唤醒</string>
   <string name="wake_when_plugged_or_unplugged_summary">连接或断开电源时点亮屏幕</string>
diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml
index 91ac0ad..f874de9 100644
--- a/res/values-zh-rHK/cm_strings.xml
+++ b/res/values-zh-rHK/cm_strings.xml
@@ -448,7 +448,6 @@
   <string name="double_tap_to_sleep_summary">按兩下狀態列來關閉顯示器</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">防止意外喚醒</string>
-  <string name="proximity_wake_summary">喚醒畫面前檢查傳感器</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">當接上喚醒</string>
   <string name="wake_when_plugged_or_unplugged_summary">當連接或拔除電源時開啓螢幕</string>
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index 0e0bc8e..9b02499 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -525,7 +525,6 @@
   <string name="double_tap_to_sleep_summary">輕點兩次狀態欄來關閉螢幕</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">防止意外喚醒</string>
-  <string name="proximity_wake_summary">喚醒螢幕前檢查接近感應器</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">接上或移除電源時喚醒</string>
   <string name="wake_when_plugged_or_unplugged_summary">連接或拔除電源時開啟螢幕</string>
-- 
cgit v1.1


From 8fa03070ba29d4dbdbc0cbe4c6b992e3d69a5371 Mon Sep 17 00:00:00 2001
From: "clyde@build01" <jenkins@cyanogenmod.com>
Date: Sun, 4 Dec 2016 18:07:50 -0800
Subject: Automatic translation import

Change-Id: Ie7efb587de11baf48fa9bc581df958fcd04b150a
Ticket: -
---
 res/values-ca/cm_strings.xml     | 4 ++--
 res/values-in/cm_strings.xml     | 1 +
 res/values-ml-rIN/cm_strings.xml | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
index 0df656f..640de57 100644
--- a/res/values-ca/cm_strings.xml
+++ b/res/values-ca/cm_strings.xml
@@ -992,8 +992,8 @@
   <string name="hotstpot_inactivity_timeout_1_minute">1 minut</string>
   <string name="hotstpot_inactivity_timeout_5_minutes">5 minuts</string>
   <string name="hotstpot_inactivity_timeout_10_minutes">10 minuts</string>
-  <string name="hotstpot_inactivity_timeout_never_summary_text">El punt d\'accés portàtil Wi\u2011Fi no s\'apagarà mai</string>
-  <string name="hotstpot_inactivity_timeout_summary_text">El punt d\'accés portàtil Wi\u2011Fi s\'apagarà després de <xliff:g id="timeout">%1$s</xliff:g></string>
+  <string name="hotstpot_inactivity_timeout_never_summary_text">El punt d\'accés Wi\u2011Fi portàtil no s\'apagarà mai</string>
+  <string name="hotstpot_inactivity_timeout_summary_text">El punt d\'accés Wi\u2011Fi portàtil s\'apagarà després de <xliff:g id="timeout">%1$s</xliff:g></string>
   <!-- Live lock screen -->
   <!-- Live lock screen title -->
   <string name="live_lock_screen_title">Pantalla de bloqueig animada</string>
diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml
index c3523a5..77fbfb5 100644
--- a/res/values-in/cm_strings.xml
+++ b/res/values-in/cm_strings.xml
@@ -550,6 +550,7 @@
   <string name="double_tap_to_sleep_summary">Ketuk dua kali pada status bar untuk mematikan tampilan</string>
   <!-- Proximity wake -->
   <string name="proximity_wake_title">Mencegah bangun yang tidak disengaja</string>
+  <string name="proximity_wake_summary">Periksa sensor kedekatan sebelum memicu gerakan</string>
   <!-- Turn on display when power connected; turn off display when power disconnected -->
   <string name="wake_when_plugged_or_unplugged_title">Bangun saat pengisi daya di pasang</string>
   <string name="wake_when_plugged_or_unplugged_summary">Aktifkan layar ketika menghubungkan atau melepaskan sumber daya</string>
diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml
index b5106cc..e75445e 100644
--- a/res/values-ml-rIN/cm_strings.xml
+++ b/res/values-ml-rIN/cm_strings.xml
@@ -899,7 +899,6 @@
   <string name="duplicate_apn_error_message">ഈ APN ഇതിനകം നിലവിലുണ്ട്. നിരസിക്കുക അല്ലെങ്കിൽ പരാമീറ്ററുകളും മാറ്റുക.</string>
   <string name="sim_enabler_summary"><xliff:g id="displayName">%1$s</xliff:g> is <xliff:g id="status" example="disabled">%2$s</xliff:g></string>
   <string name="sim_disabled">അപ്രാപ്തമാക്കി</string>
-  <string name="sim_missing">നഷ്ടപ്പെട്ടിരിക്കുന്നു അല്ലെങ്കിൽ കേടുപറ്റി</string>
   <string name="sim_enabler_need_disable_sim">SIM കാർഡ് നിര്‍ജീവമാക്കുന്നതാണ്. നിങ്ങൾക്ക് തുടരണോ?</string>
   <string name="sim_enabler_will_disable_sim_title">ശ്രദ്ധിക്കുക</string>
   <string name="sim_enabler_need_switch_data_service">ഈ SIM അപ്രാപ്തമാക്കുകയും ഡാറ്റ സേവനങ്ങൾക്കായി SIM <xliff:g id="slotid">%1$s</xliff:g> ഉപയോഗിക്കുന്നതുമാണ്. നിങ്ങൾ തുടരണമെന്ന് ഉറപ്പാണോ?</string>
-- 
cgit v1.1