Automatic translation import

Change-Id: I4af2a6a904e9229b261e95818f716d6b5708a6f4

106 files changed, 2963 insertions, 3 deletions

diff --git a/packages/Keyguard/res/values-af/cm_strings.xml b/packages/Keyguard/res/values-af/cm_strings.xml
index c9fb74e..1605f19 100644
--- a/packages/Keyguard/res/values-af/cm_strings.xml
+++ b/packages/Keyguard/res/values-af/cm_strings.xml
@@ -16,7 +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/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>
 </resources>
diff --git a/packages/Keyguard/res/values-am/cm_strings.xml b/packages/Keyguard/res/values-am/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-am/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ar/cm_strings.xml b/packages/Keyguard/res/values-ar/cm_strings.xml
index 46f5512..46e0dfb 100644
--- a/packages/Keyguard/res/values-ar/cm_strings.xml
+++ b/packages/Keyguard/res/values-ar/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/cm_strings.xml b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 0000000..9f70040
--- /dev/null
+++ b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-ast-rES/cm_strings.xml b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
index ead7e33..b1164ba 100644
--- a/packages/Keyguard/res/values-ast-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Tarxeta inválida.</string>
+  <!-- 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-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 46bc659..1b0f2a5 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -19,77 +19,205 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
   <string name="app_name">Bloquéu</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">Inxerta\'l códigu 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">Escribi\'l PUK de la tarxeta SIM y un códigu PIN nuevu</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">Códigu PUK de la tarxeta SIM</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">Códigu nuevu PIN de tarxeta SIM</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pa introducir contraseña</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">Inxerta la contraseña pa desbloquiar.</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">Inxerta\'l códigu PIN pa desbloquiar.</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">Códigu PIN incorreutu</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">Cargada</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">Cargando</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.  -->
+  <!-- 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">Coneuta\'l cargador.</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">Empobina al menú pa desbloquiar la pantalla.</string>
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message_short">Falta la tarxeta SIM</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="tablet">Nun s\'inxertó nenguna tarxeta SIM na tablet.</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="default">Nun s\'inxertó nenguna tarxeta SIM nel teléfonu.</string>
+  <!-- Shown to ask the user to insert a SIM card. -->
   <string name="keyguard_missing_sim_instructions">Inxerta una tarxeta 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">Falta la tarxeta SIM o nun pue lleese. Inxerta una tarxeta SIM.</string>
+  <!-- Shown when SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_message_short">Tarxeta SIM inutilizable</string>
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_instructions">La to tarxeta SIM inhabilitóse dafechu.\n Pa obtener otra, ponte en contautu col to fornidor de servicios de telefonía.</string>
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
   <string name="keyguard_sim_locked_message">La tarxeta SIM ta 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">La tarxeta SIM ta bloquiada col códigu 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">Desbloquiando tarxeta SIM…</string>
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
   <string name="keyguard_accessibility_pattern_unlock">Desbloquéu por patrón</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">Desbloquéu por PIN</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">Desbloquéu por contraseña</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Área de patrón</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</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] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <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">Desaniciar</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Intro</string>
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">¿Escaecisti\'l patrón?</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Contraseña incorreuta</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN incorreutu</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">Inténtalo otra vegada en <xliff:g id="NUMBER">%d</xliff:g> segundos.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">Dibuxa\'l to patrón de desbloquéu.</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">Inxerta\'l PIN de la tarxeta SIM.</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">Inxerta\'l PIN.</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">Escribi la contraseña.</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">La tarxeta SIM ta inhabilitada. Pa continuar, inxerta\'l códigu PUK. Si quies más información, ponte en contautu col operador</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">Inxerta\'l códigu PIN deseáu</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">Confirma\'l códigu PIN</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">Inxerta un códigu PIN con una llonxitú ente cuatro y ocho díxitos.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">El códigu PUK tien de tener ocho númberos como mínimu.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">Vuelvi a inxertar el códigu PUK correutu. Si inxertes un códigu incorreutu delles vegaes, va inhabilitase la tarxeta SIM.</string>
+  <!-- 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 -->
   <string name="kg_login_too_many_attempts">Abondos intentos incorreutos de crear el patrón</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">Inxertasti un códigu PIN incorreutu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</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">Inxertasti una contraseña incorreuta <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</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">
        Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
        esta tablet va resetease, desaniciando tolos sos datos.
     </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">
        Intentasti desbloquiar el teléfonu tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
        esta tablet va resetease, desaniciando tolos sos datos.</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">
        Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Esta tablet va resetease, desaniciando tolos sos datos.    </string>
