Automatic translation import

Change-Id: I0f567034c4273cb5aac0c355c4291e3e20c3afd6

105 files changed, 945 insertions, 3292 deletions

diff --git a/packages/Keyguard/res/values-af/cm_strings.xml b/packages/Keyguard/res/values-af/cm_strings.xml
index 1605f19b39a..0aa1bd140bf 100644
--- a/packages/Keyguard/res/values-af/cm_strings.xml
+++ b/packages/Keyguard/res/values-af/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM Perso gesluit</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ongeldige kaart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Sleutel SIM PIN, jy het <xliff:g id="number">%d</xliff:g> oorblywende poging voordat jy jou diensverskaffer moet kontak om jou toestel te ontsluit.</item>
-    <item quantity="other">Sleutel SIM PIN, Jy het <xliff:g id="number">%d</xliff:g> oorblywende pogings oor.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fout: Invoer is korter as die minimum lengte</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM Perso gesluit</string>
+    <string name="lockscreen_sim_error_message_short">Ongeldige kaart.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Sleutel SIM PIN, jy het <xliff:g id="number">%d</xliff:g> oorblywende poging voordat jy jou diensverskaffer moet kontak om jou toestel te ontsluit.</item>
+        <item quantity="other">Sleutel SIM PIN, Jy het <xliff:g id="number">%d</xliff:g> oorblywende pogings oor.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fout: Invoer is korter as die minimum lengte</string>
 </resources>
diff --git a/packages/Keyguard/res/values-am/cm_strings.xml b/packages/Keyguard/res/values-am/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-am/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-ar/cm_strings.xml b/packages/Keyguard/res/values-ar/cm_strings.xml
index 348be57f1d4..739177d32c0 100644
--- a/packages/Keyguard/res/values-ar/cm_strings.xml
+++ b/packages/Keyguard/res/values-ar/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">الشريحة SIM مغلقة</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">بطاقة غير صالحة.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">خطأ: المدخل أقصر من الحد الأدنى للطول</string>
+    <string name="keyguard_perso_locked_message">الشريحة SIM مغلقة</string>
+    <string name="lockscreen_sim_error_message_short">بطاقة غير صالحة.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="zero">أدخل رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولات قبل أن تتصل بشركة المحمول لفتح جهازك.</item>
+        <item quantity="one">أدخل رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولة قبل أن تتصل بشركة المحمول لفتح جهازك.</item>
+        <item quantity="two">أدخل ‏رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولات قبل أن يجب أنت تتصل بشركة المحمول لفتح جهازك.</item>
+        <item quantity="few">أدخل ‏رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولات قبل أن يجب أنت تتصل بشركة المحمول لفتح جهازك.</item>
+        <item quantity="many">أدخل ‏رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولات قبل أن يجب أنت تتصل بشركة المحمول لفتح جهازك.</item>
+        <item quantity="other">أدخل ‏رمز التعريف الشخصي لبطاقة SIM، متبقي لديك <xliff:g id="number">%d</xliff:g> محاولات قبل أن يجب أنت تتصل بشركة المحمول لفتح جهازك.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">خطأ: المدخل أقصر من الحد الأدنى للطول</string>
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/cm_strings.xml b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
index 9f700401a4b..a109bbaafca 100644
--- a/packages/Keyguard/res/values-as-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM কাৰ্ড পাৰ্চো লক কৰা আছে</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">অবৈধ কাৰ্ড।</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">আপোনাৰ SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে, তাৰ আগতে আপুনি ডিভাইচ আনলক কৰিবলৈ কেৰিয়াৰক যোগাযোগ কৰিবই লাগিব।</item>
-    <item quantity="other">SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে।</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">ত্ৰুটি: ইনপুট ন্যূনতম দৈৰ্ঘতকৈ চুটি</string>
+    <string name="keyguard_perso_locked_message">SIM কাৰ্ড পাৰ্চো লক কৰা আছে</string>
+    <string name="lockscreen_sim_error_message_short">অবৈধ কাৰ্ড।</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">আপোনাৰ SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে, তাৰ আগতে আপুনি ডিভাইচ আনলক কৰিবলৈ কেৰিয়াৰক যোগাযোগ কৰিবই লাগিব।</item>
+        <item quantity="other">SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে।</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">ত্ৰুটি: ইনপুট ন্যূনতম দৈৰ্ঘতকৈ চুটি</string>
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-as-rIN/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-ast-rES/cm_strings.xml b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
index a440bcbe3ab..1cdb7a05856 100644
--- a/packages/Keyguard/res/values-ast-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La tarxeta SIM tien un bloquéu personalizáu</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Tarxeta non válida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Introduz el PIN de la SIM, tienes <xliff:g id="number">%d</xliff:g> intentu restante enantes qu\'hebas contautar col to operador pa desbloquiar el to preséu.</item>
-    <item quantity="other">Introduz el PIN de la SIM, tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fallu: La entrada ye más curtia que\'l llargor mínimu</string>
+    <string name="keyguard_perso_locked_message">La tarxeta SIM tien un bloquéu personalizáu</string>
+    <string name="lockscreen_sim_error_message_short">Tarxeta non válida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Introduz el PIN de la SIM, tienes <xliff:g id="number">%d</xliff:g> intentu restante enantes qu\'hebas contautar col to operador pa desbloquiar el to preséu.</item>
+        <item quantity="other">Introduz el PIN de la SIM, tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fallu: La entrada ye más curtia que\'l llargor mínimu</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 0fd4d06594a..f04b3c253f2 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -19,142 +19,161 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <string name="keyguard_sim_locked_message">Tarxeta SIM bloquiada.</string>
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <string name="keyguard_sim_puk_locked_message">Tarxeta SIM bloquiada col PUK.</string>
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Área del patrón.</string>
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_area">Área de PIN</string>
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_sim_pin_area">Área de PIN de SIM</string>
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_sim_puk_area">Área de PUK de SIM</string>
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <string name="kg_forgot_pattern_button_text">Patrón escaecíu</string>
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <string name="kg_sim_pin_instructions_multi">Introduz el PUK de SIM pa «<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>»</string>
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM\u2026</string>
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <string name="kg_invalid_sim_pin_hint">Teclexa un PIN que tea ente 1 y 8 caráuteres.</string>
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen</string>
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <string name="kg_pin_accepted">¡Códigu aceutáu!</string>
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">Ensin serviciu.</string>
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Botón de cambéu de métrodu d\'entrada.</string>
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_pattern">Ríquese\'l patrón pa más seguranza.</string>
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_pin">Ríquese\'l PIN pa más seguranza.</string>
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <string name="kg_prompt_reason_timeout_password">Ríquese la contraseña pa más seguranza.</string>
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-  <string name="fingerprint_not_recognized">Nun se reconocío</string>
+    <string name="app_name">Bloquéu de tecles</string>
+    <string name="keyguard_password_enter_pin_code">Teclexa\'l códigu PIN</string>
+    <string name="keyguard_password_enter_puk_code">Teclexa\'l PUK de la SIM y el códigu PIN nuevu</string>
+    <string name="keyguard_password_enter_puk_prompt">Códigu PUK de la SIM</string>
+    <string name="keyguard_password_enter_pin_prompt">Códigu PIN nuevu de la SIM</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pa teclexar la contraseña</font></string>
+    <string name="keyguard_password_enter_password_code">Teclexa la contraseña pa desbloquiar</string>
+    <string name="keyguard_password_enter_pin_password_code">Teclexa\'l PIN pa desbloquiar</string>
+    <string name="keyguard_password_wrong_pin_code">Códigu PIN incorreutu.</string>
+    <string name="keyguard_charged">Cargóse</string>
+    <string name="keyguard_plugged_in">Cargando</string>
+    <string name="keyguard_plugged_in_charging_fast">Carga rápida</string>
+    <string name="keyguard_plugged_in_charging_slowly">Carga lenta</string>
+    <string name="keyguard_low_battery">Coneuta\'l cargador.</string>
+    <string name="keyguard_instructions_when_pattern_disabled">Primi\'l botón Menú pa desbloquiar.</string>
+    <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
+    <string name="keyguard_missing_sim_message_short">Nun hai tarxeta SIM</string>
+    <string name="keyguard_missing_sim_message" product="tablet">Nun hai tarxeta SIM na tableta.</string>
+    <string name="keyguard_missing_sim_message" product="default">Nun hai tarxeta SIM nel teléfonu.</string>
+    <string name="keyguard_missing_sim_instructions">Inxerta una tarxeta SIM.</string>
+    <string name="keyguard_missing_sim_instructions_long">Falta la tarxeta SIM o nun pue lleese. Inxerta una.</string>
+    <string name="keyguard_permanent_disabled_sim_message_short">Tarxeta SIM inutilizable</string>
+    <string name="keyguard_permanent_disabled_sim_instructions">Inhabilitóse dafechu la tarxeta SIM.\n
+    Contauta col fornidor de servicios inalámbricos pa consiguir otra.</string>
+    <string name="keyguard_sim_locked_message">La tarxeta SIM ta bloquiada.</string>
+    <string name="keyguard_sim_puk_locked_message">La tarxeta SIM ta bloquiada col PUK.</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM\u2026</string>
+    <string name="keyguard_accessibility_pattern_unlock">Desbloquéu per patrón.</string>
+    <string name="keyguard_accessibility_pin_unlock">Desbloquéu per PIN.</string>
+    <string name="keyguard_accessibility_password_unlock">Desbloquéu per contraseña.</string>
+    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Área del patrón.</string>
+    <string name="keyguard_accessibility_slide_area">Área pa eslizar.</string>
+    <string name="keyguard_accessibility_pin_area">Área del PIN</string>
+    <string name="keyguard_accessibility_sim_pin_area">Área del PIN de la SIM</string>
+    <string name="keyguard_accessibility_sim_puk_area">Área del PUK de la SIM</string>
+    <string name="keyguard_accessibility_next_alarm">Afióse l\'alarma próxima a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
+    <string name="keyboardview_keycode_delete">Desaniciar</string>
+    <string name="keyboardview_keycode_enter">Intro</string>
+    <string name="kg_forgot_pattern_button_text">Escaecí\'l patrón</string>
+    <string name="kg_wrong_pattern">Patrón incorreutu</string>
+    <string name="kg_wrong_password">Contraseña incorreuta</string>
+    <string name="kg_wrong_pin">PIN incorreutu</string>
+    <string name="kg_too_many_failed_attempts_countdown">Volvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.</string>
+    <string name="kg_pattern_instructions">Dibuxa\'l patrón</string>
+    <string name="kg_sim_pin_instructions">Introduz el PIN de la SIM</string>
+    <string name="kg_sim_pin_instructions_multi">Introduz el PUK de la SIM pa «<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>»</string>
+    <string name="kg_pin_instructions">Introduz el PIN</string>
+    <string name="kg_password_instructions">Introduz la contraseña</string>
+    <string name="kg_puk_enter_puk_hint">Agora la SIM ta inhabilitada. Introduz el códigu PUK pa siguiir. Contauta cola operadora pa más detalles.</string>
+    <string name="kg_puk_enter_puk_hint_multi">Agora la SIM <xliff:g id="carrier" example="CARD 1">%1$s</xliff:g> ta inhabilitada. Introduz el códigu PUK pa siguir. Contauta cola operadora pa más detalles.</string>
+    <string name="kg_puk_enter_pin_hint">Introduz el códigu PIN deseyáu</string>
+    <string name="kg_enter_confirm_pin_hint">Volvi introducir el códigu PIN</string>
+    <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM\u2026</string>
+    <string name="kg_invalid_sim_pin_hint">Teclexa un PIN que seya de 4 o 8 númberos.</string>
+    <string name="kg_invalid_sim_puk_hint">El códigu PUK debería ser de 8 númberos o más.</string>
+    <string name="kg_invalid_puk">Volvi introducir el códigu PUK correutu. Si s\'introduz mal delles vegaes más, la SIM va inhabilitase dafechu.</string>
+    <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen</string>
+    <string name="kg_login_too_many_attempts">Milenta intentos incorreutos</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message">        Teclexesti mal el PIN <xliff:g id="number">%d</xliff:g> vegaes.
+        \n\nVolvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.
+    </string>
+    <string name="kg_too_many_failed_password_attempts_dialog_message">        Teclexesti mal la contraseña <xliff:g id="number">%d</xliff:g> vegaes.
+        \n\nVolvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.
+    </string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message">        Dibuxesti mal el patrón <xliff:g id="number">%d</xliff:g> vegaes.
+        \n\nVolvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       esti preséu va reafitase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       esti preséu va reafitase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_wiping" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Esti preséu va reafitase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_wiping" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Esti preséu va reafitase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       esti usuariu va desaniciase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       esti usuariu va desaniciase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_erasing_user" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Esti usuariu va desaniciase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_erasing_user" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Esti usuariu va desaniciase perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       va desaniciase\'l perfil de trabayu perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       va desaniciase\'l perfil de trabayu perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="tablet">       Tentesti de desbloquiar incorreutamente la tableta <xliff:g id="number">%d</xliff:g> vegaes.
+       Va desaniciase\'l perfil de trabayu perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="default">       Tentesti de desbloquiar incorreutamente\'l teléfonu <xliff:g id="number">%d</xliff:g> vegaes.
+       Va desaniciase\'l perfil de trabayu perdiendo tolos sos datos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet">       Dibuxesti mal el patrón de desbloquéu <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       va pidísete que desbloquies la tableta usando una cuenta de corréu.\n\n
+       Volvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.
+    </string>
+    <string name="kg_failed_attempts_almost_at_login" product="default">       Dibuxesti mal el patrón de desbloquéu <xliff:g id="number">%d</xliff:g> vegaes.
+       Tres <xliff:g id="number">%d</xliff:g> intentos fallíos más,
+       va pidísete que desbloquies el teléfonu usando una cuenta de corréu.\n\n
+       Volvi tentalo en <xliff:g id="number">%d</xliff:g> segundos.
+    </string>
+    <string name="kg_password_wrong_pin_code_pukked">Códigu PIN de la SIM incorreutu, agora has contautar cola operadora pa desbloquiar el preséu.</string>
+    <plurals name="kg_password_wrong_pin_code">
+        <item quantity="one">Códigu PIN de la SIM incorreutu, quédate <xliff:g id="number">%d</xliff:g> intentu enantes de tener de llamar a la operadora pa desbloquiar el preséu.</item>
+        <item quantity="other">Códigu PIN de la SIM incorreutu, quédente <xliff:g id="number">%d</xliff:g> intentos enantes de tener de llamar a la operadora pa desbloquiar el preséu.</item>
+    </plurals>
+    <string name="kg_password_wrong_puk_code_dead">La SIM ta inutilizada. Contauta cola operadora.</string>
+    <plurals name="kg_password_wrong_puk_code">
+        <item quantity="one">Códigu PUK de la SIM incorreutu, quédate <xliff:g id="number">%d</xliff:g> intentu enantes d\'inutilizar dafechu la SIM.</item>
+        <item quantity="other">Códigu PUK de la SIM incorreutu, quédente <xliff:g id="number">%d</xliff:g> intentos enantes d\'inutilizar dafechu la SIM.</item>
+    </plurals>
+    <string name="kg_password_pin_failed">¡Falló la operación del PIN de la SIM!</string>
+    <string name="kg_password_puk_failed">¡Falló la operación del PUK de la SIM!</string>
+    <string name="kg_pin_accepted">¡Códigu aceutáu!</string>
+    <string name="keyguard_carrier_default">Ensin serviciu.</string>
+    <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Botón de cambéu de métodu d\'entrada.</string>
+    <string name="airplane_mode">Mou avión</string>
+    <string name="kg_prompt_reason_restart_pattern">Ríquese\'l patrón cuando reanicies el preséu.</string>
+    <string name="kg_prompt_reason_restart_pin">Ríquese\'l PIN cuando reanicies el preséu.</string>
+    <string name="kg_prompt_reason_restart_password">Ríquese la contraseña cuando reanicies el preséu.</string>
+    <string name="kg_prompt_reason_timeout_pattern">Ríquese\'l patrón pa más seguranza.</string>
+    <string name="kg_prompt_reason_timeout_pin">Ríquese\'l PIN pa más seguranza.</string>
+    <string name="kg_prompt_reason_timeout_password">Ríquese la contraseña pa más seguranza.</string>
+    <string name="kg_prompt_reason_switch_profiles_pattern">Ríquese\'l patrón cuando camudes de perfil.</string>
+    <string name="kg_prompt_reason_switch_profiles_pin">Ríquese\'l PIN cuando camudes de perfil.</string>
+    <string name="kg_prompt_reason_switch_profiles_password">Ríquese la contraseña cuando camudes de perfil.</string>
+    <plurals name="kg_prompt_reason_time_pattern">
+        <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
+        <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
+    </plurals>
+    <plurals name="kg_prompt_reason_time_pin">
+        <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
+        <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
+    </plurals>
+    <plurals name="kg_prompt_reason_time_password">
+        <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
+        <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized">Nun se reconoz</string>
 </resources>