+  <!-- 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">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar la tablet.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</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">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar el teléfonu.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</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">Códigu PIN de la tarxeta SIM incorreutu. Tienes de contautar col to operador pa desbloquiar el preséu.</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">Códigu PIN de la tarxeta SIM incorreutu. Queda <xliff:g id="NUMBER">%d</xliff:g> intentu pa tener que ponete en contautu col to operador pa desbloquiar el preséu.</item>
+    <item quantity="other">Códigu PIN de la tarxeta SIM incorreutu. Queden <xliff:g id="NUMBER">%d</xliff:g> intentos.</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">La tarxeta SIM nun pue usase. Ponte en contautu col to operador.</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">Códigu PUK de la tarxeta SIM incorreutu. Quédate <xliff:g id="NUMBER">%d</xliff:g> intentu pa que la tarxeta SIM nun pueda usase de mou permanente.</item>
+    <item quantity="other">Códigu PUK de la tarxeta SIM incorreutu. Quédente <xliff:g id="NUMBER">%d</xliff:g> intentos pa que la tarxeta SIM nun pueda usase de mou permanente.</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">Fallu al intentar desbloquiar la tarxeta SIM col códigu 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">Fallu al intentar desbloquiar la tarxeta SIM col códigu PUK</string>
+  <!-- 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] -->
+  <!-- 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-az-rAZ/cm_strings.xml b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
index 260bf77..46ee7e1 100644
--- a/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
+++ b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-be/cm_strings.xml b/packages/Keyguard/res/values-be/cm_strings.xml
index 9a7baf5..74002f0 100644
--- a/packages/Keyguard/res/values-be/cm_strings.xml
+++ b/packages/Keyguard/res/values-be/cm_strings.xml
@@ -16,12 +16,16 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-be/strings.xml b/packages/Keyguard/res/values-be/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-be/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-bg/cm_strings.xml b/packages/Keyguard/res/values-bg/cm_strings.xml
index 08e97f6..6ac51c5 100644
--- a/packages/Keyguard/res/values-bg/cm_strings.xml
+++ b/packages/Keyguard/res/values-bg/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">СИМ картата е блокирана от оператора</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>
 </resources>
diff --git a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
index bdb0111..5f1282b 100644
--- a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
+++ b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-br-rFR/cm_strings.xml b/packages/Keyguard/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-ca/cm_strings.xml b/packages/Keyguard/res/values-ca/cm_strings.xml
index 83bfdce..553478b 100644
--- a/packages/Keyguard/res/values-ca/cm_strings.xml
+++ b/packages/Keyguard/res/values-ca/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">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>
 </resources>
diff --git a/packages/Keyguard/res/values-cs/cm_strings.xml b/packages/Keyguard/res/values-cs/cm_strings.xml
index 20fae9d..a66d9a4 100644
--- a/packages/Keyguard/res/values-cs/cm_strings.xml
+++ b/packages/Keyguard/res/values-cs/cm_strings.xml
@@ -16,12 +16,16 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-cy/cm_strings.xml b/packages/Keyguard/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-cy/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-da/cm_strings.xml b/packages/Keyguard/res/values-da/cm_strings.xml
index 34c3190..9fd131c 100644
--- a/packages/Keyguard/res/values-da/cm_strings.xml
+++ b/packages/Keyguard/res/values-da/cm_strings.xml
@@ -16,5 +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.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Fejl: Input er kortere end minimumslængden</string>
 </resources>
diff --git a/packages/Keyguard/res/values-de/cm_strings.xml b/packages/Keyguard/res/values-de/cm_strings.xml
index 2369d8e..d5bf58d 100644
--- a/packages/Keyguard/res/values-de/cm_strings.xml
+++ b/packages/Keyguard/res/values-de/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-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ätes kontaktieren müssen.</item>
+    <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: 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 6ea7b00..78e5498 100644
--- a/packages/Keyguard/res/values-el/cm_strings.xml
+++ b/packages/Keyguard/res/values-el/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.  -->
   <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>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rAU/cm_strings.xml b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
index 5bf42fa..6261b2a 100644
--- a/packages/Keyguard/res/values-en-rAU/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Invalid card.</string>
+  <!-- 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-rGB/cm_strings.xml b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-en-rIN/cm_strings.xml b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
index f737d9e..c0f7bbb 100644
--- a/packages/Keyguard/res/values-en-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rIN/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/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>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rPT/cm_strings.xml b/packages/Keyguard/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-eo/cm_strings.xml b/packages/Keyguard/res/values-eo/cm_strings.xml
index 60da84e..02d7be6 100644
--- a/packages/Keyguard/res/values-eo/cm_strings.xml
+++ b/packages/Keyguard/res/values-eo/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Nevalida karto.</string>
+  <!-- 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 dcaafc1..4578308 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -19,7 +19,127 @@
 */
 -->
 <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.  -->
   <string name="keyguard_plugged_in">Ŝarĝado</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.  -->
+  <!-- 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 -->
+  <!-- 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-rMX/cm_strings.xml b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 0000000..ff28392
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,25 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-es-rUS/cm_strings.xml b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..078fc60
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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 no 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 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">Introduce 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>
+</resources>
diff --git a/packages/Keyguard/res/values-es/cm_strings.xml b/packages/Keyguard/res/values-es/cm_strings.xml
index 72ed182..1e2e79a 100644
--- a/packages/Keyguard/res/values-es/cm_strings.xml
+++ b/packages/Keyguard/res/values-es/cm_strings.xml
@@ -16,10 +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">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 no 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 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>
 </resources>
diff --git a/packages/Keyguard/res/values-et-rEE/cm_strings.xml b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
index 01fd936..b3636d7 100644
--- a/packages/Keyguard/res/values-et-rEE/cm_strings.xml
+++ b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Kehtetu kaart.</string>
+  <!-- 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-eu-rES/cm_strings.xml b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
index 41081c9..aaed5c3 100644
--- a/packages/Keyguard/res/values-eu-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-eu-rES/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 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>
 </resources>
diff --git a/packages/Keyguard/res/values-fa/cm_strings.xml b/packages/Keyguard/res/values-fa/cm_strings.xml
index 84bca66..d069475 100644
--- a/packages/Keyguard/res/values-fa/cm_strings.xml
+++ b/packages/Keyguard/res/values-fa/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-fi/cm_strings.xml b/packages/Keyguard/res/values-fi/cm_strings.xml
index 62cc982..b8eb2f6 100644
--- a/packages/Keyguard/res/values-fi/cm_strings.xml
+++ b/packages/Keyguard/res/values-fi/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-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>
 </resources>
diff --git a/packages/Keyguard/res/values-fil-rPH/cm_strings.xml b/packages/Keyguard/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fr-rCA/cm_strings.xml b/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fr/cm_strings.xml b/packages/Keyguard/res/values-fr/cm_strings.xml
index 4d3398e..9cf3816 100644
--- a/packages/Keyguard/res/values-fr/cm_strings.xml
+++ b/packages/Keyguard/res/values-fr/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">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>
 </resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/cm_strings.xml b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-gd-rGB/cm_strings.xml b/packages/Keyguard/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 1e46e59..4221609 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -16,7 +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.  -->