diff --git a/packages/Keyguard/res/values-az-rAZ/cm_strings.xml b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
index 46ee7e13869..9e3e97ced3e 100644
--- a/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
+++ b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
@@ -16,9 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Etibarsız kart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="keyguard_perso_locked_message">SIM kart özəl kilidlənib</string>
+    <string name="lockscreen_sim_error_message_short">Etibarsız kart.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM kartın PİN şifrəsini daxil edin, <xliff:g id="number">%d</xliff:g> cəhdiniz qalıb, əks halda cihaz kilidini açmaq üçün operatora müraciət etməli olacaqsınız.</item>
+        <item quantity="other">SIM kartın PİN şifrəsini daxil edin, <xliff:g id="number">%d</xliff:g> cəhdiniz qalıb.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Xəta: Daxil edilən, minimum uzunluqdan daha qısadır</string>
 </resources>
diff --git a/packages/Keyguard/res/values-be/cm_strings.xml b/packages/Keyguard/res/values-be/cm_strings.xml
index 74002f0e198..226775ab8fc 100644
--- a/packages/Keyguard/res/values-be/cm_strings.xml
+++ b/packages/Keyguard/res/values-be/cm_strings.xml
@@ -16,16 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-картка заблакавана аператарам</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Памылка карты.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Увядзіце PIN-код. У вас засталася <xliff:g id="number">%d</xliff:g> спроба перад тым, як вам давядзецца звярнуцца да аператара дзеля разблакоўкі.</item>
-    <item quantity="few">Увядзіце PIN-код. У вас засталося<xliff:g id="number">%d</xliff:g> спробы.</item>
-    <item quantity="other">Увядзіце PIN-код. У вас засталося <xliff:g id="number">%d</xliff:g> спробы.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Памылка: маленькая даўжыня</string>
+    <string name="keyguard_perso_locked_message">SIM-картка заблакавана аператарам</string>
+    <string name="lockscreen_sim_error_message_short">Памылка карты.</string>
+    <string name="kg_invalid_sim_length">Памылка: маленькая даўжыня</string>
 </resources>
diff --git a/packages/Keyguard/res/values-be/strings.xml b/packages/Keyguard/res/values-be/strings.xml
index 7378ef82f78..b7e1addc0f6 100644
--- a/packages/Keyguard/res/values-be/strings.xml
+++ b/packages/Keyguard/res/values-be/strings.xml
@@ -19,125 +19,5 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
   <string name="airplane_mode">Рэжым лёту</string>
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
 </resources>
diff --git a/packages/Keyguard/res/values-bg/cm_strings.xml b/packages/Keyguard/res/values-bg/cm_strings.xml
index 6ac51c5e113..e93192e2d8e 100644
--- a/packages/Keyguard/res/values-bg/cm_strings.xml
+++ b/packages/Keyguard/res/values-bg/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">СИМ картата е блокирана от оператора</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Невалидна карта.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останал опит, преди да трябва да се свържете с вашия оператор за отключване на устройството.</item>
-    <item quantity="other">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останали опити.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Грешка: Въведеното е по-късо от минималната дължина</string>
+    <string name="keyguard_perso_locked_message">СИМ картата е блокирана от оператора</string>
+    <string name="lockscreen_sim_error_message_short">Невалидна карта.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останал опит, преди да трябва да се свържете с вашия оператор за отключване на устройството.</item>
+        <item quantity="other">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останали опити.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Грешка: Въведеното е по-късо от минималната дължина</string>
 </resources>
diff --git a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
index 5f1282b59d7..3732362fb0d 100644
--- a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
+++ b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">অবৈধ কার্ড।</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">অবৈধ কার্ড।</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ca/cm_strings.xml b/packages/Keyguard/res/values-ca/cm_strings.xml
index 553478b5fcd..dc9964d8b4f 100644
--- a/packages/Keyguard/res/values-ca/cm_strings.xml
+++ b/packages/Keyguard/res/values-ca/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La targeta SIM té un bloqueig Personal</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Targeta invàlida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intent restant abans que hagis de contactar amb el teu operador per desbloquejar el teu dispositiu.</item>
-    <item quantity="other">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intents restants.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: L\'entrada és més curta que la longitud mínima</string>
+    <string name="keyguard_perso_locked_message">La targeta SIM té un bloqueig Personal</string>
+    <string name="lockscreen_sim_error_message_short">Targeta invàlida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intent restant abans que hagis de contactar amb el teu operador per desbloquejar el teu dispositiu.</item>
+        <item quantity="other">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intents restants.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: L\'entrada és més curta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-cs/cm_strings.xml b/packages/Keyguard/res/values-cs/cm_strings.xml
index a66d9a49eca..38ff5011ee7 100644
--- a/packages/Keyguard/res/values-cs/cm_strings.xml
+++ b/packages/Keyguard/res/values-cs/cm_strings.xml
@@ -16,16 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM je zamčená pomocí Perso</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Neplatná SIM karta.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokus než budete muset kontaktovat operátora pro odemčení zařízení.</item>
-    <item quantity="few">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokusy.</item>
-    <item quantity="other">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývajících pokusů.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Chyba: vstup je kratší než minimální délka</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM je zamčená pomocí Perso</string>
+    <string name="lockscreen_sim_error_message_short">Neplatná SIM karta.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokus než budete muset kontaktovat operátora pro odemčení zařízení.</item>
+        <item quantity="few">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokusy.</item>
+        <item quantity="many">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývajících pokusů.</item>
+        <item quantity="other">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývajících pokusů.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Chyba: vstup je kratší než minimální délka</string>
 </resources>
diff --git a/packages/Keyguard/res/values-cy/cm_strings.xml b/packages/Keyguard/res/values-cy/cm_strings.xml
index 0ba09aa7d02..54c2f0a9c18 100644
--- a/packages/Keyguard/res/values-cy/cm_strings.xml
+++ b/packages/Keyguard/res/values-cy/cm_strings.xml
@@ -16,8 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="keyguard_perso_locked_message">Clo Perso i\'r cerdyn SIM</string>
+    <string name="lockscreen_sim_error_message_short">Cerdyn annilys.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="zero">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnigion yn weddill.</item>
+        <item quantity="one">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill.</item>
+        <item quantity="two">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> gynnig yn weddill.</item>
+        <item quantity="few">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> chynnig yn weddill.</item>
+        <item quantity="many">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> chynnig yn weddill.</item>
+        <item quantity="other">Rho PIN y SIM. Mae gennyt <xliff:g id="number">%d</xliff:g> cynnig yn weddill.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Gwall: Mewnbwn yn rhy fyr</string>
 </resources>
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
index b53b53edada..77c29fca8c4 100644
--- a/packages/Keyguard/res/values-cy/strings.xml
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -19,124 +19,158 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="app_name">Gwarchodydd Bysellau</string>
+    <string name="keyguard_password_enter_pin_code">Teipiwch y cod PIN</string>
+    <string name="keyguard_password_enter_puk_code">Rho PUK y SIM a\'r cod PIN newydd</string>
+    <string name="keyguard_password_enter_puk_prompt">Cod PUK SIM</string>
+    <string name="keyguard_password_enter_pin_prompt">Cod PIN SIM newydd</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">Cyffyrdda i roi\'r cyfrinair</font></string>
+    <string name="keyguard_password_enter_password_code">Rho\'r cyfrinair i ddatgloi</string>
+    <string name="keyguard_password_enter_pin_password_code">Rho\'r PIN i\'w ddatgloi</string>
+    <string name="keyguard_password_wrong_pin_code">Cod PIN anghywir</string>
+    <string name="keyguard_charged">Wedi gwefru</string>
+    <string name="keyguard_plugged_in">Yn gwefru</string>
+    <string name="keyguard_plugged_in_charging_fast">Yn gwefru\'n gyflym</string>
+    <string name="keyguard_plugged_in_charging_slowly">Yn gwefru\'n araf</string>
+    <string name="keyguard_low_battery">Cysyllta dy wefrydd.</string>
+    <string name="keyguard_instructions_when_pattern_disabled">Pwysa Dewislen i ddatgloi.</string>
+    <string name="keyguard_network_locked_message">Rhwydwaith wedi\'i gloi</string>
+    <string name="keyguard_missing_sim_message_short">Dim cerdyn SIM</string>
+    <string name="keyguard_missing_sim_message" product="tablet">Dim cerdyn SIM yn y llechen.</string>
+    <string name="keyguard_missing_sim_message" product="default">Dim cerdyn SIM yn y ffôn.</string>
+    <string name="keyguard_missing_sim_instructions">Gosoda gerdyn SIM.</string>
+    <string name="keyguard_missing_sim_instructions_long">Mae\'r cerdyn SIM ar goll neu yn ddim yn ddarllenadwy. Rho gerdyn SIM darllenadwy.</string>
+    <string name="keyguard_permanent_disabled_sim_message_short">Dim posib defnyddio\'r SIM.</string>
+    <string name="keyguard_permanent_disabled_sim_instructions">Mae dy gerdyn SIM wedi ei analluogi yn barhaol.\nCysyllta â dy ddarparwr gwasanaeth i gael cerdyn SIM newydd.</string>
+    <string name="keyguard_sim_locked_message">Mae\'r cerdyn SIM wedi\'i gloi.</string>
+    <string name="keyguard_sim_puk_locked_message">Mae\'r cerdyn SIM wedi\'i gloi gyda PUK.</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message">Yn datgloi\'r cerdyn SIM\u2026</string>
+    <string name="keyguard_accessibility_pattern_unlock">Datgloi â phatrwm.</string>
+    <string name="keyguard_accessibility_pin_unlock">Datgloi â PIN.</string>
+    <string name="keyguard_accessibility_password_unlock">Datgloi â chyfrinair.</string>
+    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Maes patrwm.</string>
+    <string name="keyguard_accessibility_slide_area">Maes llusgo.</string>
+    <string name="keyguard_accessibility_pin_area">Maes PIN</string>
+    <string name="keyguard_accessibility_sim_pin_area">Maes PIN SIM</string>
+    <string name="keyguard_accessibility_sim_puk_area">Maes PUK SIM</string>
+    <string name="keyguard_accessibility_next_alarm">Mae\'r larwm nesaf wedi\'i osod ar gyfer <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
+    <string name="keyboardview_keycode_delete">Dileu</string>
+    <string name="keyboardview_keycode_enter">Bysell \'Enter\'</string>
+    <string name="kg_forgot_pattern_button_text">Methu Cofio\'r Patrwm</string>
+    <string name="kg_wrong_pattern">Patrwm Anghywir</string>
+    <string name="kg_wrong_password">Cyfrinair Anghywir</string>
+    <string name="kg_wrong_pin">PIN Anghywir</string>
+    <string name="kg_too_many_failed_attempts_countdown">Rho gynnig arall ymhen <xliff:g id="number">%d</xliff:g> eiliad.</string>
+    <string name="kg_pattern_instructions">Rho dy batrwm</string>
+    <string name="kg_sim_pin_instructions">Rho PIN y SIM</string>
+    <string name="kg_sim_pin_instructions_multi">Rho\'r PIN SIM ar gyfer \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\"</string>
+    <string name="kg_pin_instructions">Rho\'r PIN</string>
+    <string name="kg_password_instructions">Rho Gyfrinair</string>
+    <string name="kg_puk_enter_puk_hint">Mae\'r SIM bellach wedi\'i analluogi. Rho god PUK i barhau. Cysyllta â dy ddarparwr gwasanaeth am fanylion.</string>
+    <string name="kg_puk_enter_puk_hint_multi">Mae\'r SIM \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" bellach wedi\'i analluogi. Rho god PUK i barhau. Cysyllta â dy ddarparwr gwasanaeth am fanylion.</string>
+    <string name="kg_puk_enter_pin_hint">Rho\'r cod PIN newydd</string>
+    <string name="kg_enter_confirm_pin_hint">Cadarnha\'r cod PIN newydd</string>
+    <string name="kg_sim_unlock_progress_dialog_message">Yn datgloi\'r cerdyn SIM\u2026</string>
+    <string name="kg_invalid_sim_pin_hint">Rho rif PIN rhwng 4 ac 8 digid.</string>
+    <string name="kg_invalid_sim_puk_hint">Rhaid i\'r cod PUK fod yn o leiaf 8 digid.</string>
+    <string name="kg_invalid_puk">Rho\'r cod PUK cywir unwaith eto. Caiff y SIM ei analluogi os fydd nifer o ymdrechion aflwyddiannus.</string>
+    <string name="kg_invalid_confirm_pin_hint" product="default">Dyw\'r codau PIN ddim yr un fath.</string>
+    <string name="kg_login_too_many_attempts">Bu gormod o ymdrechion aflwyddiannus</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message">        Rwyt wedi rhoi PIN anghywir <xliff:g id="number">%d</xliff:g> gwaith.
+        \n\nCeisia eto mewn <xliff:g id="number">%d</xliff:g> eiliad.
+    </string>
+    <string name="kg_too_many_failed_password_attempts_dialog_message">        Rwyt wedi rhoi cyfrinair anghywir <xliff:g id="number">%d</xliff:g> gwaith.
+        \n\nCeisia eto mewn <xliff:g id="number">%d</xliff:g> eiliad.
+    </string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message">        Rwyt wedi rhoi patrwm anghywir <xliff:g id="number">%d</xliff:g> gwaith.
+        \n\nCeisia eto mewn <xliff:g id="number">%d</xliff:g> eiliad.
+    </string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Rwyt wedi ceisio a methu â datgloi\'r llechen <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y llechen ei ail-osod a bydd ei holl ddata yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="default">Rwyt wedi ceisio a methu â datgloi\'r ffôn <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y ffôn ei ail-osod a bydd ei holl ddata yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_now_wiping" product="tablet">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r llechen. 
+Caiff y llechen ei ailosod, gan ddileu ei holl ddata.    </string>
+    <string name="kg_failed_attempts_now_wiping" product="default">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r ffôn. 
+Caiff y ffôn ei ailosod, gan ddileu ei holl ddata.    </string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">Rwyt wedi ceisio a methu â datgloi\'r llechen <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y defnyddiwr ei dynnu a bydd holl ddata\'r defnyddiwr yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="default">Rwyt wedi ceisio a methu â datgloi\'r ffôn <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y defnyddiwr ei dynnu a bydd holl ddata\'r defnyddiwr yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_now_erasing_user" product="tablet">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r llechen. 
+Caiff y defnyddiwr ei dynnu, gan ddileu ei holl ddata.    </string>
+    <string name="kg_failed_attempts_now_erasing_user" product="default">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r ffôn. 
+Caiff y defnyddiwr ei dynnu, gan ddileu ei holl ddata.    </string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">Rwyt wedi ceisio a methu â datgloi\'r llechen <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y proffil gwaith ei dynnu a bydd holl ddata\'r proffil yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="default">Rwyt wedi ceisio a methu â datgloi\'r ffôn <xliff:g id="number">%d</xliff:g> tro.
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, caiff y proffil gwaith ei dynnu a bydd holl ddata\'r proffil yn cael ei dileu.    </string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="tablet">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r llechen. 
+Caiff y proffil gwaith ei dynnu, gan ddileu holl ddata\'r proffil.    </string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="default">Rwyt wedi gwneud <xliff:g id="number">%d</xliff:g> ymdrech i ddatgloi\'r ffôn. 
+Caiff y proffil gwaith ei dynnu, gan ddileu holl ddata\'r proffil.    </string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet">Rwyt wedi cael y patrwm yn anghywir <xliff:g id="number">%d</xliff:g> tro.\n\n
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, mi fydd gofyn iti ddatgloi\'r llechen gan ddefnyddio cyfrif e-bost.\n\n
+Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.    </string>
+    <string name="kg_failed_attempts_almost_at_login" product="default">Rwyt wedi cael y patrwm yn anghywir <xliff:g id="number">%d</xliff:g> tro.\n\n
+Ar ôl <xliff:g id="number">%d</xliff:g> cynnig aflwyddiannus arall, mi fydd gofyn iti ddatgloi\'r ffôn gan ddefnyddio cyfrif e-bost.\n\n
+Rho gynnig arall arni ymhen <xliff:g id="number">%d</xliff:g> eiliad.    </string>
+    <string name="kg_password_wrong_pin_code_pukked">Rhoddwyd PIN SIM anghywir a rhaid nawr cysylltu â dy ddarparwr gwasanaeth er mwyn datgloi dy ddyfais.</string>
+    <plurals name="kg_password_wrong_pin_code">
+        <item quantity="zero">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> ceisiadau yn weddill.</item>
+        <item quantity="one">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd yn rhaid i ti gysylltu â dy ddarparwr gwasanaeth er mwyn datgloi dy ddyfais.</item>
+        <item quantity="two">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> gais yn weddill.</item>
+        <item quantity="few">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill.</item>
+        <item quantity="many">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill.</item>
+        <item quantity="other">Rhoddwyd PIN SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill.</item>
+    </plurals>
+    <string name="kg_password_wrong_puk_code_dead">Nid yw\'n bosib defnyddio\'r SIM. Cysyllta â dy ddarparwr gwasanaeth.</string>
+    <plurals name="kg_password_wrong_puk_code">
+        <item quantity="zero">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> ceisiadau yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+        <item quantity="one">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+        <item quantity="two">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> gais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+        <item quantity="few">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+        <item quantity="many">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> chais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+        <item quantity="other">Rhoddwyd PUK SIM anghywir. Mae gennyt <xliff:g id="number">%d</xliff:g> cais yn weddill cyn bydd y SIM yn cael ei analluogi a dim posib ei ddefnyddio byth eto.</item>
+    </plurals>
+    <string name="kg_password_pin_failed">Methodd gweithred PIN y SIM!</string>
+    <string name="kg_password_puk_failed">Methodd gweithred PUK y SIM!</string>
+    <string name="kg_pin_accepted">Derbyniwyd y Cod!</string>
+    <string name="keyguard_carrier_default">Dim gwasanaeth.</string>
+    <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Botwm newid modd mewnbwn.</string>
+    <string name="airplane_mode">Modd awyren</string>
+    <string name="kg_prompt_reason_restart_pattern">Mae angen datgloi â phatrwm pan mae\'r ddyfais yn cael ei ailddechrau.</string>
+    <string name="kg_prompt_reason_restart_pin">Mae angen datgloi â PIN pan mae\'r ddyfais yn cael ei ailddechrau.</string>
+    <string name="kg_prompt_reason_restart_password">Mae angen datgloi â chyfrinair pan mae\'r ddyfais yn cael ei ailddechrau.</string>
+    <string name="kg_prompt_reason_timeout_pattern">Rhaid rhoi\'r patrwm fel cam diogelwch ychwanegol.</string>
+    <string name="kg_prompt_reason_timeout_pin">Rhaid rhoi\'r PIN fel cam diogelwch ychwanegol.</string>
+    <string name="kg_prompt_reason_timeout_password">Rhaid rhoi\'r cyfrinair fel cam diogelwch ychwanegol.</string>
+    <string name="kg_prompt_reason_switch_profiles_pattern">Rhaid rhoi\'r patrwm pan wyt yn newid proffil.</string>
+    <string name="kg_prompt_reason_switch_profiles_pin">Rhaid rhoi\'r PIN pan wyt yn newid proffil.</string>
+    <string name="kg_prompt_reason_switch_profiles_password">Rhaid rhoi\'r cyfrinair pan wyt yn newid proffil.</string>
+    <plurals name="kg_prompt_reason_time_pattern">
+        <item quantity="zero">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> oriau. Cadarnha\'r patrwm.</item>
+        <item quantity="one">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r patrwm.</item>
+        <item quantity="two">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r patrwm.</item>
+        <item quantity="few">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r patrwm.</item>
+        <item quantity="many">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r patrwm.</item>
+        <item quantity="other">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r patrwm.</item>
+    </plurals>
+    <plurals name="kg_prompt_reason_time_pin">
+        <item quantity="zero">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> oriau. Cadarnha\'r PIN.</item>
+        <item quantity="one">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r PIN.</item>
+        <item quantity="two">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r PIN.</item>
+        <item quantity="few">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r PIN.</item>
+        <item quantity="many">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r PIN.</item>
+        <item quantity="other">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r PIN.</item>
+    </plurals>
+    <plurals name="kg_prompt_reason_time_password">
+        <item quantity="zero">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> oriau. Cadarnha\'r cyfrinair.</item>
+        <item quantity="one">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r cyfrinair.</item>
+        <item quantity="two">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r cyfrinair.</item>
+        <item quantity="few">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r cyfrinair.</item>
+        <item quantity="many">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r cyfrinair.</item>
+        <item quantity="other">Dyw\'r ddyfais heb ei datgloi ers <xliff:g id="number">%d</xliff:g> awr. Cadarnha\'r cyfrinair.</item>
+    </plurals>
+    <string name="fingerprint_not_recognized">Dim yn ei adnabod</string>
 </resources>