+  <!-- 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>
 </resources>
diff --git a/packages/Keyguard/res/values-gu-rIN/cm_strings.xml b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 0000000..7e4d6f5
--- /dev/null
+++ b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-hi/cm_strings.xml b/packages/Keyguard/res/values-hi/cm_strings.xml
index 424c41c..db6aed7 100644
--- a/packages/Keyguard/res/values-hi/cm_strings.xml
+++ b/packages/Keyguard/res/values-hi/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-hr/cm_strings.xml b/packages/Keyguard/res/values-hr/cm_strings.xml
index fc1c567..0ccbe4f 100644
--- a/packages/Keyguard/res/values-hr/cm_strings.xml
+++ b/packages/Keyguard/res/values-hr/cm_strings.xml
@@ -16,12 +16,16 @@
      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 SIM PIN, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
     <item quantity="few">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
     <item quantity="other">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Pogreška: Ulaz je kraći od minimalne potrebne duljine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hu/cm_strings.xml b/packages/Keyguard/res/values-hu/cm_strings.xml
index b985e02..5eedde4 100644
--- a/packages/Keyguard/res/values-hu/cm_strings.xml
+++ b/packages/Keyguard/res/values-hu/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/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>
 </resources>
diff --git a/packages/Keyguard/res/values-hy-rAM/cm_strings.xml b/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-in/cm_strings.xml b/packages/Keyguard/res/values-in/cm_strings.xml
index 0a880fb..53e33d9 100644
--- a/packages/Keyguard/res/values-in/cm_strings.xml
+++ b/packages/Keyguard/res/values-in/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Kartu tidak valid.</string>
+  <!-- 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-is-rIS/cm_strings.xml b/packages/Keyguard/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-it/cm_strings.xml b/packages/Keyguard/res/values-it/cm_strings.xml
index 1c48611..f0dd7e3 100644
--- a/packages/Keyguard/res/values-it/cm_strings.xml
+++ b/packages/Keyguard/res/values-it/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/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>
 </resources>
diff --git a/packages/Keyguard/res/values-iw/cm_strings.xml b/packages/Keyguard/res/values-iw/cm_strings.xml
index 0cd676b..76d5bb5 100644
--- a/packages/Keyguard/res/values-iw/cm_strings.xml
+++ b/packages/Keyguard/res/values-iw/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>
-  <string name="lockscreen_sim_error_message_short">כרטיס שגוי.</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="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>
 </resources>
diff --git a/packages/Keyguard/res/values-ja/cm_strings.xml b/packages/Keyguard/res/values-ja/cm_strings.xml
index 0088dfc..7049ab6 100644
--- a/packages/Keyguard/res/values-ja/cm_strings.xml
+++ b/packages/Keyguard/res/values-ja/cm_strings.xml
@@ -16,10 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-ka-rGE/cm_strings.xml b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml b/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-km-rKH/cm_strings.xml b/packages/Keyguard/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
index fd17bce..7b7f4e2 100644
--- a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
@@ -16,5 +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">ಸಿಮ್/ಆರ್‍ಯುಐಎಂ ಪರ್ಸೊ ಲಾಕ್ ಆಗಿದೆ</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>
 </resources>
diff --git a/packages/Keyguard/res/values-ko/cm_strings.xml b/packages/Keyguard/res/values-ko/cm_strings.xml
index 4be11f7..3ca8c32 100644
--- a/packages/Keyguard/res/values-ko/cm_strings.xml
+++ b/packages/Keyguard/res/values-ko/cm_strings.xml
@@ -16,10 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/cm_strings.xml b/packages/Keyguard/res/values-ku/cm_strings.xml
index d5fed16..969ee48 100644
--- a/packages/Keyguard/res/values-ku/cm_strings.xml
+++ b/packages/Keyguard/res/values-ku/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 84be97e..336eff9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -19,59 +19,133 @@
 */
 -->
 <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>
+  <!-- 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> جار.
         \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> جار.
         \n\nدوبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
@@ -83,22 +157,76 @@
     
    
 </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 جار.
        پاش <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 جار.
        پاش <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.-->
 </resources>
diff --git a/packages/Keyguard/res/values-ky-rKG/cm_strings.xml b/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-lb/cm_strings.xml b/packages/Keyguard/res/values-lb/cm_strings.xml
index 805aad0..f775f49 100644
--- a/packages/Keyguard/res/values-lb/cm_strings.xml
+++ b/packages/Keyguard/res/values-lb/cm_strings.xml
@@ -16,5 +16,9 @@
      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">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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index f0cd53f..0763983 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -19,87 +19,217 @@
 */
 -->
 <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
 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.
         \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.-->
 </resources>
diff --git a/packages/Keyguard/res/values-lo-rLA/cm_strings.xml b/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-lt/cm_strings.xml b/packages/Keyguard/res/values-lt/cm_strings.xml
index 9f0cd5e..752fb39 100644
--- a/packages/Keyguard/res/values-lt/cm_strings.xml
+++ b/packages/Keyguard/res/values-lt/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-lv/cm_strings.xml b/packages/Keyguard/res/values-lv/cm_strings.xml
index f2b5d62..0694d2f 100644
--- a/packages/Keyguard/res/values-lv/cm_strings.xml
+++ b/packages/Keyguard/res/values-lv/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/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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-mk-rMK/cm_strings.xml b/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ml-rIN/cm_strings.xml b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 0000000..ea7f205
--- /dev/null
+++ b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-mn-rMN/cm_strings.xml b/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-mr-rIN/cm_strings.xml b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 0000000..c3020ed
--- /dev/null
+++ b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-ms-rMY/cm_strings.xml b/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-my-rMM/cm_strings.xml b/packages/Keyguard/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-nb/cm_strings.xml b/packages/Keyguard/res/values-nb/cm_strings.xml
index bdbebac..13d078d 100644
--- a/packages/Keyguard/res/values-nb/cm_strings.xml
+++ b/packages/Keyguard/res/values-nb/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/RUIM 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>
 </resources>
diff --git a/packages/Keyguard/res/values-ne-rNP/cm_strings.xml b/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-nl/cm_strings.xml b/packages/Keyguard/res/values-nl/cm_strings.xml
index a2266f9..4eba178 100644
--- a/packages/Keyguard/res/values-nl/cm_strings.xml
+++ b/packages/Keyguard/res/values-nl/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">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>
 </resources>
diff --git a/packages/Keyguard/res/values-oc-rFR/cm_strings.xml b/packages/Keyguard/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-or-rIN/cm_strings.xml b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 0000000..b20e2bb
--- /dev/null
+++ b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-pa-rIN/cm_strings.xml b/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-pl/cm_strings.xml b/packages/Keyguard/res/values-pl/cm_strings.xml
index 1a2563c..855bf81 100644
--- a/packages/Keyguard/res/values-pl/cm_strings.xml
+++ b/packages/Keyguard/res/values-pl/cm_strings.xml
@@ -16,12 +16,16 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
index 5ebd5be..99e8c8e 100644
--- a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rBR/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">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 SIM 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>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
index bfa6b3a..2d5c4b1 100644
--- a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rPT/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">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>
 </resources>
diff --git a/packages/Keyguard/res/values-rm/cm_strings.xml b/packages/Keyguard/res/values-rm/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-rm/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index 5f9203b..c9a5723 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- 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">Cartelă SIM incorectă.</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">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 4d64761..6f42203 100644
--- a/packages/Keyguard/res/values-ru/cm_strings.xml
+++ b/packages/Keyguard/res/values-ru/cm_strings.xml
@@ -16,12 +16,16 @@
      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>