diff --git a/packages/Keyguard/res/values-da/cm_strings.xml b/packages/Keyguard/res/values-da/cm_strings.xml
index 5841d04fe73..4fadf307d13 100644
--- a/packages/Keyguard/res/values-da/cm_strings.xml
+++ b/packages/Keyguard/res/values-da/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-kortet er Perso-låst</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ugyldigt SIM-kort.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Angiv SIM-pinkode, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage, før du må kontakte din udbyder for at låse enheden op.</item>
-    <item quantity="other">Angiv SIM-pinkode, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fejl: Input er kortere end minimumslængden</string>
+    <string name="keyguard_perso_locked_message">SIM-kort er Person-låst</string>
+    <string name="lockscreen_sim_error_message_short">Ugyldigt kort.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Angiv SIM-PIN, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage, før du skal kontakte din operatør for at låse din enhed op.</item>
+        <item quantity="other">Angiv SIM-PIN, du har <xliff:g id="number">%d</xliff:g> forsøg tilbage.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fejl: Input kortere end minimumslængde</string>
 </resources>
diff --git a/packages/Keyguard/res/values-de/cm_strings.xml b/packages/Keyguard/res/values-de/cm_strings.xml
index 9dfd661f19a..b7c1f260741 100644
--- a/packages/Keyguard/res/values-de/cm_strings.xml
+++ b/packages/Keyguard/res/values-de/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-Karte ist gesperrt</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ungültige SIM-Karte.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuch, bevor Sie den Netzbetreiber zum Entsperren des Geräts kontaktieren müssen.</item>
-    <item quantity="other">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuche, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fehler: Die Eingabe ist kürzer als die Mindestlänge.</string>
+    <string name="keyguard_perso_locked_message">SIM-Karte ist gesperrt</string>
+    <string name="lockscreen_sim_error_message_short">Ungültige SIM-Karte.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuch, bevor Sie den Netzbetreiber zum Entsperren des Geräts kontaktieren müssen.</item>
+        <item quantity="other">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuche, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fehler: Die Eingabe ist kürzer als die Mindestlänge.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-el/cm_strings.xml b/packages/Keyguard/res/values-el/cm_strings.xml
index 78e5498c310..e0a3bdd04dc 100644
--- a/packages/Keyguard/res/values-el/cm_strings.xml
+++ b/packages/Keyguard/res/values-el/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Η κάρτα SIM είναι κλειδωμένη</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Μη έγκυρη κάρτα.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες πριν χρειαστεί να επικοινωνήσετε με τον πάροχό σας για να ξεκλειδώσετε τη συσκευή σας.</item>
-    <item quantity="other">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Σφάλμα: Το μήκος εισόδου είναι μικρότερο από το ελάχιστο μήκος</string>
+    <string name="keyguard_perso_locked_message">Η κάρτα SIM είναι κλειδωμένη</string>
+    <string name="lockscreen_sim_error_message_short">Μη έγκυρη κάρτα.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες πριν χρειαστεί να επικοινωνήσετε με τον πάροχό σας για να ξεκλειδώσετε τη συσκευή σας.</item>
+        <item quantity="other">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Σφάλμα: Το μήκος εισόδου είναι μικρότερο από το ελάχιστο μήκος</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rAU/cm_strings.xml b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
index 0fd03100769..86db37ea326 100644
--- a/packages/Keyguard/res/values-en-rAU/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM card is Perso locked</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Invalid card.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
-    <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
+    <string name="keyguard_perso_locked_message">SIM card is Perso locked</string>
+    <string name="lockscreen_sim_error_message_short">Invalid card.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+        <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rGB/cm_strings.xml b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
index d17273a4fc6..f91b3bd793c 100644
--- a/packages/Keyguard/res/values-en-rGB/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM card is Perso locked</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Invalid card.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your network operator to unlock your device.</item>
-    <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
+    <string name="keyguard_perso_locked_message">SIM card is Perso locked</string>
+    <string name="lockscreen_sim_error_message_short">Invalid card.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your network operator to unlock your device.</item>
+        <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rIN/cm_strings.xml b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
index c0f7bbb02e3..d5e878647ae 100644
--- a/packages/Keyguard/res/values-en-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Invalid card.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
-    <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>
+    <string name="lockscreen_sim_error_message_short">Invalid card.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+        <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rPT/cm_strings.xml b/packages/Keyguard/res/values-en-rPT/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-en-rPT/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-en-rPT/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-eo/cm_strings.xml b/packages/Keyguard/res/values-eo/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-eo/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index 170dcaca8a8..c05b089d290 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -19,127 +19,7 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_delete">Forigi</string>
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">Neniu servo.</string>
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <string name="airplane_mode">Aviadila reĝimo</string>
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="keyboardview_keycode_delete">Forigi</string>
+    <string name="keyguard_carrier_default">Neniu servo.</string>
+    <string name="airplane_mode">Aviadila reĝimo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-es-rMX/cm_strings.xml b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
index ff28392e0c3..acfee5bde26 100644
--- a/packages/Keyguard/res/values-es-rMX/cm_strings.xml
+++ b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
@@ -16,10 +16,6 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
+    <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+    <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-es-rMX/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-es-rUS/cm_strings.xml b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
index 1f11c8ff3cd..ef55503605e 100644
--- a/packages/Keyguard/res/values-es-rUS/cm_strings.xml
+++ b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Tarjeta inválida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Ingresa el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
-    <item quantity="other">Ingresa el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
+    <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+    <string name="lockscreen_sim_error_message_short">Tarjeta inválida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Ingresa el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
+        <item quantity="other">Ingresa el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-es/cm_strings.xml b/packages/Keyguard/res/values-es/cm_strings.xml
index 268627bd39a..e9ad36f44d3 100644
--- a/packages/Keyguard/res/values-es/cm_strings.xml
+++ b/packages/Keyguard/res/values-es/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Tarjeta inválida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que comunicarte con tu operadora para desbloquear el dispositivo.</item>
-    <item quantity="other">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
+    <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+    <string name="lockscreen_sim_error_message_short">Tarjeta inválida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que comunicarte con tu operadora para desbloquear el dispositivo.</item>
+        <item quantity="other">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-et-rEE/cm_strings.xml b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
index 3a284d7207f..8f2f96cd0b8 100644
--- a/packages/Keyguard/res/values-et-rEE/cm_strings.xml
+++ b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
@@ -16,11 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM on Perso lukustatud</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Kehtetu kaart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Viga: PIN liiga lühike</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM on Perso lukustatud</string>
+    <string name="lockscreen_sim_error_message_short">Kehtetu kaart.</string>
+    <string name="kg_invalid_sim_length">Viga: PIN liiga lühike</string>
 </resources>
diff --git a/packages/Keyguard/res/values-eu-rES/cm_strings.xml b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
index aaed5c3d95f..86aec64123a 100644
--- a/packages/Keyguard/res/values-eu-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM txartelak blokeo pertsonala du</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Txartela baliogabea.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Sartu SIM txartelaren PIN kodea, saiakera  <xliff:g id="number">%d</xliff:g> geratzen zaizu gailua desblokeatzeko zure operadorearekin kontaktuan jarri behar aurretik.</item>
-    <item quantity="other">Sartu SIM txartelaren PIN kodea, <xliff:g id="number">%d</xliff:g> saiakera geratzen zaizkizu.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Errorea: Sarrera gutxieneko luzera baino laburragoa da</string>
+    <string name="keyguard_perso_locked_message">SIM txartelak blokeo pertsonala du</string>
+    <string name="lockscreen_sim_error_message_short">Txartela baliogabea.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Sartu SIM txartelaren PIN kodea, saiakera  <xliff:g id="number">%d</xliff:g> geratzen zaizu gailua desblokeatzeko zure operadorearekin kontaktuan jarri behar aurretik.</item>
+        <item quantity="other">Sartu SIM txartelaren PIN kodea, <xliff:g id="number">%d</xliff:g> saiakera geratzen zaizkizu.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Errorea: Sarrera gutxieneko luzera baino laburragoa da</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fa/cm_strings.xml b/packages/Keyguard/res/values-fa/cm_strings.xml
index d0694757b51..bfa469bfd65 100644
--- a/packages/Keyguard/res/values-fa/cm_strings.xml
+++ b/packages/Keyguard/res/values-fa/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">سیم کارت نامعتبر.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">سیم کارت نامعتبر.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fi/cm_strings.xml b/packages/Keyguard/res/values-fi/cm_strings.xml
index b8eb2f6364e..59c220bed2a 100644
--- a/packages/Keyguard/res/values-fi/cm_strings.xml
+++ b/packages/Keyguard/res/values-fi/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-kortti on Perso-lukittu</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Virheellinen kortti.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Syötä SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritys jäljellä, tai sinun on pyydetttävä operaattoriasi poistamaan laitteen lukitus.</item>
-    <item quantity="other">Anna SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritystä jäljellä.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Virhe: Syöttö lyhyempi kuin vähimmäispituus</string>
+    <string name="keyguard_perso_locked_message">SIM-kortti on Perso-lukittu</string>
+    <string name="lockscreen_sim_error_message_short">Virheellinen kortti.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Syötä SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritys jäljellä, tai sinun on pyydetttävä operaattoriasi poistamaan laitteen lukitus.</item>
+        <item quantity="other">Anna SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritystä jäljellä.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Virhe: Syöttö lyhyempi kuin vähimmäispituus</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fr-rCA/cm_strings.xml b/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-fr/cm_strings.xml b/packages/Keyguard/res/values-fr/cm_strings.xml
index 9cf3816ff68..5441bea1220 100644
--- a/packages/Keyguard/res/values-fr/cm_strings.xml
+++ b/packages/Keyguard/res/values-fr/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">La carte SIM possède un verrouillage personnel</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Carte SIM incorrecte.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentative avant d\'avoir à contacter votre opérateur pour déverrouiller votre appareil.</item>
-    <item quantity="other">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentatives.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Erreur : code entré trop court</string>
+    <string name="keyguard_perso_locked_message">La carte SIM possède un verrouillage personnel</string>
+    <string name="lockscreen_sim_error_message_short">Carte SIM incorrecte.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentative avant d\'avoir à contacter votre opérateur pour déverrouiller votre appareil.</item>
+        <item quantity="other">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentatives.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Erreur : code entré trop court</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/cm_strings.xml b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
index 0ba09aa7d02..0889481b8a6 100644
--- a/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
+++ b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
@@ -16,8 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="keyguard_perso_locked_message">Simkaart is Perso-beskoattele</string>
+    <string name="lockscreen_sim_error_message_short">Unjildige simkaart.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Sim-pin ynfiere, jo hawwe <xliff:g id="number">%d</xliff:g> restearjende besykjen eardat jo kontakt opnimme moatte mei jo provider om jo apparaat te ûntskoatteljen.</item>
+        <item quantity="other">Sim-pin ynfiere, jo hawe <xliff:g id="number">%d</xliff:g> restearjende besykjen.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Flater: Ynfier is koarter as minimumlingte</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-fy-rNL/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 314940a1b5b..f063921965a 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">A SIM/RUIM personalizada está bloqueada</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de ter que comunicarte con a tua operadora para desbloquear o dispositivo.</item>
-    <item quantity="other">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
+    <string name="keyguard_perso_locked_message">A SIM/RUIM personalizada está bloqueada</string>
+    <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de ter que comunicarte con a tua operadora para desbloquear o dispositivo.</item>
+        <item quantity="other">Introduce o código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-gu-rIN/cm_strings.xml b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
index 7e4d6f5bfec..4ca5d764416 100644
--- a/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM કાર્ડ Perso લૉક કર્યું છે</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">અપ્રમાણિત કાર્ડ.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM PIN દાખલ કરો, તમારું ડિવાઇસ તમારા પ્રદાતા પાસે અનલૉક કરવા તેમનો સંપર્ક સાધતા પહેલાં તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી રહ્યાં છે.</item>
-    <item quantity="other">SIM PIN દાખલ કરો, તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી છે.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">ભૂલ: લધુત્તમ લંબાઇ કરતા ઇનપુટ ટૂંકુ છે</string>
+    <string name="keyguard_perso_locked_message">SIM કાર્ડ Perso લૉક કર્યું છે</string>
+    <string name="lockscreen_sim_error_message_short">અપ્રમાણિત કાર્ડ.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM PIN દાખલ કરો, તમારું ડિવાઇસ તમારા પ્રદાતા પાસે અનલૉક કરવા તેમનો સંપર્ક સાધતા પહેલાં તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી રહ્યાં છે.</item>
+        <item quantity="other">SIM PIN દાખલ કરો, તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી છે.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">ભૂલ: લધુત્તમ લંબાઇ કરતા ઇનપુટ ટૂંકુ છે</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hi/cm_strings.xml b/packages/Keyguard/res/values-hi/cm_strings.xml
index db6aed79afb..1f47369c469 100644
--- a/packages/Keyguard/res/values-hi/cm_strings.xml
+++ b/packages/Keyguard/res/values-hi/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">अमान्य कार्ड।</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">अमान्य कार्ड।</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hr/cm_strings.xml b/packages/Keyguard/res/values-hr/cm_strings.xml
index 96f38d29a5b..8dabff7c590 100644
--- a/packages/Keyguard/res/values-hr/cm_strings.xml
+++ b/packages/Keyguard/res/values-hr/cm_strings.xml
@@ -16,16 +16,12 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM kartica je Perso zaključana</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Kartica nije valjana.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Upišite PIN za SIM, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
-    <item quantity="few">Upišite PIN za SIM, preostala su vam <xliff:g id="number">%d</xliff:g> pokušaja.</item>
-    <item quantity="other">Upišite PIN za SIM, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Pogreška: ulazna vrijednost je kraćia od minimalne potrebne duljine</string>
+    <string name="keyguard_perso_locked_message">SIM kartica je Perso zaključana</string>
+    <string name="lockscreen_sim_error_message_short">Kartica nije valjana.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Upišite PIN za SIM, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
+        <item quantity="few">Upišite PIN za SIM, preostala su vam <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+        <item quantity="other">Upišite PIN za SIM, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Pogreška: ulazna vrijednost je kraćia od minimalne potrebne duljine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hu/cm_strings.xml b/packages/Keyguard/res/values-hu/cm_strings.xml
index 5eedde4140a..ce7bfeea092 100644
--- a/packages/Keyguard/res/values-hu/cm_strings.xml
+++ b/packages/Keyguard/res/values-hu/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM Perso zárva</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Érvénytelen kártya.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt mielőtt fel kell vennie a kapcsolatot a mobilszolgáltatójával a készülék feloldásához.</item>
-    <item quantity="other">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Hiba: A bemeneti adat rövidebb, mint a minimális hossz</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM Perso zárva</string>
+    <string name="lockscreen_sim_error_message_short">Érvénytelen kártya.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt mielőtt fel kell vennie a kapcsolatot a mobilszolgáltatójával a készülék feloldásához.</item>
+        <item quantity="other">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Hiba: A bemeneti adat rövidebb, mint a minimális hossz</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hy-rAM/cm_strings.xml b/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-in/cm_strings.xml b/packages/Keyguard/res/values-in/cm_strings.xml
index 16e6bf57998..7fc642f8ba5 100644
--- a/packages/Keyguard/res/values-in/cm_strings.xml
+++ b/packages/Keyguard/res/values-in/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Kartu SIM terkunci operator seluler lain</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Kartu tidak valid.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">Masukkan PIN SIM, Anda memiliki <xliff:g id="number">%d</xliff:g> upaya tersisa.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Kesalahan: Masukan lebih pendek dari panjang minimum</string>
+    <string name="keyguard_perso_locked_message">Kartu SIM terkunci operator seluler lain</string>
+    <string name="lockscreen_sim_error_message_short">Kartu tidak valid.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">Masukkan PIN SIM, Anda memiliki <xliff:g id="number">%d</xliff:g> upaya tersisa.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Kesalahan: Masukan lebih pendek dari panjang minimum</string>
 </resources>