-  <string name="lockscreen_sim_error_message_short">Ошибка карты.</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>
 </resources>
diff --git a/packages/Keyguard/res/values-si-rLK/cm_strings.xml b/packages/Keyguard/res/values-si-rLK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-si-rLK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-sk/cm_strings.xml b/packages/Keyguard/res/values-sk/cm_strings.xml
index 8e5df9a..f54f1ff 100644
--- a/packages/Keyguard/res/values-sk/cm_strings.xml
+++ b/packages/Keyguard/res/values-sk/cm_strings.xml
@@ -16,5 +16,9 @@
      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">Neplatná karta.</string>
+  <!-- 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-sl/cm_strings.xml b/packages/Keyguard/res/values-sl/cm_strings.xml
index 84c794e..54034a7 100644
--- a/packages/Keyguard/res/values-sl/cm_strings.xml
+++ b/packages/Keyguard/res/values-sl/cm_strings.xml
@@ -16,13 +16,17 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-sr/cm_strings.xml b/packages/Keyguard/res/values-sr/cm_strings.xml
index f770859..9ae4248 100644
--- a/packages/Keyguard/res/values-sr/cm_strings.xml
+++ b/packages/Keyguard/res/values-sr/cm_strings.xml
@@ -16,12 +16,16 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-sv/cm_strings.xml b/packages/Keyguard/res/values-sv/cm_strings.xml
index 2a225d4..0b2cbaa 100644
--- a/packages/Keyguard/res/values-sv/cm_strings.xml
+++ b/packages/Keyguard/res/values-sv/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-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>
 </resources>
diff --git a/packages/Keyguard/res/values-sw/cm_strings.xml b/packages/Keyguard/res/values-sw/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-sw/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ta-rIN/cm_strings.xml b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
new file mode 100644
index 0000000..dded59d
--- /dev/null
+++ b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-te-rIN/cm_strings.xml b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 0000000..4404c92
--- /dev/null
+++ b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?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 -->
+  <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>
+</resources>
diff --git a/packages/Keyguard/res/values-th/cm_strings.xml b/packages/Keyguard/res/values-th/cm_strings.xml
index ce76f24..39f873a 100644
--- a/packages/Keyguard/res/values-th/cm_strings.xml
+++ b/packages/Keyguard/res/values-th/cm_strings.xml
@@ -16,9 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-tr/cm_strings.xml b/packages/Keyguard/res/values-tr/cm_strings.xml
index 919607e..31684d7 100644
--- a/packages/Keyguard/res/values-tr/cm_strings.xml
+++ b/packages/Keyguard/res/values-tr/cm_strings.xml
@@ -16,10 +16,14 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-ug/cm_strings.xml b/packages/Keyguard/res/values-ug/cm_strings.xml
index ce1bb8b..885b4a9 100644
--- a/packages/Keyguard/res/values-ug/cm_strings.xml
+++ b/packages/Keyguard/res/values-ug/cm_strings.xml
@@ -16,5 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 6c45a13..4a84214 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -19,60 +19,183 @@
 */
 -->
 <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">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.-->
 </resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 5c1883b..084c45b 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/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.  -->
   <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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-ur-rPK/cm_strings.xml b/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml b/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-vi/cm_strings.xml b/packages/Keyguard/res/values-vi/cm_strings.xml
index 12d4975..b28f62c 100644
--- a/packages/Keyguard/res/values-vi/cm_strings.xml
+++ b/packages/Keyguard/res/values-vi/cm_strings.xml
@@ -16,5 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 56f8e18..6f94967 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -16,10 +16,14 @@
      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>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
index 765485f..fe6d6b8 100644
--- a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
@@ -16,5 +16,9 @@
      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. -->
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
index db6ee22..9ab7837 100644
--- a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
@@ -16,7 +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 卡已被鎖定</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.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <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
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-zu/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>