diff --git a/packages/Keyguard/res/values-is-rIS/cm_strings.xml b/packages/Keyguard/res/values-is-rIS/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-is-rIS/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-it/cm_strings.xml b/packages/Keyguard/res/values-it/cm_strings.xml
index f0dd7e36e9d..cbbc730b256 100644
--- a/packages/Keyguard/res/values-it/cm_strings.xml
+++ b/packages/Keyguard/res/values-it/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM bloccata</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Scheda non valida.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativo rimanente prima di dover contattare l\'operatore per sbloccare il dispositivo.</item>
-    <item quantity="other">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativi rimanenti.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Errore: input non sufficientemente lungo</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM bloccata</string>
+    <string name="lockscreen_sim_error_message_short">Scheda non valida.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativo rimanente prima di dover contattare l\'operatore per sbloccare il dispositivo.</item>
+        <item quantity="other">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativi rimanenti.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Errore: input non sufficientemente lungo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-iw/cm_strings.xml b/packages/Keyguard/res/values-iw/cm_strings.xml
index faaecee6fe3..5b5863a8f2b 100644
--- a/packages/Keyguard/res/values-iw/cm_strings.xml
+++ b/packages/Keyguard/res/values-iw/cm_strings.xml
@@ -16,17 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">כרטיס SIM נעול להתאמות אישיות</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">כרטיס לא חוקי.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">הזן את קוד ה-PIN של כרטיס ה-SIM, נותר לך ניסיון <xliff:g id="number">%d</xliff:g> לפני שתיאלץ לפנות לספק התקשורת שלך על מנת לבטל את נעילת המכשיר.</item>
-    <item quantity="two">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
-    <item quantity="many">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
-    <item quantity="other">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">שגיאה: הקלט קצר יותר מהאורך המינימלי</string>
+    <string name="keyguard_perso_locked_message">כרטיס SIM נעול להתאמות אישיות</string>
+    <string name="lockscreen_sim_error_message_short">כרטיס לא חוקי.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">הזן את קוד ה-PIN של כרטיס ה-SIM, נותר לך ניסיון <xliff:g id="number">%d</xliff:g> לפני שתיאלץ לפנות לספק התקשורת שלך על מנת לבטל את נעילת המכשיר.</item>
+        <item quantity="two">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
+        <item quantity="many">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
+        <item quantity="other">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">שגיאה: הקלט קצר יותר מהאורך המינימלי</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ja/cm_strings.xml b/packages/Keyguard/res/values-ja/cm_strings.xml
index 7049ab67f06..a8bc0456bd1 100644
--- a/packages/Keyguard/res/values-ja/cm_strings.xml
+++ b/packages/Keyguard/res/values-ja/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIMはペルソロックされています</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">無効なカードです。</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">SIMのPINを入力してください、残り<xliff:g id="number">%d</xliff:g>回試行することができます。</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">エラー: 入力が最小長よりも短いです</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIMはペルソロックされています</string>
+    <string name="lockscreen_sim_error_message_short">無効なカードです。</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">SIMのPINを入力してください、残り<xliff:g id="number">%d</xliff:g>回試行することができます。</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">エラー: 入力が最小長よりも短いです</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ka-rGE/cm_strings.xml b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
index 0ba09aa7d02..8a311f92d34 100644
--- a/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
+++ b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
@@ -16,8 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">უმოქმედო ბარათი.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-kab-rDZ/cm_strings.xml b/packages/Keyguard/res/values-kab-rDZ/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-kab-rDZ/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-kab-rDZ/strings.xml b/packages/Keyguard/res/values-kab-rDZ/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-kab-rDZ/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml b/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-km-rKH/cm_strings.xml b/packages/Keyguard/res/values-km-rKH/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-km-rKH/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
index 7b7f4e20ecd..ea15e8a9371 100644
--- a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">ಸಿಮ್/ಆರ್‍ಯುಐಎಂ ಪರ್ಸೊ ಲಾಕ್ ಆಗಿದೆ</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">ಅಮಾನ್ಯ ಕಾರ್ಡ್.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
-    <item quantity="other">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">ದೋಷ: ಇನ್ಪುಟ್ ಕನಿಷ್ಠ ಉದ್ದ ಚಿಕ್ಕದಾಗಿರುತ್ತವೆ</string>
+    <string name="keyguard_perso_locked_message">ಸಿಮ್/ಆರ್‍ಯುಐಎಂ ಪರ್ಸೊ ಲಾಕ್ ಆಗಿದೆ</string>
+    <string name="lockscreen_sim_error_message_short">ಅಮಾನ್ಯ ಕಾರ್ಡ್.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
+        <item quantity="other">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">ದೋಷ: ಇನ್ಪುಟ್ ಕನಿಷ್ಠ ಉದ್ದ ಚಿಕ್ಕದಾಗಿರುತ್ತವೆ</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ko/cm_strings.xml b/packages/Keyguard/res/values-ko/cm_strings.xml
index 3ca8c327db0..a648d8e71ce 100644
--- a/packages/Keyguard/res/values-ko/cm_strings.xml
+++ b/packages/Keyguard/res/values-ko/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM이 Perso lock되어 있습니다.</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">올바르지 않은 카드입니다.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">SIM PIN을 입력하십시오. <xliff:g id="number">%d</xliff:g>회 후에는 이동통신사에 연락하여 기기를 잠금 해제해야 합니다.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">오류: 입력한 값이 최소 길이보다 짧음</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM이 Perso lock되어 있습니다.</string>
+    <string name="lockscreen_sim_error_message_short">올바르지 않은 카드입니다.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">SIM PIN을 입력하십시오. <xliff:g id="number">%d</xliff:g>회 후에는 이동통신사에 연락하여 기기를 잠금 해제해야 합니다.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">오류: 입력한 값이 최소 길이보다 짧음</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/cm_strings.xml b/packages/Keyguard/res/values-ku/cm_strings.xml
index 969ee48621b..b11796bdde8 100644
--- a/packages/Keyguard/res/values-ku/cm_strings.xml
+++ b/packages/Keyguard/res/values-ku/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">کارته‌که‌ نادرووستە.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">کارته‌که‌ نادرووستە.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 336eff9d2d8..f1ced5d4b45 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -19,214 +19,88 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_code">PIN کۆد بنوسه‌</string>
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_puk_code">PUK ی سیمکارته‌که‌ و  PIN ی نوێ بنوسه‌</string>
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_puk_prompt">کۆدی PUK ی سیمکارت</string>
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_pin_prompt">پین کۆدی نوێی سیمکارت</string>
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <string name="keyguard_password_entry_touch_hint"><font size="17">بیسووه‌ بۆ نوسینی تێپەڕەوشە</font></string>
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_password_code">تێپه‌ڕه‌وشه‌ بنوسه‌ بۆ کردنه‌وه‌</string>
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_password_code">PIN بنوسه‌ بۆ کردنه‌وه‌</string>
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <string name="keyguard_password_wrong_pin_code">پین کۆد هەڵە بوو.</string>
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <string name="keyguard_charged">بارگاویی بوو</string>
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <string name="keyguard_low_battery">بارگاویکه‌رەکەت ببەستەوە.</string>
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message_short">سیمکارتی تێدا نییە</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="tablet">تابلێته‌که‌ سیمکارتی تێدا نییه‌.</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="default">ته‌له‌فۆنه‌که‌ سیمکارتی تێدا نییه‌.</string>
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <string name="keyguard_missing_sim_instructions">سیمکارتێکی تێبکه‌.</string>
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <string name="keyguard_missing_sim_instructions_long">سیمکارتی تێ نه‌کراوه‌ یان نایخوێنێته‌وه‌. سیمکارتێکی تێکه‌.</string>
-  <!-- Shown when SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_message_short">سیمکارتەکە بەکارنایەت.</string>
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_instructions">سیمکارتەکەت بۆ هه‌میشه‌ لەکار خرا .\n 
+    <string name="keyguard_password_enter_pin_code">PIN کۆد بنوسه‌</string>
+    <string name="keyguard_password_enter_puk_code">PUK ی سیمکارته‌که‌ و  PIN ی نوێ بنوسه‌</string>
+    <string name="keyguard_password_enter_puk_prompt">کۆدی PUK ی سیمکارت</string>
+    <string name="keyguard_password_enter_pin_prompt">پین کۆدی نوێی سیمکارت</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">بیسووه‌ بۆ نوسینی تێپەڕەوشە</font></string>
+    <string name="keyguard_password_enter_password_code">تێپه‌ڕه‌وشه‌ بنوسه‌ بۆ کردنه‌وه‌</string>
+    <string name="keyguard_password_enter_pin_password_code">PIN بنوسه‌ بۆ کردنه‌وه‌</string>
+    <string name="keyguard_password_wrong_pin_code">پین کۆد هەڵە بوو.</string>
+    <string name="keyguard_charged">بارگاویی بوو</string>
+    <string name="keyguard_low_battery">بارگاویکه‌رەکەت ببەستەوە.</string>
+    <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
+    <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
+    <string name="keyguard_missing_sim_message_short">سیمکارتی تێدا نییە</string>
+    <string name="keyguard_missing_sim_message" product="tablet">تابلێته‌که‌ سیمکارتی تێدا نییه‌.</string>
+    <string name="keyguard_missing_sim_message" product="default">ته‌له‌فۆنه‌که‌ سیمکارتی تێدا نییه‌.</string>
+    <string name="keyguard_missing_sim_instructions">سیمکارتێکی تێبکه‌.</string>
+    <string name="keyguard_missing_sim_instructions_long">سیمکارتی تێ نه‌کراوه‌ یان نایخوێنێته‌وه‌. سیمکارتێکی تێکه‌.</string>
+    <string name="keyguard_permanent_disabled_sim_message_short">سیمکارتەکە بەکارنایەت.</string>
+    <string name="keyguard_permanent_disabled_sim_instructions">سیمکارتەکەت بۆ هه‌میشه‌ لەکار خرا .\n 
     پەیوەندیی بکە بە دابینکه‌ری ڕاژه‌ی بێته‌له‌وه‌ بۆ سیمکارتێکی تر.</string>
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <string name="keyguard_sim_locked_message">سیمکارتەکە داخرا.</string>
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <string name="keyguard_sim_puk_locked_message">سیمکارتەکە به‌ شێوه‌ی PUK داخرا.</string>
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <string name="keyguard_sim_unlock_progress_dialog_message">کردنەوەی سیمکارت\u2026</string>
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <string name="keyguard_accessibility_pattern_unlock">کردنه‌وه‌ بە کێشان.</string>
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_unlock">کردنه‌وه‌ی پین.</string>
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_password_unlock">کردنه‌وه‌ی تێپه‌ڕه‌وشه‌.</string>
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ناوچەی خه‌تکێشان.</string>
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_enter">دانان</string>
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <string name="kg_forgot_pattern_button_text">بیرچونی خه‌تکێشان</string>
-  <!-- Message shown when user enters wrong pattern -->
-  <string name="kg_wrong_pattern">خه‌تکێشان هه‌ڵه‌یه‌</string>
-  <!-- Message shown when user enters wrong password -->
-  <string name="kg_wrong_password">تێپەڕەوشە هەڵەیه‌</string>
-  <!-- Message shown when user enters wrong PIN -->
-  <string name="kg_wrong_pin">PIN هەڵەیە</string>
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <string name="kg_too_many_failed_attempts_countdown">دووبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.</string>
-  <!-- Instructions for using the pattern unlock screen -->
-  <string name="kg_pattern_instructions">خه‌ت بکێشه‌</string>
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <string name="kg_sim_pin_instructions">دانانی PIN ی سیم</string>
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <string name="kg_pin_instructions">دانانی PIN</string>
-  <!-- Instructions for using the password unlock screen -->
-  <string name="kg_password_instructions">دانانی تێپەڕەوشە</string>
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <string name="kg_puk_enter_puk_hint">ئێستا سیمه‌که‌ ناکارایه‌. کۆدی PUK دابنێ بۆ به‌رده‌وامبوون. بۆ زانیاریی زیاتر په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینه‌که‌ره‌وه‌.</string>
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <string name="kg_puk_enter_pin_hint">دانانی PIN کۆد بە ئارەزوی خۆت</string>
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <string name="kg_enter_confirm_pin_hint">دڵنیاکردنەوەی PIN کۆد</string>
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <string name="kg_sim_unlock_progress_dialog_message">کردنه‌وه‌ی سیمکارت\u2026</string>
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <string name="kg_invalid_sim_pin_hint">PIN ێک بنوسه‌ له‌ 4 بۆ 8 ژماره‌ پێکهاتبێت.</string>
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <string name="kg_invalid_sim_puk_hint">کۆدی PUK ده‌بێت 8 ژمارە یان زیاتر بێت.</string>
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <string name="kg_invalid_puk">دوبارە کۆدی PUK لێدەرەوە. هه‌وڵی چه‌ندباره‌ سیمکارته‌که‌ت له‌کار ده‌خات.</string>
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <string name="kg_invalid_confirm_pin_hint" product="default">PIN کۆد هاوتا نییە</string>
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <string name="kg_login_too_many_attempts">زۆر هه‌وڵی خه‌تکێشانت داوه‌</string>
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <string name="kg_too_many_failed_pin_attempts_dialog_message">
-        بە هەڵە PIN ت نوسیوە <xliff:g id="number">%d</xliff:g> جار.
+    <string name="keyguard_sim_locked_message">سیمکارتەکە داخرا.</string>
+    <string name="keyguard_sim_puk_locked_message">سیمکارتەکە به‌ شێوه‌ی PUK داخرا.</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message">کردنەوەی سیمکارت\u2026</string>
+    <string name="keyguard_accessibility_pattern_unlock">کردنه‌وه‌ بە کێشان.</string>
+    <string name="keyguard_accessibility_pin_unlock">کردنه‌وه‌ی پین.</string>
+    <string name="keyguard_accessibility_password_unlock">کردنه‌وه‌ی تێپه‌ڕه‌وشه‌.</string>
+    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ناوچەی خه‌تکێشان.</string>
+    <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
+    <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
+    <string name="keyboardview_keycode_enter">دانان</string>
+    <string name="kg_forgot_pattern_button_text">بیرچونی خه‌تکێشان</string>
+    <string name="kg_wrong_pattern">خه‌تکێشان هه‌ڵه‌یه‌</string>
+    <string name="kg_wrong_password">تێپەڕەوشە هەڵەیه‌</string>
+    <string name="kg_wrong_pin">PIN هەڵەیە</string>
+    <string name="kg_too_many_failed_attempts_countdown">دووبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.</string>
+    <string name="kg_pattern_instructions">خه‌ت بکێشه‌</string>
+    <string name="kg_sim_pin_instructions">دانانی PIN ی سیم</string>
+    <string name="kg_pin_instructions">دانانی PIN</string>
+    <string name="kg_password_instructions">دانانی تێپەڕەوشە</string>
+    <string name="kg_puk_enter_puk_hint">ئێستا سیمه‌که‌ ناکارایه‌. کۆدی PUK دابنێ بۆ به‌رده‌وامبوون. بۆ زانیاریی زیاتر په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینه‌که‌ره‌وه‌.</string>
+    <string name="kg_puk_enter_pin_hint">دانانی PIN کۆد بە ئارەزوی خۆت</string>
+    <string name="kg_enter_confirm_pin_hint">دڵنیاکردنەوەی PIN کۆد</string>
+    <string name="kg_sim_unlock_progress_dialog_message">کردنه‌وه‌ی سیمکارت\u2026</string>
+    <string name="kg_invalid_sim_pin_hint">PIN ێک بنوسه‌ له‌ 4 بۆ 8 ژماره‌ پێکهاتبێت.</string>
+    <string name="kg_invalid_sim_puk_hint">کۆدی PUK ده‌بێت 8 ژمارە یان زیاتر بێت.</string>
+    <string name="kg_invalid_puk">دوبارە کۆدی PUK لێدەرەوە. هه‌وڵی چه‌ندباره‌ سیمکارته‌که‌ت له‌کار ده‌خات.</string>
+    <string name="kg_invalid_confirm_pin_hint" product="default">PIN کۆد هاوتا نییە</string>
+    <string name="kg_login_too_many_attempts">زۆر هه‌وڵی خه‌تکێشانت داوه‌</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message">        بە هەڵە PIN ت نوسیوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     
     </string>
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <string name="kg_too_many_failed_password_attempts_dialog_message">
-        بەهەڵە تێپەڕە وشەت لێداوە <xliff:g id="number">%d</xliff:g> جار.
+    <string name="kg_too_many_failed_password_attempts_dialog_message">        بەهەڵە تێپەڕە وشەت لێداوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     
     </string>
-  <string name="kg_too_many_failed_pattern_attempts_dialog_message">
-        بە هەڵە خه‌تکێشانت لێداوه‌ <xliff:g id="number">%d</xliff:g> جار.
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message">        بە هەڵە خه‌تکێشانت لێداوه‌ <xliff:g id="number">%d</xliff:g> جار.
         \n\nدووبارە هەوڵبدەره‌وه‌ له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     
-   
-</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="tablet">
-       به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت داوە <xliff:g id="number">%d</xliff:g> times جار.
+   </string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet">       به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت داوە <xliff:g id="number">%d</xliff:g> times جار.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
        داوات لێ ده‌کرێت تابلێته‌که‌ت بکه‌یته‌وه‌ به‌ به‌کارهێنانی هه‌ژماری ئیمه‌یڵ.\n\n
        جارێکی تر هه‌وڵ بده‌ره‌وه‌ له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     </string>
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="default">
-       به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت لێداوە <xliff:g id="number">%d</xliff:g> times جار.
+    <string name="kg_failed_attempts_almost_at_login" product="default">       به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت لێداوە <xliff:g id="number">%d</xliff:g> times جار.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
        داوات لێ ده‌کرێت ته‌له‌فۆنه‌که‌ بکه‌یته‌وه‌ به‌ به‌کارهێنانی هه‌ژماری ئیمه‌یڵ. \n\n
        جارێکی تر هه‌وڵ بده‌ره‌وه‌ له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     </string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_pin_code_pukked">PIN کۆد هه‌ڵه‌یه‌ پێویسته‌ ئێستا په‌یوه‌ندیی بکه‌یت به‌ کۆمپانیای دابینکه‌ره‌وه‌ بۆ کردنه‌وه‌ی ئامێره‌که‌ت.</string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_pin_code">
-    <item quantity="one">PIN کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی که‌ پێویست بکات په‌یوه‌ندیی به‌ کۆمپانیای دابینکه‌ره‌وه‌ بکه‌یت.</item>
-    <item quantity="other">کۆدی سیمکارت هەڵەیە .تۆ ته‌نیا <xliff:g id="number">%d</xliff:g> هەوڵێکت ماوە پێشی ئەوەی پەیوەندی بکەیت بە کۆمپانیاوە  بۆ کردنەوەی ئامێرەکەت .</item>
-  </plurals>
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_puk_code_dead">سیمه‌که‌ له‌کار که‌وتووه‌. په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینکه‌ره‌وه‌.</string>
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_puk_code">
-    <item quantity="one">PUK کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
-    <item quantity="other">PUK کۆدی سیم به‌ هه‌ڵه‌ لێدراوه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
-  </plurals>
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_pin_failed">کارپێکردنی PIN ی سیم شکستی هێنا!</string>
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_puk_failed">کارپێکردنی PUK ی سیم شکستی هێنا!</string>
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <string name="kg_pin_accepted">کۆدەکە وه‌رگیرا!</string>
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">خزمەتگوزاریی به‌رده‌ست نییە.</string>
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="kg_password_wrong_pin_code_pukked">PIN کۆد هه‌ڵه‌یه‌ پێویسته‌ ئێستا په‌یوه‌ندیی بکه‌یت به‌ کۆمپانیای دابینکه‌ره‌وه‌ بۆ کردنه‌وه‌ی ئامێره‌که‌ت.</string>
+    <plurals name="kg_password_wrong_pin_code">
+        <item quantity="one">PIN کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی که‌ پێویست بکات په‌یوه‌ندیی به‌ کۆمپانیای دابینکه‌ره‌وه‌ بکه‌یت.</item>
+        <item quantity="other">کۆدی سیمکارت هەڵەیە .تۆ ته‌نیا <xliff:g id="number">%d</xliff:g> هەوڵێکت ماوە پێشی ئەوەی پەیوەندی بکەیت بە کۆمپانیاوە  بۆ کردنەوەی ئامێرەکەت .</item>
+    </plurals>
+    <string name="kg_password_wrong_puk_code_dead">سیمه‌که‌ له‌کار که‌وتووه‌. په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینکه‌ره‌وه‌.</string>
+    <plurals name="kg_password_wrong_puk_code">
+        <item quantity="one">PUK کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
+        <item quantity="other">PUK کۆدی سیم به‌ هه‌ڵه‌ لێدراوه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
+    </plurals>
+    <string name="kg_password_pin_failed">کارپێکردنی PIN ی سیم شکستی هێنا!</string>
+    <string name="kg_password_puk_failed">کارپێکردنی PUK ی سیم شکستی هێنا!</string>
+    <string name="kg_pin_accepted">کۆدەکە وه‌رگیرا!</string>
+    <string name="keyguard_carrier_default">خزمەتگوزاریی به‌رده‌ست نییە.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ky-rKG/cm_strings.xml b/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-lb/cm_strings.xml b/packages/Keyguard/res/values-lb/cm_strings.xml
index 7e662b949ce..e696864960b 100644
--- a/packages/Keyguard/res/values-lb/cm_strings.xml
+++ b/packages/Keyguard/res/values-lb/cm_strings.xml
@@ -16,11 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM huet eng personaliséiert Spärung</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ongëlteg Kaart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Feeler: Agab ass méi kuerz wéi d\'Mindestlängt</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM huet eng personaliséiert Spärung</string>
+    <string name="lockscreen_sim_error_message_short">Ongëlteg Kaart.</string>
+    <string name="kg_invalid_sim_length">Feeler: Agab ass méi kuerz wéi d\'Mindestlängt</string>
 </resources>
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index 07639835725..b6fd54e12d5 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -19,217 +19,96 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <string name="app_name">Tastespär</string>
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_code">PIN-Code aginn</string>
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_puk_code">SIM-PUK an nei PIN aginn</string>
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_puk_prompt">SIM-PUK-Code</string>
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_pin_prompt">Neie SIM-PIN-Code</string>
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <string name="keyguard_password_entry_touch_hint"><font size="17">Dréck fir d\'Passwuert anzeginn</font></string>
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_password_code">Passwuert agi fir z\'entspären</string>
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_password_code">PIN agi fir z\'entspären</string>
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <string name="keyguard_password_wrong_pin_code">Falsche PIN-Code.</string>
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <string name="keyguard_charged">Opgelueden</string>
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <string name="keyguard_plugged_in">Gëtt opgelueden</string>
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <string name="keyguard_plugged_in_charging_fast">Gëtt séier opgelueden</string>
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <string name="keyguard_plugged_in_charging_slowly">Gëtt lues opgelueden</string>
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <string name="keyguard_low_battery">Connectéier däin Oplueder.</string>
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message_short">Keng SIM-Kaart</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="tablet">Keng SIM-Kaart am Tablet.</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="default">Keng SIM-Kaart am Telefon.</string>
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <string name="keyguard_missing_sim_instructions">SIM-Kaart asetzen.</string>
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <string name="keyguard_missing_sim_instructions_long">D\'SIM-Kaart feelt oder ass net liesbar. Setz eng SIM-Kaart an.</string>
-  <!-- Shown when SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_message_short">Onbenotzbar SIM-Kaart.</string>
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_instructions">Deng SIM-Kaart gouf permanent ausgeschalt.\n
+    <string name="app_name">Tastespär</string>
+    <string name="keyguard_password_enter_pin_code">PIN-Code aginn</string>
+    <string name="keyguard_password_enter_puk_code">SIM-PUK an nei PIN aginn</string>
+    <string name="keyguard_password_enter_puk_prompt">SIM-PUK-Code</string>
+    <string name="keyguard_password_enter_pin_prompt">Neie SIM-PIN-Code</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">Dréck fir d\'Passwuert anzeginn</font></string>
+    <string name="keyguard_password_enter_password_code">Passwuert agi fir z\'entspären</string>
+    <string name="keyguard_password_enter_pin_password_code">PIN agi fir z\'entspären</string>
+    <string name="keyguard_password_wrong_pin_code">Falsche PIN-Code.</string>
+    <string name="keyguard_charged">Opgelueden</string>
+    <string name="keyguard_plugged_in">Gëtt opgelueden</string>
+    <string name="keyguard_plugged_in_charging_fast">Gëtt séier opgelueden</string>
+    <string name="keyguard_plugged_in_charging_slowly">Gëtt lues opgelueden</string>
+    <string name="keyguard_low_battery">Connectéier däin Oplueder.</string>
+    <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
+    <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
+    <string name="keyguard_missing_sim_message_short">Keng SIM-Kaart</string>
+    <string name="keyguard_missing_sim_message" product="tablet">Keng SIM-Kaart am Tablet.</string>
+    <string name="keyguard_missing_sim_message" product="default">Keng SIM-Kaart am Telefon.</string>
+    <string name="keyguard_missing_sim_instructions">SIM-Kaart asetzen.</string>
+    <string name="keyguard_missing_sim_instructions_long">D\'SIM-Kaart feelt oder ass net liesbar. Setz eng SIM-Kaart an.</string>
+    <string name="keyguard_permanent_disabled_sim_message_short">Onbenotzbar SIM-Kaart.</string>
+    <string name="keyguard_permanent_disabled_sim_instructions">Deng SIM-Kaart gouf permanent ausgeschalt.\n
 Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <string name="keyguard_sim_locked_message">D\'SIM-Kaart ass gespaart.</string>
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <string name="keyguard_sim_puk_locked_message">D\'SIM-Kaart ass PUK-gespaart.</string>
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <string name="keyguard_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <string name="keyguard_accessibility_pattern_unlock">Entspäre mat Muster.</string>
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_unlock">Entspäre mat PIN.</string>
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_password_unlock">Entspäre mat Passwuert.</string>
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Musterberäich.</string>
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_area">PIN-Beräich</string>
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_sim_pin_area">SIM-PIN-Beräich</string>
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_sim_puk_area">SIM-PUK-Beräich</string>
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_delete">Läschen</string>
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_enter">Enter</string>
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <string name="kg_forgot_pattern_button_text">Muster vergiess</string>
-  <!-- Message shown when user enters wrong pattern -->
-  <string name="kg_wrong_pattern">Falscht Muster</string>
-  <!-- Message shown when user enters wrong password -->
-  <string name="kg_wrong_password">Falscht Passwuert</string>
-  <!-- Message shown when user enters wrong PIN -->
-  <string name="kg_wrong_pin">Falsche PIN</string>
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <string name="kg_too_many_failed_attempts_countdown">Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
-  <!-- Instructions for using the pattern unlock screen -->
-  <string name="kg_pattern_instructions">Mol däi Muster</string>
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <string name="kg_sim_pin_instructions">SIM-PIN aginn</string>
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <string name="kg_sim_pin_instructions_multi">SIM-PIN fir \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" aginn</string>
-  <!-- Instructions for using the PIN unlock screen -->
-  <string name="kg_pin_instructions">PIN aginn</string>
-  <!-- Instructions for using the password unlock screen -->
-  <string name="kg_password_instructions">Passwuert aginn</string>
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <string name="kg_puk_enter_puk_hint">D\'SIM ass elo desaktivéiert. Gëff e PUK-Code a fir weiderzemaachen. Kontaktéier däi Provider fir Detailer.</string>
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <string name="kg_puk_enter_puk_hint_multi">D\'SIM \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" ass elo desaktivéiert. Gëff de PUK-Code an, fir weiderzemaachen. Kontaktéier däi Provider fir méi Detailer.</string>
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <string name="kg_puk_enter_pin_hint">Gëff de gewënschte PIN-Code an</string>
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <string name="kg_enter_confirm_pin_hint">Bestäteg de gewënschte PIN-Code</string>
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <string name="kg_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <string name="kg_invalid_sim_pin_hint">Gëff e PIN an, deen tëscht 4 an 8 Zifferen huet.</string>
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <string name="kg_invalid_sim_puk_hint">De PUK-Code misst 8 oder méi Zifferen hunn.</string>
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <string name="kg_invalid_puk">Gëff de korrekte PUK-Code nees an. Bei widderhuelende Versich gëtt d\'SIM permanent desaktivéiert.</string>
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <string name="kg_invalid_confirm_pin_hint" product="default">D\'PIN-Codë stëmmen net iwwereneen</string>
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <string name="kg_login_too_many_attempts">Ze vill Musterversich</string>
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <string name="kg_too_many_failed_pin_attempts_dialog_message">Du hues däi PIN <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <string name="kg_too_many_failed_password_attempts_dialog_message">Du hues däi Passwuert <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
-  <string name="kg_too_many_failed_pattern_attempts_dialog_message">
-        Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt.
+    <string name="keyguard_sim_locked_message">D\'SIM-Kaart ass gespaart.</string>
+    <string name="keyguard_sim_puk_locked_message">D\'SIM-Kaart ass PUK-gespaart.</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+    <string name="keyguard_accessibility_pattern_unlock">Entspäre mat Muster.</string>
+    <string name="keyguard_accessibility_pin_unlock">Entspäre mat PIN.</string>
+    <string name="keyguard_accessibility_password_unlock">Entspäre mat Passwuert.</string>
+    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Musterberäich.</string>
+    <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
+    <string name="keyguard_accessibility_pin_area">PIN-Beräich</string>
+    <string name="keyguard_accessibility_sim_pin_area">SIM-PIN-Beräich</string>
+    <string name="keyguard_accessibility_sim_puk_area">SIM-PUK-Beräich</string>
+    <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
+    <string name="keyboardview_keycode_delete">Läschen</string>
+    <string name="keyboardview_keycode_enter">Enter</string>
+    <string name="kg_forgot_pattern_button_text">Muster vergiess</string>
+    <string name="kg_wrong_pattern">Falscht Muster</string>
+    <string name="kg_wrong_password">Falscht Passwuert</string>
+    <string name="kg_wrong_pin">Falsche PIN</string>
+    <string name="kg_too_many_failed_attempts_countdown">Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+    <string name="kg_pattern_instructions">Mol däi Muster</string>
+    <string name="kg_sim_pin_instructions">SIM-PIN aginn</string>
+    <string name="kg_sim_pin_instructions_multi">SIM-PIN fir \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" aginn</string>
+    <string name="kg_pin_instructions">PIN aginn</string>
+    <string name="kg_password_instructions">Passwuert aginn</string>
+    <string name="kg_puk_enter_puk_hint">D\'SIM ass elo desaktivéiert. Gëff e PUK-Code a fir weiderzemaachen. Kontaktéier däi Provider fir Detailer.</string>
+    <string name="kg_puk_enter_puk_hint_multi">D\'SIM \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" ass elo desaktivéiert. Gëff de PUK-Code an, fir weiderzemaachen. Kontaktéier däi Provider fir méi Detailer.</string>
+    <string name="kg_puk_enter_pin_hint">Gëff de gewënschte PIN-Code an</string>
+    <string name="kg_enter_confirm_pin_hint">Bestäteg de gewënschte PIN-Code</string>
+    <string name="kg_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+    <string name="kg_invalid_sim_pin_hint">Gëff e PIN an, deen tëscht 4 an 8 Zifferen huet.</string>
+    <string name="kg_invalid_sim_puk_hint">De PUK-Code misst 8 oder méi Zifferen hunn.</string>
+    <string name="kg_invalid_puk">Gëff de korrekte PUK-Code nees an. Bei widderhuelende Versich gëtt d\'SIM permanent desaktivéiert.</string>
+    <string name="kg_invalid_confirm_pin_hint" product="default">D\'PIN-Codë stëmmen net iwwereneen</string>
+    <string name="kg_login_too_many_attempts">Ze vill Musterversich</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message">Du hues däi PIN <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+    <string name="kg_too_many_failed_password_attempts_dialog_message">Du hues däi Passwuert <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message">        Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt.
         \n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.
     </string>
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_wipe" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Telefon op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_wiping" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dësen Tablet gëtt zréckgesat, wat all d\'Date läscht.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_wiping" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dësen Telefon gëtt zréckgesat, wat all d\'Date läscht.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_erase_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_erasing_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_erasing_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_almost_at_erase_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_erasing_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <string name="kg_failed_attempts_now_erasing_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="tablet">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Tablet duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="default">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Telefon duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_pin_code_pukked">Inkorrekte SIM-PIN-Code. Du muss elo däi Provider kontaktéiere fir däin Apparat z\'entspären.</string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_pin_code">
-    <item quantity="one">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier s de däi Provider kontaktéiere muss fir däin Apparat z\'entspären.</item>
-    <item quantity="other">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg.</item>
-  </plurals>
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_puk_code_dead">D\'SIM ass onbrauchbar. Kontaktéier däi Provider.</string>
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_puk_code">
-    <item quantity="one">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
-    <item quantity="other">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
-  </plurals>
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_pin_failed">SIM-PIN-Operatioun feelgeschloen!</string>
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_puk_failed">SIM-PUK-Operatioun feelgeschloen!</string>
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <string name="kg_pin_accepted">Code acceptéiert!</string>
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">Kee Service.</string>
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Knäppche fir d\'Method fir anzeginn ze wiesselen.</string>
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Telefon op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
+    <string name="kg_failed_attempts_now_wiping" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dësen Tablet gëtt zréckgesat, wat all d\'Date läscht.</string>
+    <string name="kg_failed_attempts_now_wiping" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dësen Telefon gëtt zréckgesat, wat all d\'Date läscht.</string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
+    <string name="kg_failed_attempts_now_erasing_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
+    <string name="kg_failed_attempts_now_erasing_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Tablet duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Telefon duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+    <string name="kg_password_wrong_pin_code_pukked">Inkorrekte SIM-PIN-Code. Du muss elo däi Provider kontaktéiere fir däin Apparat z\'entspären.</string>
+    <plurals name="kg_password_wrong_pin_code">
+        <item quantity="one">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier s de däi Provider kontaktéiere muss fir däin Apparat z\'entspären.</item>
+        <item quantity="other">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg.</item>
+    </plurals>
+    <string name="kg_password_wrong_puk_code_dead">D\'SIM ass onbrauchbar. Kontaktéier däi Provider.</string>
+    <plurals name="kg_password_wrong_puk_code">
+        <item quantity="one">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
+        <item quantity="other">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
+    </plurals>
+    <string name="kg_password_pin_failed">SIM-PIN-Operatioun feelgeschloen!</string>
+    <string name="kg_password_puk_failed">SIM-PUK-Operatioun feelgeschloen!</string>
+    <string name="kg_pin_accepted">Code acceptéiert!</string>
+    <string name="keyguard_carrier_default">Kee Service.</string>
+    <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Knäppche fir d\'Method fir anzeginn ze wiesselen.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-lo-rLA/cm_strings.xml b/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-lt/cm_strings.xml b/packages/Keyguard/res/values-lt/cm_strings.xml
index 752fb399461..f06e0b7039d 100644
--- a/packages/Keyguard/res/values-lt/cm_strings.xml
+++ b/packages/Keyguard/res/values-lt/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Neteisinga kortelė.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">Neteisinga kortelė.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-lv/cm_strings.xml b/packages/Keyguard/res/values-lv/cm_strings.xml
index 0694d2f642d..383d675a1c3 100644
--- a/packages/Keyguard/res/values-lv/cm_strings.xml
+++ b/packages/Keyguard/res/values-lv/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM ir personīgi bloķēta</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Nepareiza karte.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="zero">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
-    <item quantity="one">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
-    <item quantity="other">Ievadiet SIM kartes PIN kodu, jums ir atlikuši <xliff:g id="number">%d </xliff:g> mēģinājumi.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="keyguard_perso_locked_message">SIM/RUIM ir personīgi bloķēta</string>
+    <string name="lockscreen_sim_error_message_short">Nepareiza karte.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="zero">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
+        <item quantity="one">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
+        <item quantity="other">Ievadiet SIM kartes PIN kodu, jums ir atlikuši <xliff:g id="number">%d </xliff:g> mēģinājumi.</item>
+    </plurals>
 </resources>
diff --git a/packages/Keyguard/res/values-mk-rMK/cm_strings.xml b/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-ml-rIN/cm_strings.xml b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
index ea7f2055e4b..e592d3b4ef5 100644
--- a/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">സിം കാർഡ് ലോക്ക്</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">അസാധുവായ കാർഡ്.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ കാരിയർ ബന്ധപ്പെടണം അവശേഷിക്കെ <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
-    <item quantity="other">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">പിശക്: മിനിമം കാരക്ടറുകൾ ഇല്ല</string>
+    <string name="keyguard_perso_locked_message">സിം കാർഡ് ലോക്ക്</string>
+    <string name="lockscreen_sim_error_message_short">അസാധുവായ കാർഡ്.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ കാരിയർ ബന്ധപ്പെടണം അവശേഷിക്കെ <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
+        <item quantity="other">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">പിശക്: മിനിമം കാരക്ടറുകൾ ഇല്ല</string>
 </resources>
diff --git a/packages/Keyguard/res/values-mn-rMN/cm_strings.xml b/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-mr-rIN/cm_strings.xml b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
index c3020ed9ee6..4a1d142b90f 100644
--- a/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">सिम कार्ड पर्सो लॉक्ड आहे</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">अवैध कार्ड.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">सिम पिन लिहा, तुमचे डिव्हाइस अनलॉक करण्यासाठी तुम्ही तुमच्या वाहकाशी संपर्क करण्यापूर्वी तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहे.</item>
-    <item quantity="other">सिम पिन लिहा, तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">त्रुटी: इनपुट किमान लांबीहून लहान</string>
+    <string name="keyguard_perso_locked_message">सिम कार्ड पर्सो लॉक्ड आहे</string>
+    <string name="lockscreen_sim_error_message_short">अवैध कार्ड.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">सिम पिन लिहा, तुमचे डिव्हाइस अनलॉक करण्यासाठी तुम्ही तुमच्या वाहकाशी संपर्क करण्यापूर्वी तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहे.</item>
+        <item quantity="other">सिम पिन लिहा, तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">त्रुटी: इनपुट किमान लांबीहून लहान</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ms-rMY/cm_strings.xml b/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-my-rMM/cm_strings.xml b/packages/Keyguard/res/values-my-rMM/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-my-rMM/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-nb/cm_strings.xml b/packages/Keyguard/res/values-nb/cm_strings.xml
index 99dad159780..5e37e2b9dec 100644
--- a/packages/Keyguard/res/values-nb/cm_strings.xml
+++ b/packages/Keyguard/res/values-nb/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-kort er Person låst</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ugyldig kort.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> forsøk igjen før må du kontakte operatøren for å låse opp enheten.</item>
-    <item quantity="other">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> gjenstående forsøk.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Feil: Input kortere enn minimumslengden</string>
+    <string name="keyguard_perso_locked_message">SIM-kort er Person låst</string>
+    <string name="lockscreen_sim_error_message_short">Ugyldig kort.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> forsøk igjen før må du kontakte operatøren for å låse opp enheten.</item>
+        <item quantity="other">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> gjenstående forsøk.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Feil: Input kortere enn minimumslengden</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ne-rNP/cm_strings.xml b/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-nl/cm_strings.xml b/packages/Keyguard/res/values-nl/cm_strings.xml
index 4eba178ecc6..3a65e5b4865 100644
--- a/packages/Keyguard/res/values-nl/cm_strings.xml
+++ b/packages/Keyguard/res/values-nl/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Simkaart is Perso-vergrendeld</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ongeldige simkaart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen voordat u contact moet opnemen met uw provider om uw apparaat te ontgrendelen.</item>
-    <item quantity="other">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fout: Invoer is korter dan minimumlengte</string>
+    <string name="keyguard_perso_locked_message">Simkaart is Perso-vergrendeld</string>
+    <string name="lockscreen_sim_error_message_short">Ongeldige simkaart.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen voordat u contact moet opnemen met uw provider om uw apparaat te ontgrendelen.</item>
+        <item quantity="other">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fout: Invoer is korter dan minimumlengte</string>
 </resources>
diff --git a/packages/Keyguard/res/values-or-rIN/cm_strings.xml b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
index b20e2bb36ad..a5b7390fd0f 100644
--- a/packages/Keyguard/res/values-or-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM କାର୍ଡ଼ Perso ବନ୍ଦ ଅଛି</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">ଅବୈଧ କାର୍ଡ୍‍।</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ଅନ୍‍ଲକ୍‍ କରିବା ପାଇଁ ଆପଣଙ୍କ ମୋବାଇଲ୍‍ ଅପରେଟରଙ୍କ ସହିତ ସମ୍ପର୍କ କରିବା ପୂର୍ବରୁ ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
-    <item quantity="other">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">ତୃଟି: ଇନ୍ପୁଟ୍ ଛୋଟ ଅଛି ମିନିମମ୍ ଲମ୍ବରୁ</string>
+    <string name="keyguard_perso_locked_message">SIM କାର୍ଡ଼ Perso ବନ୍ଦ ଅଛି</string>
+    <string name="lockscreen_sim_error_message_short">ଅବୈଧ କାର୍ଡ୍‍।</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ଅନ୍‍ଲକ୍‍ କରିବା ପାଇଁ ଆପଣଙ୍କ ମୋବାଇଲ୍‍ ଅପରେଟରଙ୍କ ସହିତ ସମ୍ପର୍କ କରିବା ପୂର୍ବରୁ ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
+        <item quantity="other">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">ତୃଟି: ଇନ୍ପୁଟ୍ ଛୋଟ ଅଛି ମିନିମମ୍ ଲମ୍ବରୁ</string>
 </resources>
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-or-rIN/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-pa-rIN/cm_strings.xml b/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-pl/cm_strings.xml b/packages/Keyguard/res/values-pl/cm_strings.xml
index 855bf8129a3..92d9885a43b 100644
--- a/packages/Keyguard/res/values-pl/cm_strings.xml
+++ b/packages/Keyguard/res/values-pl/cm_strings.xml
@@ -16,16 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Blokada Perso karty SIM/RUIM</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Nieprawidłowa karta.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałą próbę zanim będziesz musiał skontaktować się z operatorem, by odblokować urządzenie.</item>
-    <item quantity="few">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałe próby.</item>
-    <item quantity="other">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałych prób.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Błąd: Podany kod jest za krótki</string>
+    <string name="keyguard_perso_locked_message">Blokada Perso karty SIM/RUIM</string>
+    <string name="lockscreen_sim_error_message_short">Nieprawidłowa karta.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałą próbę zanim będziesz musiał skontaktować się z operatorem, by odblokować urządzenie.</item>
+        <item quantity="few">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałe próby.</item>
+        <item quantity="many">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałych prób.</item>
+        <item quantity="other">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałych prób.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Błąd: Podany kod jest za krótki</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
index d72d43af72f..57ff94721a6 100644
--- a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativa restante antes de precisar contatar sua operadora para desbloquear seu aparelho.</item>
-    <item quantity="other">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativas restantes.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Erro: Entrada mais curta do que o comprimento mínimo</string>
+    <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
+    <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativa restante antes de precisar contatar sua operadora para desbloquear seu aparelho.</item>
+        <item quantity="other">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativas restantes.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Erro: Entrada mais curta do que o comprimento mínimo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
index 2d5c4b1fe19..4c7dd26e509 100644
--- a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativa antes de ter de contactar a sua operadora para desbloquear o dispositivo.</item>
-    <item quantity="other">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativas.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Erro: o tamanho é menor que o requerido</string>
+    <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
+    <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativa antes de ter de contactar a sua operadora para desbloquear o dispositivo.</item>
+        <item quantity="other">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativas.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Erro: o tamanho é menor que o requerido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-rm/cm_strings.xml b/packages/Keyguard/res/values-rm/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-rm/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index 4cfd544b27e..8815eaa9647 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -16,16 +16,12 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Cardul SIM este Perso blocat</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> încercare rămasă înainte de a trebui să contactaţi compania de rețea mobilă pentru a debloca dispozitivul.</item>
-    <item quantity="few">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
-    <item quantity="other">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
+    <string name="keyguard_perso_locked_message">Cardul SIM este Perso blocat</string>
+    <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> încercare rămasă înainte de a trebui să contactaţi compania de rețea mobilă pentru a debloca dispozitivul.</item>
+        <item quantity="few">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+        <item quantity="other">Introduceţi PIN-ul pentru SIM, mai aveţi <xliff:g id="number">%d</xliff:g> (de) încercări rămase.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ru/cm_strings.xml b/packages/Keyguard/res/values-ru/cm_strings.xml
index 6f422032a53..20f8669b2e1 100644
--- a/packages/Keyguard/res/values-ru/cm_strings.xml
+++ b/packages/Keyguard/res/values-ru/cm_strings.xml
@@ -16,16 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-карта заблокирована оператором</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Неисправная SIM-карта.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Введите PIN-код. У вас осталась <xliff:g id="number">%d</xliff:g> попытка перед тем, как вам придется обратиться к оператору для разблокировки.</item>
-    <item quantity="few">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попытки.</item>
-    <item quantity="other">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попыток.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Ошибка: введено меньше минимальной длины</string>
+    <string name="keyguard_perso_locked_message">SIM-карта заблокирована оператором</string>
+    <string name="lockscreen_sim_error_message_short">Неисправная SIM-карта.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Введите PIN-код. У вас осталась <xliff:g id="number">%d</xliff:g> попытка перед тем, как вам придется обратиться к оператору для разблокировки.</item>
+        <item quantity="few">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попытки.</item>
+        <item quantity="many">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попыток.</item>
+        <item quantity="other">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попыток.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Ошибка: введено меньше минимальной длины</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sc-rIT/cm_strings.xml b/packages/Keyguard/res/values-sc-rIT/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-sc-rIT/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-sc-rIT/strings.xml b/packages/Keyguard/res/values-sc-rIT/strings.xml
deleted file mode 100644
index b53b53edada..00000000000
--- a/packages/Keyguard/res/values-sc-rIT/strings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-/* //device/apps/common/assets/res/any/strings.xml
-**
-** Copyright 2006, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown when there is no SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <!-- Shown when SIM card is permanently disabled. -->
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <!-- Message shown when user enters wrong pattern -->
-  <!-- Message shown when user enters wrong password -->
-  <!-- Message shown when user enters wrong PIN -->
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <!-- Instructions for using the pattern unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <!-- Instructions for using the password unlock screen -->
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
-</resources>
diff --git a/packages/Keyguard/res/values-si-rLK/cm_strings.xml b/packages/Keyguard/res/values-si-rLK/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-si-rLK/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-sk/cm_strings.xml b/packages/Keyguard/res/values-sk/cm_strings.xml
index bcc9ea0a364..e8e558cf277 100644
--- a/packages/Keyguard/res/values-sk/cm_strings.xml
+++ b/packages/Keyguard/res/values-sk/cm_strings.xml
@@ -16,16 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM je uzamknutá pomocou Perso</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Neplatná karta.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúci pokus predtým, ako budete musieť kontaktovať vášho operátora pre odomknutie zariadenia.</item>
-    <item quantity="few">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúce pokusy.</item>
-    <item quantity="other">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúcich pokusov.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Chyba: Vstup je kratší ako minimálna dĺžka</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM je uzamknutá pomocou Perso</string>
+    <string name="lockscreen_sim_error_message_short">Neplatná karta.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúci pokus predtým, ako budete musieť kontaktovať vášho operátora pre odomknutie zariadenia.</item>
+        <item quantity="few">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúce pokusy.</item>
+        <item quantity="many">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúcich pokusov.</item>
+        <item quantity="other">Zadajte kód PIN. Máte <xliff:g id="number">%d</xliff:g> zostávajúcich pokusov.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Chyba: Vstup je kratší ako minimálna dĺžka</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sl/cm_strings.xml b/packages/Keyguard/res/values-sl/cm_strings.xml
index 54034a70862..0d567a45bc0 100644
--- a/packages/Keyguard/res/values-sl/cm_strings.xml
+++ b/packages/Keyguard/res/values-sl/cm_strings.xml
@@ -16,17 +16,13 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Kartica SIM je zaklenjena v načinu Perso</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Neveljavna kartica.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostali poskus, preden boste morali stopiti v stik s svojim ponudnikom, da vam odklene napravo.</item>
-    <item quantity="two">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostala poskusa.</item>
-    <item quantity="few">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostale poskuse.</item>
-    <item quantity="other">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostalih poskusov.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Napaka: Vnos je krajši od minimalne zahtevane dolžine</string>
+    <string name="keyguard_perso_locked_message">Kartica SIM je zaklenjena v načinu Perso</string>
+    <string name="lockscreen_sim_error_message_short">Neveljavna kartica.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostali poskus, preden boste morali stopiti v stik s svojim ponudnikom, da vam odklene napravo.</item>
+        <item quantity="two">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostala poskusa.</item>
+        <item quantity="few">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostale poskuse.</item>
+        <item quantity="other">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostalih poskusov.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Napaka: Vnos je krajši od minimalne zahtevane dolžine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
index 16ea787975e..da94e71213e 100644
--- a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
+++ b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Karta SIM ka bllokim Perso</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Kartë e pavlefshme.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Vendosni kodin PIN të kartës SIM. Ju keni edhe <xliff:g id="number">%d</xliff:g> përpjekje të mbetur përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
-    <item quantity="other">Vendosni kodin PIN të kartës SIM. Ju keni <xliff:g id="number">%d</xliff:g> përpjekje të mbetura përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Gabim: Gjatësia e kodit të vendosur është më e shkurtër se gjatësia minimale</string>
+    <string name="keyguard_perso_locked_message">Karta SIM ka bllokim Perso</string>
+    <string name="lockscreen_sim_error_message_short">Kartë e pavlefshme.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Vendosni kodin PIN të kartës SIM. Ju keni edhe <xliff:g id="number">%d</xliff:g> përpjekje të mbetur përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
+        <item quantity="other">Vendosni kodin PIN të kartës SIM. Ju keni <xliff:g id="number">%d</xliff:g> përpjekje të mbetura përpara se të detyroheni të kontaktoni operatorin për të zhbllokuar pajisjen.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Gabim: Gjatësia e kodit të vendosur është më e shkurtër se gjatësia minimale</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sr/cm_strings.xml b/packages/Keyguard/res/values-sr/cm_strings.xml
index 9ae4248dbe4..fe74211c3f6 100644
--- a/packages/Keyguard/res/values-sr/cm_strings.xml
+++ b/packages/Keyguard/res/values-sr/cm_strings.xml
@@ -16,16 +16,12 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM картица је лично закључана</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Неважећа картица.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостали покушај пре него што мораш контактирати свог оператора да откључаш уређај.</item>
-    <item quantity="few">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
-    <item quantity="other">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Грешка: Унос је краћи од минималне дужине</string>
+    <string name="keyguard_perso_locked_message">SIM картица је лично закључана</string>
+    <string name="lockscreen_sim_error_message_short">Неважећа картица.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостали покушај пре него што мораш контактирати свог оператора да откључаш уређај.</item>
+        <item quantity="few">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
+        <item quantity="other">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Грешка: Унос је краћи од минималне дужине</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sv/cm_strings.xml b/packages/Keyguard/res/values-sv/cm_strings.xml
index 0b2cbaa183a..6ca479d22d9 100644
--- a/packages/Keyguard/res/values-sv/cm_strings.xml
+++ b/packages/Keyguard/res/values-sv/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-kortet är personligt låst</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Ogiltigt SIM.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
-    <item quantity="other">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Fel: Input kortare än minsta längd</string>
+    <string name="keyguard_perso_locked_message">SIM-kortet är personligt låst</string>
+    <string name="lockscreen_sim_error_message_short">Ogiltigt SIM.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
+        <item quantity="other">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Fel: Input kortare än minsta längd</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sw/cm_strings.xml b/packages/Keyguard/res/values-sw/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-sw/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-ta-rIN/cm_strings.xml b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
index dded59d19ec..1fe1daaae5e 100644
--- a/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM கார்டு பெர்சோ பூட்டப்பட்டது.</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">செல்லுபடியாகாத கார்டு.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">உள்ளிடுக SIM PIN, உங்கள் சாதனத்தை பூட்டுநீக்க உங்கள் கேரியரை தொடர்புகொள்வதற்உ முன்பாக உங்களிடம் <xliff:g id="number">%d</xliff:g> முயற்சி மீதமுள்ளது.</item>
-    <item quantity="other">உள்ளிடுக SIM PIN, உங்களிடம்  <xliff:g id="number">%d</xliff:g>  முயற்சிகள் இதமுள்ளன.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">பிழை: குறைந்தபட்ச நீளத்தைவிட உள்ளீடு சுருக்கமாக உள்ளது.</string>
+    <string name="keyguard_perso_locked_message">SIM கார்டு பெர்சோ பூட்டப்பட்டது.</string>
+    <string name="lockscreen_sim_error_message_short">செல்லுபடியாகாத கார்டு.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">உள்ளிடுக SIM PIN, உங்கள் சாதனத்தை பூட்டுநீக்க உங்கள் கேரியரை தொடர்புகொள்வதற்உ முன்பாக உங்களிடம் <xliff:g id="number">%d</xliff:g> முயற்சி மீதமுள்ளது.</item>
+        <item quantity="other">உள்ளிடுக SIM PIN, உங்களிடம்  <xliff:g id="number">%d</xliff:g>  முயற்சிகள் இதமுள்ளன.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">பிழை: குறைந்தபட்ச நீளத்தைவிட உள்ளீடு சுருக்கமாக உள்ளது.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-te-rIN/cm_strings.xml b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
index 4404c920ce2..b369798e490 100644
--- a/packages/Keyguard/res/values-te-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM పెర్సో లాక్ చేయబడింది</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">చెల్లని కార్డ్.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM PIN ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి ప్రయత్నించే ముందు పరికరాన్ని అన్లాక్ చేసేందుకు మీరు మీ కారియరును సంప్రదించాలి.</item>
-    <item quantity="other">SIM PINను ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> మిగిలి ఉన్నాయి.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">దోషం: ఇన్‌పుట్ కనీస పొడవుకంటే తక్కువగా ఉంది</string>
+    <string name="keyguard_perso_locked_message">SIM పెర్సో లాక్ చేయబడింది</string>
+    <string name="lockscreen_sim_error_message_short">చెల్లని కార్డ్.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM PIN ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి ప్రయత్నించే ముందు పరికరాన్ని అన్లాక్ చేసేందుకు మీరు మీ కారియరును సంప్రదించాలి.</item>
+        <item quantity="other">SIM PINను ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> మిగిలి ఉన్నాయి.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">దోషం: ఇన్‌పుట్ కనీస పొడవుకంటే తక్కువగా ఉంది</string>
 </resources>
diff --git a/packages/Keyguard/res/values-th/cm_strings.xml b/packages/Keyguard/res/values-th/cm_strings.xml
index 39f873af969..48f046d3b31 100644
--- a/packages/Keyguard/res/values-th/cm_strings.xml
+++ b/packages/Keyguard/res/values-th/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">ซิมการ์ดถูกเปโซล็อค</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">ซิมการ์ดไม่ถูกต้อง</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">ใส่รหัสซิมการ์ด สามารถใส่รหัสได้อีก <xliff:g id="number">%d</xliff:g> ก่อนจะต้องติดต่อติดต่อผู้ให้บริการเพื่อปลดล็อคอุปกรณ์ของคุณ</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">ผิดพลาด: ข้อมูลที่ป้อนสั้นกว่าความยาวขั้นต่ำ</string>
+    <string name="keyguard_perso_locked_message">ซิมการ์ดถูกเปโซล็อค</string>
+    <string name="lockscreen_sim_error_message_short">ซิมการ์ดไม่ถูกต้อง</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">ใส่รหัสซิมการ์ด สามารถใส่รหัสได้อีก <xliff:g id="number">%d</xliff:g> ก่อนจะต้องติดต่อติดต่อผู้ให้บริการเพื่อปลดล็อคอุปกรณ์ของคุณ</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">ผิดพลาด: ข้อมูลที่ป้อนสั้นกว่าความยาวขั้นต่ำ</string>
 </resources>
diff --git a/packages/Keyguard/res/values-tr/cm_strings.xml b/packages/Keyguard/res/values-tr/cm_strings.xml
index b08f821ab6a..c9bdc198ab0 100644
--- a/packages/Keyguard/res/values-tr/cm_strings.xml
+++ b/packages/Keyguard/res/values-tr/cm_strings.xml
@@ -16,15 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM Özel kilitli</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Geçersiz kart.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı, yoksa cihazınızın kilidini açabilmek için operatörünüz ile iletişim kurmak zorunda kalacaksınız.</item>
-    <item quantity="other">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Hata: Giriş en kısa uzunluktan daha kısa</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM Özel kilitli</string>
+    <string name="lockscreen_sim_error_message_short">Geçersiz kart.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="one">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı, yoksa cihazınızın kilidini açabilmek için operatörünüz ile iletişim kurmak zorunda kalacaksınız.</item>
+        <item quantity="other">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Hata: Giriş en kısa uzunluktan daha kısa</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/cm_strings.xml b/packages/Keyguard/res/values-ug/cm_strings.xml
index 885b4a98c97..e7cd4d8afcc 100644
--- a/packages/Keyguard/res/values-ug/cm_strings.xml
+++ b/packages/Keyguard/res/values-ug/cm_strings.xml
@@ -16,14 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM/RUIM قۇلۇپلاندى</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">ئىناۋەتسىز كارتا.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">بۇ SIM كارتىنىڭ PIN نى كىرگۈزۈڭ، سىزنىڭ يەنە <xliff:g id="number">%d</xliff:g> قېتىم سىناش پۇرسىتىڭىز بار.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">خاتالىق: كىرگۈزگىنىڭىز بەك قىسقا بۇلۇپ قالدى</string>
+    <string name="keyguard_perso_locked_message">SIM/RUIM قۇلۇپلاندى</string>
+    <string name="lockscreen_sim_error_message_short">ئىناۋەتسىز كارتا.</string>
+    <string name="kg_invalid_sim_length">خاتالىق: كىرگۈزگىنىڭىز بەك قىسقا بۇلۇپ قالدى</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 6ad14ee86dd..2d171accdcb 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -19,184 +19,61 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- App label in the manifest  -->
-  <string name="app_name">ئاچقۇچلۇق</string>
-  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_code">PIN كودىنى كىرگۈزۈڭ</string>
-  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_puk_code">SIM PUK ۋە يېڭى PIN كودىنى كىرگۈزۈڭ</string>
-  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_puk_prompt">SIM PUK كودى</string>
-  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
-  <string name="keyguard_password_enter_pin_prompt">يېڭى SIM كارتا PIN كودى</string>
-  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
-  <string name="keyguard_password_entry_touch_hint"><font size="17">\"بۇ جاينى چېكىپ ئىم كىرگۈزۈڭ\"</font></string>
-  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_password_code">قۇلۇپ ئېچىش ئۈچۈن ئىم كىرگۈزۈڭ</string>
-  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
-         Displayed in one line in a large font.  -->
-  <string name="keyguard_password_enter_pin_password_code">PIN كىرگۈزۈپ قۇلۇپ ئېچىڭ</string>
-  <!-- Instructions telling the user that they entered the wrong pin while trying
-         to unlock the keyguard.  Displayed in one line in a large font.  -->
-  <string name="keyguard_password_wrong_pin_code">PIN كودى خاتا.</string>
-  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
-         charged, say that it is charged. -->
-  <string name="keyguard_charged">توكلاندى</string>
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, say that it's charging.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
-  <!-- When the lock screen is showing and the phone plugged in, and the battery
-         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
-  <!-- When the lock screen is showing and the battery is low, warn user to plug
-         in the phone soon. -->
-  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
-  <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
-  <!-- SIM messages -->
-  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
-  <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message_short">SIM كارتا يوق</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="tablet">تاختا كومپيۇتېردا SIM كارتا يوق.</string>
-  <!-- Shown when there is no SIM card. -->
-  <string name="keyguard_missing_sim_message" product="default">تېلېفوندا SIM كارتا يوق.</string>
-  <!-- Shown to ask the user to insert a SIM card. -->
-  <string name="keyguard_missing_sim_instructions">SIM كارتا قىستۇرۇڭ.</string>
-  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
-  <string name="keyguard_missing_sim_instructions_long">SIM كارتا يوقالغان ياكى ئوقۇغىلى بولمايدۇ. SIM كارتا قىستۇرۇڭ.</string>
-  <!-- Shown when SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_message_short">SIM كارتىنى ئىشلەتكىلى بولمايدۇ.</string>
-  <!-- Shown to inform the user to SIM card is permanently disabled. -->
-  <string name="keyguard_permanent_disabled_sim_instructions">سىزنىڭ SIM كارتىڭىز مەڭگۈلۈك توختىتىلدى.\nسىمسىز تور مۇلازىمىتى تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىپ، يېڭىدىن بىر SIM كارتىغا ئېرىشىڭ.</string>
-  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
-  <string name="keyguard_sim_locked_message">SIM كارتا قۇلۇپلانغان.</string>
-  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
-  <string name="keyguard_sim_puk_locked_message">SIM كارتا PUK نۇمۇر ئارقىلىق قۇلۇپلانغان.</string>
-  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
-         whether it is valid, and to unlock the sim if it is valid.  we display a
-         progress dialog in the meantime.  this is the emssage. -->
-  <string name="keyguard_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
-  <!-- Time format strings for fall-back clock widget -->
-  <!-- Time format strings for fall-back clock widget -->
-  <string name="keyguard_accessibility_pattern_unlock">ئەدىزەدە قۇلۇپ ئاچىدۇ.</string>
-  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pin_unlock">بۇ Pin دا قۇلۇپ ئاچىدۇ.</string>
-  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_password_unlock">ئىمدا قۇلۇپ ئاچىدۇ.</string>
-  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ئەندىزە دائىرىسى.</string>
-  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
-  <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
-  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
-  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
-  <!-- KeyguardPinView - accessibility support -->
-  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <string name="keyboardview_keycode_delete">ئۆچۈر</string>
-  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
-  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
-  <string name="kg_forgot_pattern_button_text">ئەندىزە ئۇنتۇلغان</string>
-  <!-- Message shown when user enters wrong pattern -->
-  <string name="kg_wrong_pattern">ئەندىزە خاتا</string>
-  <!-- Message shown when user enters wrong password -->
-  <string name="kg_wrong_password">ئىم خاتا</string>
-  <!-- Message shown when user enters wrong PIN -->
-  <string name="kg_wrong_pin">بۇ PIN خاتا</string>
-  <!-- Countdown message shown after too many failed unlock attempts -->
-  <string name="kg_too_many_failed_attempts_countdown"><xliff:g id="NUMBER">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <!-- Instructions for using the pattern unlock screen -->
-  <string name="kg_pattern_instructions">قۇلۇپ ئاچىدىغان ئەندىزە سىزىڭ</string>
-  <!-- Instructions for using the SIM PIN unlock screen -->
-  <string name="kg_sim_pin_instructions">كىرگۈزىدىغىنىڭىز SIM PIN</string>
-  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
-  <!-- Instructions for using the PIN unlock screen -->
-  <string name="kg_pin_instructions">كىرگۈزىدىغىنىڭىز PIN</string>
-  <!-- Instructions for using the password unlock screen -->
-  <string name="kg_password_instructions">ئىم كىرگۈزۈڭ</string>
-  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
-  <string name="kg_puk_enter_puk_hint">بۇ SIM كارتا توختىتىلغان. PUK كودى كىرگۈزۈلگەندىلا ئاندىن ئىشلەتكىلى بولىدۇ. مۇناسىۋەتلىك تەپسىلاتلار ئۈچۈن مۇلازىمەت تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىڭ.</string>
-  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
-  <!-- Hint shown in the PUK unlock screen PIN TextView -->
-  <string name="kg_puk_enter_pin_hint">لازىملىق PIN كودىنى كىرگۈزۈڭ</string>
-  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
-  <string name="kg_enter_confirm_pin_hint">لازىملىق PIN كودىنى جەزملەڭ</string>
-  <!-- Message shown in dialog while the device is unlocking the SIM card -->
-  <string name="kg_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
-  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
-  <string name="kg_invalid_sim_pin_hint">4-8 خانىلىق PIN نى كىرگۈزۈڭ.</string>
-  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
-  <string name="kg_invalid_sim_puk_hint">بۇ PUK كودىدا ئاز دېگەندە 8 ياكى ئۇنىڭدىن كۆپ سان بولىدۇ.</string>
-  <!-- Message shown when the user enters an invalid PUK code -->
-  <string name="kg_invalid_puk">توغرا PUK كودىنى قايتا كىرگۈزۈڭ. ئەگەر خاتا كىرگۈزۈشنىڭ قېتىم سانى بەك كۆپ بولۇپ كەتسە SIM كارتا مەڭگۈلۈك توختىتىلىدۇ.</string>
-  <!-- String shown in PUK screen when PIN codes don't match -->
-  <string name="kg_invalid_confirm_pin_hint" product="default">بۇ PIN كودى ماسلاشمىدى</string>
-  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
-  <string name="kg_login_too_many_attempts">ئەندىزىسىنى سىناش قېتىم سانى بەك كۆپ بولۇپ كەتتى</string>
-  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
-  <string name="kg_too_many_failed_pin_attempts_dialog_message">سىز PIN نى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
-  <string name="kg_too_many_failed_password_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئىمنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <string name="kg_too_many_failed_pattern_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="tablet">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <!-- Message shown in dialog when user is almost at the limit where they will be
-    locked out and may have to enter an alternate username/password to unlock the phone -->
-  <string name="kg_failed_attempts_almost_at_login" product="default">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تېلېفون قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_pin_code_pukked">SIM كارتا PIN كودى توغرا ئەمەس؛ ھازىر مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىپ ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ.</string>
-  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <plurals name="kg_password_wrong_pin_code">
-    <item quantity="other">SIM كارتا PIN كودى توغرا ئەمەس، سىزنىڭ <xliff:g id="NUMBER">%d</xliff:g> قېتىم سىناش پۇرسىتىڭىز بار. ئەگەر يەنىلا مەغلۇپ بولسىڭىز مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىپ ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ.</item>
-  </plurals>
-  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
-         Displayed in a dialog box.  -->
-  <string name="kg_password_wrong_puk_code_dead">SIM كارتىنى ئىشلەتكىلى بولمايدۇ. مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىڭ.</string>
-  <!-- Instructions telling the user that they entered the wrong puk while trying
-         to unlock the keyguard.  Displayed in a dialog box.  -->
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with SIM PIN failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_pin_failed">SIM كارتا PIN مەشغۇلاتى مەغلۇپ بولدى!</string>
-  <!-- Instructions telling the user that the operation to unlock the keyguard
-         with PUK failed. Displayed in one line in a large font.  -->
-  <string name="kg_password_puk_failed">SIM كارتا PUK مەشغۇلاتى مەغلۇپ بولدى!</string>
-  <!-- Notification telling the user that the PIN1 they entered is valid -->
-  <string name="kg_pin_accepted">كود توغرا</string>
-  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
-        This is displayed if the phone is not connected to a carrier.-->
-  <string name="keyguard_carrier_default">مۇلازىمەت يوق.</string>
-  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
-  <!-- Description of airplane mode -->
-  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
-  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
-  <!-- Fingerprint hint message when finger was not recognized.-->
+    <string name="app_name">ئاچقۇچلۇق</string>
+    <string name="keyguard_password_enter_pin_code">PIN كودىنى كىرگۈزۈڭ</string>
+    <string name="keyguard_password_enter_puk_code">SIM PUK ۋە يېڭى PIN كودىنى كىرگۈزۈڭ</string>
+    <string name="keyguard_password_enter_puk_prompt">SIM PUK كودى</string>
+    <string name="keyguard_password_enter_pin_prompt">يېڭى SIM كارتا PIN كودى</string>
+    <string name="keyguard_password_entry_touch_hint"><font size="17">\"بۇ جاينى چېكىپ ئىم كىرگۈزۈڭ\"</font></string>
+    <string name="keyguard_password_enter_password_code">قۇلۇپ ئېچىش ئۈچۈن ئىم كىرگۈزۈڭ</string>
+    <string name="keyguard_password_enter_pin_password_code">PIN كىرگۈزۈپ قۇلۇپ ئېچىڭ</string>
+    <string name="keyguard_password_wrong_pin_code">PIN كودى خاتا.</string>
+    <string name="keyguard_charged">توكلاندى</string>
+    <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
+    <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
+    <string name="keyguard_missing_sim_message_short">SIM كارتا يوق</string>
+    <string name="keyguard_missing_sim_message" product="tablet">تاختا كومپيۇتېردا SIM كارتا يوق.</string>
+    <string name="keyguard_missing_sim_message" product="default">تېلېفوندا SIM كارتا يوق.</string>
+    <string name="keyguard_missing_sim_instructions">SIM كارتا قىستۇرۇڭ.</string>
+    <string name="keyguard_missing_sim_instructions_long">SIM كارتا يوقالغان ياكى ئوقۇغىلى بولمايدۇ. SIM كارتا قىستۇرۇڭ.</string>
+    <string name="keyguard_permanent_disabled_sim_message_short">SIM كارتىنى ئىشلەتكىلى بولمايدۇ.</string>
+    <string name="keyguard_permanent_disabled_sim_instructions">سىزنىڭ SIM كارتىڭىز مەڭگۈلۈك توختىتىلدى.\nسىمسىز تور مۇلازىمىتى تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىپ، يېڭىدىن بىر SIM كارتىغا ئېرىشىڭ.</string>
+    <string name="keyguard_sim_locked_message">SIM كارتا قۇلۇپلانغان.</string>
+    <string name="keyguard_sim_puk_locked_message">SIM كارتا PUK نۇمۇر ئارقىلىق قۇلۇپلانغان.</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+    <string name="keyguard_accessibility_pattern_unlock">ئەدىزەدە قۇلۇپ ئاچىدۇ.</string>
+    <string name="keyguard_accessibility_pin_unlock">بۇ Pin دا قۇلۇپ ئاچىدۇ.</string>
+    <string name="keyguard_accessibility_password_unlock">ئىمدا قۇلۇپ ئاچىدۇ.</string>
+    <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ئەندىزە دائىرىسى.</string>
+    <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
+    <string name="keyboardview_keycode_delete">ئۆچۈر</string>
+    <string name="kg_forgot_pattern_button_text">ئەندىزە ئۇنتۇلغان</string>
+    <string name="kg_wrong_pattern">ئەندىزە خاتا</string>
+    <string name="kg_wrong_password">ئىم خاتا</string>
+    <string name="kg_wrong_pin">بۇ PIN خاتا</string>
+    <string name="kg_too_many_failed_attempts_countdown"><xliff:g id="NUMBER">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_pattern_instructions">قۇلۇپ ئاچىدىغان ئەندىزە سىزىڭ</string>
+    <string name="kg_sim_pin_instructions">كىرگۈزىدىغىنىڭىز SIM PIN</string>
+    <string name="kg_pin_instructions">كىرگۈزىدىغىنىڭىز PIN</string>
+    <string name="kg_password_instructions">ئىم كىرگۈزۈڭ</string>
+    <string name="kg_puk_enter_puk_hint">بۇ SIM كارتا توختىتىلغان. PUK كودى كىرگۈزۈلگەندىلا ئاندىن ئىشلەتكىلى بولىدۇ. مۇناسىۋەتلىك تەپسىلاتلار ئۈچۈن مۇلازىمەت تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىڭ.</string>
+    <string name="kg_puk_enter_pin_hint">لازىملىق PIN كودىنى كىرگۈزۈڭ</string>
+    <string name="kg_enter_confirm_pin_hint">لازىملىق PIN كودىنى جەزملەڭ</string>
+    <string name="kg_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+    <string name="kg_invalid_sim_pin_hint">4-8 خانىلىق PIN نى كىرگۈزۈڭ.</string>
+    <string name="kg_invalid_sim_puk_hint">بۇ PUK كودىدا ئاز دېگەندە 8 ياكى ئۇنىڭدىن كۆپ سان بولىدۇ.</string>
+    <string name="kg_invalid_puk">توغرا PUK كودىنى قايتا كىرگۈزۈڭ. ئەگەر خاتا كىرگۈزۈشنىڭ قېتىم سانى بەك كۆپ بولۇپ كەتسە SIM كارتا مەڭگۈلۈك توختىتىلىدۇ.</string>
+    <string name="kg_invalid_confirm_pin_hint" product="default">بۇ PIN كودى ماسلاشمىدى</string>
+    <string name="kg_login_too_many_attempts">ئەندىزىسىنى سىناش قېتىم سانى بەك كۆپ بولۇپ كەتتى</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message">سىز PIN نى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_too_many_failed_password_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئىمنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تېلېفون قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+    <string name="kg_password_wrong_pin_code_pukked">SIM كارتا PIN كودى توغرا ئەمەس؛ ھازىر مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىپ ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ.</string>
+    <string name="kg_password_wrong_puk_code_dead">SIM كارتىنى ئىشلەتكىلى بولمايدۇ. مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىڭ.</string>
+    <string name="kg_password_pin_failed">SIM كارتا PIN مەشغۇلاتى مەغلۇپ بولدى!</string>
+    <string name="kg_password_puk_failed">SIM كارتا PUK مەشغۇلاتى مەغلۇپ بولدى!</string>
+    <string name="kg_pin_accepted">كود توغرا</string>
+    <string name="keyguard_carrier_default">مۇلازىمەت يوق.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 48f7c4e48b3..71de0f15e8f 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/cm_strings.xml
@@ -16,16 +16,7 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM-карта заблокована оператором</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Недійсна SIM-карта.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="one">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроба перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
-    <item quantity="few">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроби перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
-    <item quantity="other">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроб перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Помилка: введено менше мінімальної довжини</string>
+    <string name="keyguard_perso_locked_message">SIM-карта заблокована оператором</string>
+    <string name="lockscreen_sim_error_message_short">Недійсна SIM-карта.</string>
+    <string name="kg_invalid_sim_length">Помилка: введено менше мінімальної довжини</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ur-rPK/cm_strings.xml b/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml b/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>
diff --git a/packages/Keyguard/res/values-vi/cm_strings.xml b/packages/Keyguard/res/values-vi/cm_strings.xml
index b28f62cefc4..88686304803 100644
--- a/packages/Keyguard/res/values-vi/cm_strings.xml
+++ b/packages/Keyguard/res/values-vi/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">Thẻ SIM bị khóa Perso</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">Thẻ sim không hợp lệ.</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">Nhập mã PIN của SIM, bạn còn <xliff:g id="number">%d</xliff:g> lần nhập trước khi phải liên hệ với nhà mạng để mở khóa thiết bị.</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">Lỗi: Dữ liệu nhập ngắn hơn độ dài tối thiểu</string>
+    <string name="keyguard_perso_locked_message">Thẻ SIM bị khóa Perso</string>
+    <string name="lockscreen_sim_error_message_short">Thẻ sim không hợp lệ.</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">Nhập mã PIN của SIM, bạn còn <xliff:g id="number">%d</xliff:g> lần nhập trước khi phải liên hệ với nhà mạng để mở khóa thiết bị.</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">Lỗi: Dữ liệu nhập ngắn hơn độ dài tối thiểu</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 948efc1fda1..6eccc7ad894 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM 卡已被锁定</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">请输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会。若超出此次数，则必须为解锁 SIM 卡求助运营商。</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
+    <string name="keyguard_perso_locked_message">SIM 卡已被锁定</string>
+    <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">请输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会。若超出此次数，则必须为解锁 SIM 卡求助运营商。</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
index fe6d6b84414..ae3248c6c9a 100644
--- a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
@@ -16,9 +16,5 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">SIM 卡無效。</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+    <string name="lockscreen_sim_error_message_short">SIM 卡無效。</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
index 78ad50ff8fd..9e488dc7e3f 100644
--- a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
@@ -16,14 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <string name="keyguard_perso_locked_message">SIM 卡已被鎖定</string>
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <string name="lockscreen_sim_error_message_short">無效的 SIM 卡。</string>
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <plurals name="kg_password_default_pin_message">
-    <item quantity="other">輸入 SIM 卡的 PIN 碼，您剩餘 <xliff:g id="number">%d </xliff:g> 次嘗試機會。</item>
-  </plurals>
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-  <string name="kg_invalid_sim_length">錯誤：輸入少於最小長度</string>
+    <string name="keyguard_perso_locked_message">SIM 卡已被鎖定</string>
+    <string name="lockscreen_sim_error_message_short">無效的 SIM 卡。</string>
+    <plurals name="kg_password_default_pin_message">
+        <item quantity="other">輸入 SIM 卡的 PIN 碼，您剩餘 <xliff:g id="number">%d </xliff:g> 次嘗試機會。</item>
+    </plurals>
+    <string name="kg_invalid_sim_length">錯誤：輸入少於最小長度</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zu/cm_strings.xml b/packages/Keyguard/res/values-zu/cm_strings.xml
deleted file mode 100644
index 0ba09aa7d02..00000000000
--- a/packages/Keyguard/res/values-zu/cm_strings.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Generated by crowdin.com-->
-<!--
-     Copyright (C) 2012-2015 The CyanogenMod Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <!-- When the user inserts a sim card with some personalization enabled -->
-  <!-- Shown in the lock screen when there is SIM card IO error. -->
-  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
-  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
-</resources>